Commit 54b81ffc authored by Sujen's avatar Sujen

Merge branch 'JPL' into 'master'

Sklearn wrap updates

See merge request !23
parents 75a1ecc3 d91579ac
{ {
"id": "1622dd1f-f869-49a5-a744-2cbbededf86e",
"schema": "https://metadata.datadrivendiscovery.org/schemas/v0/pipeline.json",
"created": "2019-04-22T17:26:27.230853Z",
"context": "TESTING", "context": "TESTING",
"created": "2019-04-21T22:40:24.479799Z",
"digest": "b3883f93cb798fe2de185086d88e47ca14e6c865b418c5687ed20a488d8996cd",
"id": "aa289991-9b05-4fa1-8824-5b7f3a77797b",
"inputs": [ "inputs": [
{ {
"name": "inputs" "name": "inputs"
...@@ -14,100 +14,59 @@ ...@@ -14,100 +14,59 @@
"name": "output predictions" "name": "output predictions"
} }
], ],
"schema": "https://metadata.datadrivendiscovery.org/schemas/v0/pipeline.json",
"steps": [ "steps": [
{ {
"arguments": { "type": "PRIMITIVE",
"inputs": {
"data": "inputs.0",
"type": "CONTAINER"
}
},
"outputs": [
{
"id": "produce"
}
],
"primitive": { "primitive": {
"digest": "7e5aa9eea2a9b6d98b8546bd0e00d190a96126bd572e945f1547cf66a9d5293c",
"id": "4b42ce1e-9b98-4a25-b68e-fad13311eb65", "id": "4b42ce1e-9b98-4a25-b68e-fad13311eb65",
"name": "Extract a DataFrame from a Dataset", "version": "0.3.0",
"python_path": "d3m.primitives.data_transformation.dataset_to_dataframe.Common", "python_path": "d3m.primitives.data_transformation.dataset_to_dataframe.Common",
"version": "0.3.0" "name": "Extract a DataFrame from a Dataset"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.0.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "inputs.0"
} }
}, },
"outputs": [ "outputs": [
{ {
"id": "produce" "id": "produce"
} }
], ]
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "48627d604ffe92d6e6ab410213fdcf56e0acbf0d248ab8686c4363279d31c21c",
"id": "d510cb7a-1782-4f51-b44c-58f0236e47c7", "id": "d510cb7a-1782-4f51-b44c-58f0236e47c7",
"name": "Parses strings into their types", "version": "0.5.0",
"python_path": "d3m.primitives.data_transformation.column_parser.DataFrameCommon", "python_path": "d3m.primitives.data_transformation.column_parser.DataFrameCommon",
"version": "0.5.0" "name": "Parses strings into their types"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.1.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.0.produce"
}
},
"hyperparams": {
"return_result": {
"data": "replace",
"type": "VALUE"
},
"use_semantic_types": {
"data": true,
"type": "VALUE"
} }
}, },
"outputs": [ "outputs": [
{ {
"id": "produce" "id": "produce"
} }
], ]
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "a442529ad564892290c76819d033429e7b9d7c2912e80ef5a0b0526a2dfd4ebd",
"id": "d016df89-de62-3c53-87ed-c06bb6a23cde", "id": "d016df89-de62-3c53-87ed-c06bb6a23cde",
"name": "sklearn.impute.SimpleImputer", "version": "2019.4.4",
"python_path": "d3m.primitives.data_cleaning.imputer.SKlearn", "python_path": "d3m.primitives.data_cleaning.imputer.SKlearn",
"version": "2019.4.4" "name": "sklearn.impute.SimpleImputer"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.2.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.1.produce"
},
"outputs": {
"data": "steps.2.produce",
"type": "CONTAINER"
}
},
"hyperparams": {
"add_index_columns": {
"data": true,
"type": "VALUE"
},
"use_semantic_types": {
"data": true,
"type": "VALUE"
} }
}, },
"outputs": [ "outputs": [
...@@ -115,24 +74,33 @@ ...@@ -115,24 +74,33 @@
"id": "produce" "id": "produce"
} }
], ],
"hyperparams": {
"use_semantic_types": {
"type": "VALUE",
"data": true
},
"return_result": {
"type": "VALUE",
"data": "replace"
}
}
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "d08669cb618a7310c8303a3736aac4267add298983135f65176c43881c724488",
"id": "1b2a32a6-0ec5-3ca0-9386-b8b1f1b831d1", "id": "1b2a32a6-0ec5-3ca0-9386-b8b1f1b831d1",
"name": "sklearn.ensemble.bagging.BaggingClassifier", "version": "2019.4.4",
"python_path": "d3m.primitives.classification.bagging.SKlearn", "python_path": "d3m.primitives.classification.bagging.SKlearn",
"version": "2019.4.4" "name": "sklearn.ensemble.bagging.BaggingClassifier"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.3.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.2.produce"
}, },
"reference": { "outputs": {
"data": "steps.0.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.2.produce"
} }
}, },
"outputs": [ "outputs": [
...@@ -140,14 +108,41 @@ ...@@ -140,14 +108,41 @@
"id": "produce" "id": "produce"
} }
], ],
"hyperparams": {
"use_semantic_types": {
"type": "VALUE",
"data": true
},
"add_index_columns": {
"type": "VALUE",
"data": true
}
}
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "f4a42da4b04cbdefd7c65c180225fc8fbf068669a8611ef6958ca2f338efdc27",
"id": "8d38b340-f83f-4877-baaa-162f8e551736", "id": "8d38b340-f83f-4877-baaa-162f8e551736",
"name": "Construct pipeline predictions output", "version": "0.3.0",
"python_path": "d3m.primitives.data_transformation.construct_predictions.DataFrameCommon", "python_path": "d3m.primitives.data_transformation.construct_predictions.DataFrameCommon",
"version": "0.3.0" "name": "Construct pipeline predictions output"
},
"arguments": {
"inputs": {
"type": "CONTAINER",
"data": "steps.3.produce"
},
"reference": {
"type": "CONTAINER",
"data": "steps.0.produce"
}
}, },
"type": "PRIMITIVE" "outputs": [
{
"id": "produce"
}
]
} }
] ],
"digest": "8f0b84e5366eb828fadc581384db0280532f586863de91a98b30c276095ba3e6"
} }
\ No newline at end of file
{ {
"id": "73ea7a00-b8b1-490c-b4fe-147e45667533",
"schema": "https://metadata.datadrivendiscovery.org/schemas/v0/pipeline.json",
"created": "2019-04-22T17:26:27.733616Z",
"context": "TESTING", "context": "TESTING",
"created": "2019-04-21T22:40:25.144047Z",
"digest": "f1c595e4311ac196f5dcfc5f4ea14899fb2322e0a6fa83b8380a01f62006e4dd",
"id": "7fb06aa5-ae12-4fc8-9915-ed7c6b4ef26a",
"inputs": [ "inputs": [
{ {
"name": "inputs" "name": "inputs"
...@@ -14,100 +14,59 @@ ...@@ -14,100 +14,59 @@
"name": "output predictions" "name": "output predictions"
} }
], ],
"schema": "https://metadata.datadrivendiscovery.org/schemas/v0/pipeline.json",
"steps": [ "steps": [
{ {
"arguments": { "type": "PRIMITIVE",
"inputs": {
"data": "inputs.0",
"type": "CONTAINER"
}
},
"outputs": [
{
"id": "produce"
}
],
"primitive": { "primitive": {
"digest": "7e5aa9eea2a9b6d98b8546bd0e00d190a96126bd572e945f1547cf66a9d5293c",
"id": "4b42ce1e-9b98-4a25-b68e-fad13311eb65", "id": "4b42ce1e-9b98-4a25-b68e-fad13311eb65",
"name": "Extract a DataFrame from a Dataset", "version": "0.3.0",
"python_path": "d3m.primitives.data_transformation.dataset_to_dataframe.Common", "python_path": "d3m.primitives.data_transformation.dataset_to_dataframe.Common",
"version": "0.3.0" "name": "Extract a DataFrame from a Dataset"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.0.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "inputs.0"
} }
}, },
"outputs": [ "outputs": [
{ {
"id": "produce" "id": "produce"
} }
], ]
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "48627d604ffe92d6e6ab410213fdcf56e0acbf0d248ab8686c4363279d31c21c",
"id": "d510cb7a-1782-4f51-b44c-58f0236e47c7", "id": "d510cb7a-1782-4f51-b44c-58f0236e47c7",
"name": "Parses strings into their types", "version": "0.5.0",
"python_path": "d3m.primitives.data_transformation.column_parser.DataFrameCommon", "python_path": "d3m.primitives.data_transformation.column_parser.DataFrameCommon",
"version": "0.5.0" "name": "Parses strings into their types"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.1.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.0.produce"
}
},
"hyperparams": {
"return_result": {
"data": "replace",
"type": "VALUE"
},
"use_semantic_types": {
"data": true,
"type": "VALUE"
} }
}, },
"outputs": [ "outputs": [
{ {
"id": "produce" "id": "produce"
} }
], ]
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "a442529ad564892290c76819d033429e7b9d7c2912e80ef5a0b0526a2dfd4ebd",
"id": "d016df89-de62-3c53-87ed-c06bb6a23cde", "id": "d016df89-de62-3c53-87ed-c06bb6a23cde",
"name": "sklearn.impute.SimpleImputer", "version": "2019.4.4",
"python_path": "d3m.primitives.data_cleaning.imputer.SKlearn", "python_path": "d3m.primitives.data_cleaning.imputer.SKlearn",
"version": "2019.4.4" "name": "sklearn.impute.SimpleImputer"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.2.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.1.produce"
},
"outputs": {
"data": "steps.2.produce",
"type": "CONTAINER"
}
},
"hyperparams": {
"add_index_columns": {
"data": true,
"type": "VALUE"
},
"use_semantic_types": {
"data": true,
"type": "VALUE"
} }
}, },
"outputs": [ "outputs": [
...@@ -115,24 +74,33 @@ ...@@ -115,24 +74,33 @@
"id": "produce" "id": "produce"
} }
], ],
"hyperparams": {
"use_semantic_types": {
"type": "VALUE",
"data": true
},
"return_result": {
"type": "VALUE",
"data": "replace"
}
}
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "536baa7887be78d0185b7809ab9f6ec387cb819f2d16e00d8661dd7afe918409",
"id": "dfb1004e-02ac-3399-ba57-8a95639312cd", "id": "dfb1004e-02ac-3399-ba57-8a95639312cd",
"name": "sklearn.naive_bayes.BernoulliNB", "version": "2019.4.4",
"python_path": "d3m.primitives.classification.bernoulli_naive_bayes.SKlearn", "python_path": "d3m.primitives.classification.bernoulli_naive_bayes.SKlearn",
"version": "2019.4.4" "name": "sklearn.naive_bayes.BernoulliNB"
}, },
"type": "PRIMITIVE"
},
{
"arguments": { "arguments": {
"inputs": { "inputs": {
"data": "steps.3.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.2.produce"
}, },
"reference": { "outputs": {
"data": "steps.0.produce", "type": "CONTAINER",
"type": "CONTAINER" "data": "steps.2.produce"
} }
}, },
"outputs": [ "outputs": [
...@@ -140,14 +108,41 @@ ...@@ -140,14 +108,41 @@
"id": "produce" "id": "produce"
} }
], ],
"hyperparams": {
"use_semantic_types": {
"type": "VALUE",
"data": true
},
"add_index_columns": {
"type": "VALUE",
"data": true
}
}
},
{
"type": "PRIMITIVE",
"primitive": { "primitive": {
"digest": "f4a42da4b04cbdefd7c65c180225fc8fbf068669a8611ef6958ca2f338efdc27",
"id": "8d38b340-f83f-4877-baaa-162f8e551736", "id": "8d38b340-f83f-4877-baaa-162f8e551736",
"name": "Construct pipeline predictions output", "version": "0.3.0",
"python_path": "d3m.primitives.data_transformation.construct_predictions.DataFrameCommon", "python_path": "d3m.primitives.data_transformation.construct_predictions.DataFrameCommon",
"version": "0.3.0" "name": "Construct pipeline predictions output"
},
"arguments": {
"inputs": {
"type": "CONTAINER",
"data": "steps.3.produce"
},
"reference": {
"type": "CONTAINER",
"data": "steps.0.produce"
}
}, },
"type": "PRIMITIVE" "outputs": [
{
"id": "produce"
}
]
} }
] ],
"digest": "1632d140b761ae7bbdeb4ca45da05b9eb7bcd2cf0d797fb35484c057c87dc3ba"
} }
\ No newline at end of file
{ {
"id": "86679a7e-ee9a-4f96-84ca-5c2b14d44d6e",
"schema": "https://metadata.datadrivendiscovery.org/schemas/v0/pipeline.json",
"created": "2019-04-22T17:26:27.871130Z",
"context": "TESTING", "context": "TESTING",
"created": "2019-04-21T22:40:25.262910Z",
"digest": "41925edc5e060ed3b62aaf4a6aaa3a3358bc9e1128b91aa0a5633e648614896e",
"id": "e5345a46-c5ba-4146-bb94-974967d7df77",
"inputs": [ "inputs": [
{ {
"name": "inputs" "name": "inputs"
...@@ -14,100 +14,59 @@ ...@@ -14,100 +14,59 @@
"name": "output predictions"