Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codemzs merged 26 commits into from
May 28, 2018
Merged

Cross Validation and TrainTest #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3145971
initial commit.
codemzs May 18, 2018
f3e42ef
changes.
codemzs May 22, 2018
4ce6605
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs May 22, 2018
c39dfc7
resolve merge conflicts.
codemzs May 22, 2018
6f273a3
Add entry point to combine arrays of metrics data views into one data…
yaeldMS May 22, 2018
3543ddb
Add unit test for the multi-class case
yaeldMS May 22, 2018
d9aa28c
Merge
yaeldMS May 22, 2018
5676a27
Update CSharpApi.cs after merge
yaeldMS May 22, 2018
e930904
train-test big fix.
codemzs May 22, 2018
857d5ab
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs May 22, 2018
ae376a0
Fix unit test
yaeldMS May 22, 2018
363cad8
Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…
codemzs May 23, 2018
0ef9ce1
Merge PR# 207.
codemzs May 23, 2018
001fa53
Unit-test.
codemzs May 24, 2018
3f53309
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs May 24, 2018
372e764
resolve merge conflicts.
codemzs May 24, 2018
95f4e83
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs May 24, 2018
eaa5545
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs May 25, 2018
2769d9b
Add Train-Test and address PR feedback.
codemzs May 25, 2018
6371e06
Merge branch 'master' of https://github.com/dotnet/machinelearning in…
codemzs May 25, 2018
1f520a2
clean up.
codemzs May 25, 2018
3991971
more cleanup.
codemzs May 25, 2018
3424775
PR feedback.
codemzs May 25, 2018
542b845
PR feedback.
codemzs May 25, 2018
072e61d
PR feedback.
codemzs May 25, 2018
9d6fb01
PR feedback.
codemzs May 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ZBaselines/Common/EntryPoints/core_ep-list.tsv
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader Import a dataset from a text file Microsoft.ML.Runtime.EntryPoints.ImportTextData ImportText Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference Pass dataview from memory to experiment Microsoft.ML.Runtime.EntryPoints.DataViewReference ImportData Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter Create and array variable Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro MakeArray Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter Create and array variable Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro MakeArray Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter Create an array variable of IDataView Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro MakeArray Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter Create an array variable of IPredictorModel Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro MakeArray Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader Import a dataset from a text file Microsoft.ML.Runtime.EntryPoints.ImportTextData TextLoader Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter Create an array variable of ITransformModel Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro MakeArray Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator Evaluates an anomaly detection scored dataset. Microsoft.ML.Runtime.Data.Evaluate AnomalyDetection Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator Evaluates a binary classification scored dataset. Microsoft.ML.Runtime.Data.Evaluate Binary Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator Cross validation for binary classification Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro CrossValidateBinary Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down
92 changes: 77 additions & 15 deletions ZBaselines/Common/EntryPoints/core_manifest.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
},
{
"Name": "Data.IDataViewArrayConverter",
"Desc": "Create and array variable",
"Desc": "Create an array variable of IDataView",
"FriendlyName": null,
"ShortName": null,
"Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
},
{
"Name": "Data.PredictorModelArrayConverter",
"Desc": "Create and array variable",
"Desc": "Create an array variable of IPredictorModel",
"FriendlyName": null,
"ShortName": null,
"Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
"ILearningPipelineLoader"
]
},
{
"Name": "Data.TransformModelArrayConverter",
"Desc": "Create an array variable of ITransformModel",
"FriendlyName": null,
"ShortName": null,
"Inputs": [
{
"Name": "TransformModel",
"Type": {
"Kind": "Array",
"ItemType": "TransformModel"
},
"Desc": "The models",
"Required": true,
"SortOrder": 1.0,
"IsNullable": false
}
],
"Outputs": [
{
"Name": "OutputModel",
"Type": {
"Kind": "Array",
"ItemType": "TransformModel"
},
"Desc": "The model array"
}
]
},
{
"Name": "Models.AnomalyDetectionEvaluator",
"Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
"Label"
],
"Required": false,
"SortOrder": 6.0,
"SortOrder": 5.0,
"IsNullable": false,
"Default": "Label"
},
Expand All@@ -1320,7 +1349,7 @@
},
"Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
"Required": true,
"SortOrder": 7.0,
"SortOrder": 6.0,
"IsNullable": false,
"Default": "SignatureBinaryClassifierTrainer"
}
Expand DownExpand Up@@ -1408,12 +1437,22 @@
"Kind": "Struct",
"Fields": [
{
"Name": "Model",
"Name": "PredictorModel",
"Type": "PredictorModel",
"Desc": "The model",
"Required": true,
"Desc": "The predictor model",
"Required": false,
"SortOrder": 1.0,
"IsNullable": false
"IsNullable": false,
"Default": null
},
{
"Name": "TransformModel",
"Type": "TransformModel",
"Desc": "The transform model",
"Required": false,
"SortOrder": 2.0,
"IsNullable": false,
"Default": null
}
]
},
Expand All@@ -1430,7 +1469,7 @@
"strat"
],
"Required": false,
"SortOrder": 7.0,
"SortOrder": 6.0,
"IsNullable": false,
"Default": null
},
Expand All@@ -1442,7 +1481,7 @@
"k"
],
"Required": false,
"SortOrder": 8.0,
"SortOrder": 7.0,
"IsNullable": false,
"Default": 2
},
Expand All@@ -1462,7 +1501,7 @@
},
"Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
"Required": true,
"SortOrder": 9.0,
"SortOrder": 8.0,
"IsNullable": false,
"Default": "SignatureBinaryClassifierTrainer"
}
Expand All@@ -1476,6 +1515,14 @@
},
"Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
},
{
"Name": "TransformModel",
"Type": {
"Kind": "Array",
"ItemType": "TransformModel"
},
"Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."

@sfilipisfilipiMay 26, 2018•
edited by codemzs
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved

@codemzscodemzsMay 26, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.

In reply to: 191033404 [](ancestors = 191033404)

@sfilipisfilipiMay 26, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.

@codemzscodemzsMay 28, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.

In reply to: 191049219 [](ancestors = 191049219)

},
{
"Name": "Warnings",
"Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
"Kind": "Struct",
"Fields": [
{
"Name": "Model",
"Name": "PredictorModel",
"Type": "PredictorModel",
"Desc": "The model",
"Required": true,
"Desc": "The predictor model",
"Required": false,
"SortOrder": 1.0,
"IsNullable": false
"IsNullable": false,
"Default": null
},
{
"Name": "TransformModel",
"Type": "TransformModel",
"Desc": "Transform model",
"Required": false,
"SortOrder": 2.0,
"IsNullable": false,
"Default": null
}
]
},
Expand DownExpand Up@@ -3058,6 +3115,11 @@
"Type": "PredictorModel",
"Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
},
{
"Name": "TransformModel",
"Type": "TransformModel",
"Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
},
{
"Name": "Warnings",
"Type": "DataView",
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ML.PipelineInference/PipelinePattern.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
},
Outputs =
{
Model = finalOutput
PredictorModel = finalOutput
},
PipelineId = UniqueId.ToString("N"),
Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
},
Outputs =
{
Model = finalOutput
PredictorModel = finalOutput
},
TrainingData = trainData,
TestingData = testData,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 26 commits into

from

May 28, 2018
 Merged


Cross Validation and TrainTest
#212
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
3145971

initial commit.


codemzs May 18, 2018
f3e42ef

changes.


codemzs May 22, 2018
4ce6605

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
c39dfc7

resolve merge conflicts.


codemzs May 22, 2018
6f273a3

Add entry point to combine arrays of metrics data views into one data…


yaeldMS May 22, 2018
3543ddb

Add unit test for the multi-class case


yaeldMS May 22, 2018
d9aa28c

Merge


yaeldMS May 22, 2018
5676a27

Update CSharpApi.cs after merge


yaeldMS May 22, 2018
e930904

train-test big fix.


codemzs May 22, 2018
857d5ab

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
ae376a0

Fix unit test


yaeldMS May 22, 2018
363cad8

Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…


codemzs May 23, 2018
0ef9ce1

Merge PR# 207.


codemzs May 23, 2018
001fa53

Unit-test.


codemzs May 24, 2018
3f53309

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
372e764

resolve merge conflicts.


codemzs May 24, 2018
95f4e83

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
eaa5545

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
2769d9b

Add Train-Test and address PR feedback.


codemzs May 25, 2018
6371e06

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
1f520a2

clean up.


codemzs May 25, 2018
3991971

more cleanup.


codemzs May 25, 2018
3424775

PR feedback.


codemzs May 25, 2018
542b845

PR feedback.


codemzs May 25, 2018
072e61d

PR feedback.


codemzs May 25, 2018
9d6fb01

PR feedback.


codemzs May 28, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
ZBaselines/Common/EntryPoints/core_ep-list.tsv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	ImportText	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference	Pass dataview from memory to experiment	Microsoft.ML.Runtime.EntryPoints.DataViewReference	ImportData	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter	Create an array variable of IDataView	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create an array variable of IPredictorModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	TextLoader	Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter	Create an array variable of ITransformModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator	Evaluates an anomaly detection scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	AnomalyDetection	Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator	Evaluates a binary classification scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	Binary	Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator	Cross validation for binary classification	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	CrossValidateBinary	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down

92 changes: 77 additions & 15 deletions
ZBaselines/Common/EntryPoints/core_manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
 },
 {
 "Name": "Data.IDataViewArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IDataView",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
 },
 {
 "Name": "Data.PredictorModelArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IPredictorModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
 "ILearningPipelineLoader"
 ]
 },
 {
 "Name": "Data.TransformModelArrayConverter",
 "Desc": "Create an array variable of ITransformModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The models",
 "Required": true,
 "SortOrder": 1.0,
 "IsNullable": false
 }
 ],
 "Outputs": [
 {
 "Name": "OutputModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The model array"
 }
 ]
 },
 {
 "Name": "Models.AnomalyDetectionEvaluator",
 "Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
 "Label"
 ],
 "Required": false,
 "SortOrder": 6.0,
 "SortOrder": 5.0,
 "IsNullable": false,
 "Default": "Label"
 },
Expand All@@ -1320,7 +1349,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand DownExpand Up@@ -1408,12 +1437,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand All@@ -1430,7 +1469,7 @@
 "strat"
 ],
 "Required": false,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": null
 },
Expand All@@ -1442,7 +1481,7 @@
 "k"
 ],
 "Required": false,
 "SortOrder": 8.0,
 "SortOrder": 7.0,
 "IsNullable": false,
 "Default": 2
 },
Expand All@@ -1462,7 +1501,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 9.0,
 "SortOrder": 8.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand All@@ -1476,6 +1515,14 @@
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
@sfilipisfilipiMay 26, 2018•

edited by codemzs

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved
@codemzscodemzsMay 26, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.
In reply to: 191033404 [](ancestors = 191033404)
@sfilipisfilipiMay 26, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.
@codemzscodemzsMay 28, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.
In reply to: 191049219 [](ancestors = 191049219)
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "Transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand DownExpand Up@@ -3058,6 +3115,11 @@
 "Type": "PredictorModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/PipelinePattern.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 PipelineId = UniqueId.ToString("N"),
 Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 TrainingData = trainData,
 TestingData = testData,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 26 commits into

from

May 28, 2018
 Merged


Cross Validation and TrainTest
#212
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
3145971

initial commit.


codemzs May 18, 2018
f3e42ef

changes.


codemzs May 22, 2018
4ce6605

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
c39dfc7

resolve merge conflicts.


codemzs May 22, 2018
6f273a3

Add entry point to combine arrays of metrics data views into one data…


yaeldMS May 22, 2018
3543ddb

Add unit test for the multi-class case


yaeldMS May 22, 2018
d9aa28c

Merge


yaeldMS May 22, 2018
5676a27

Update CSharpApi.cs after merge


yaeldMS May 22, 2018
e930904

train-test big fix.


codemzs May 22, 2018
857d5ab

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
ae376a0

Fix unit test


yaeldMS May 22, 2018
363cad8

Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…


codemzs May 23, 2018
0ef9ce1

Merge PR# 207.


codemzs May 23, 2018
001fa53

Unit-test.


codemzs May 24, 2018
3f53309

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
372e764

resolve merge conflicts.


codemzs May 24, 2018
95f4e83

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
eaa5545

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
2769d9b

Add Train-Test and address PR feedback.


codemzs May 25, 2018
6371e06

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
1f520a2

clean up.


codemzs May 25, 2018
3991971

more cleanup.


codemzs May 25, 2018
3424775

PR feedback.


codemzs May 25, 2018
542b845

PR feedback.


codemzs May 25, 2018
072e61d

PR feedback.


codemzs May 25, 2018
9d6fb01

PR feedback.


codemzs May 28, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
ZBaselines/Common/EntryPoints/core_ep-list.tsv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	ImportText	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference	Pass dataview from memory to experiment	Microsoft.ML.Runtime.EntryPoints.DataViewReference	ImportData	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter	Create an array variable of IDataView	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create an array variable of IPredictorModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	TextLoader	Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter	Create an array variable of ITransformModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator	Evaluates an anomaly detection scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	AnomalyDetection	Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator	Evaluates a binary classification scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	Binary	Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator	Cross validation for binary classification	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	CrossValidateBinary	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down

92 changes: 77 additions & 15 deletions
ZBaselines/Common/EntryPoints/core_manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
 },
 {
 "Name": "Data.IDataViewArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IDataView",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
 },
 {
 "Name": "Data.PredictorModelArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IPredictorModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
 "ILearningPipelineLoader"
 ]
 },
 {
 "Name": "Data.TransformModelArrayConverter",
 "Desc": "Create an array variable of ITransformModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The models",
 "Required": true,
 "SortOrder": 1.0,
 "IsNullable": false
 }
 ],
 "Outputs": [
 {
 "Name": "OutputModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The model array"
 }
 ]
 },
 {
 "Name": "Models.AnomalyDetectionEvaluator",
 "Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
 "Label"
 ],
 "Required": false,
 "SortOrder": 6.0,
 "SortOrder": 5.0,
 "IsNullable": false,
 "Default": "Label"
 },
Expand All@@ -1320,7 +1349,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand DownExpand Up@@ -1408,12 +1437,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand All@@ -1430,7 +1469,7 @@
 "strat"
 ],
 "Required": false,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": null
 },
Expand All@@ -1442,7 +1481,7 @@
 "k"
 ],
 "Required": false,
 "SortOrder": 8.0,
 "SortOrder": 7.0,
 "IsNullable": false,
 "Default": 2
 },
Expand All@@ -1462,7 +1501,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 9.0,
 "SortOrder": 8.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand All@@ -1476,6 +1515,14 @@
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
@sfilipisfilipiMay 26, 2018•

edited by codemzs

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved
@codemzscodemzsMay 26, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.
In reply to: 191033404 [](ancestors = 191033404)
@sfilipisfilipiMay 26, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.
@codemzscodemzsMay 28, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.
In reply to: 191049219 [](ancestors = 191049219)
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "Transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand DownExpand Up@@ -3058,6 +3115,11 @@
 "Type": "PredictorModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/PipelinePattern.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 PipelineId = UniqueId.ToString("N"),
 Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 TrainingData = trainData,
 TestingData = testData,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 26 commits into

from

May 28, 2018
 Merged


Cross Validation and TrainTest
#212
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
3145971

initial commit.


codemzs May 18, 2018
f3e42ef

changes.


codemzs May 22, 2018
4ce6605

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
c39dfc7

resolve merge conflicts.


codemzs May 22, 2018
6f273a3

Add entry point to combine arrays of metrics data views into one data…


yaeldMS May 22, 2018
3543ddb

Add unit test for the multi-class case


yaeldMS May 22, 2018
d9aa28c

Merge


yaeldMS May 22, 2018
5676a27

Update CSharpApi.cs after merge


yaeldMS May 22, 2018
e930904

train-test big fix.


codemzs May 22, 2018
857d5ab

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
ae376a0

Fix unit test


yaeldMS May 22, 2018
363cad8

Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…


codemzs May 23, 2018
0ef9ce1

Merge PR# 207.


codemzs May 23, 2018
001fa53

Unit-test.


codemzs May 24, 2018
3f53309

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
372e764

resolve merge conflicts.


codemzs May 24, 2018
95f4e83

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
eaa5545

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
2769d9b

Add Train-Test and address PR feedback.


codemzs May 25, 2018
6371e06

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
1f520a2

clean up.


codemzs May 25, 2018
3991971

more cleanup.


codemzs May 25, 2018
3424775

PR feedback.


codemzs May 25, 2018
542b845

PR feedback.


codemzs May 25, 2018
072e61d

PR feedback.


codemzs May 25, 2018
9d6fb01

PR feedback.


codemzs May 28, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
ZBaselines/Common/EntryPoints/core_ep-list.tsv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	ImportText	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference	Pass dataview from memory to experiment	Microsoft.ML.Runtime.EntryPoints.DataViewReference	ImportData	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter	Create an array variable of IDataView	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create an array variable of IPredictorModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	TextLoader	Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter	Create an array variable of ITransformModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator	Evaluates an anomaly detection scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	AnomalyDetection	Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator	Evaluates a binary classification scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	Binary	Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator	Cross validation for binary classification	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	CrossValidateBinary	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down

92 changes: 77 additions & 15 deletions
ZBaselines/Common/EntryPoints/core_manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
 },
 {
 "Name": "Data.IDataViewArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IDataView",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
 },
 {
 "Name": "Data.PredictorModelArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IPredictorModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
 "ILearningPipelineLoader"
 ]
 },
 {
 "Name": "Data.TransformModelArrayConverter",
 "Desc": "Create an array variable of ITransformModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The models",
 "Required": true,
 "SortOrder": 1.0,
 "IsNullable": false
 }
 ],
 "Outputs": [
 {
 "Name": "OutputModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The model array"
 }
 ]
 },
 {
 "Name": "Models.AnomalyDetectionEvaluator",
 "Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
 "Label"
 ],
 "Required": false,
 "SortOrder": 6.0,
 "SortOrder": 5.0,
 "IsNullable": false,
 "Default": "Label"
 },
Expand All@@ -1320,7 +1349,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand DownExpand Up@@ -1408,12 +1437,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand All@@ -1430,7 +1469,7 @@
 "strat"
 ],
 "Required": false,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": null
 },
Expand All@@ -1442,7 +1481,7 @@
 "k"
 ],
 "Required": false,
 "SortOrder": 8.0,
 "SortOrder": 7.0,
 "IsNullable": false,
 "Default": 2
 },
Expand All@@ -1462,7 +1501,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 9.0,
 "SortOrder": 8.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand All@@ -1476,6 +1515,14 @@
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
@sfilipisfilipiMay 26, 2018•

edited by codemzs

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved
@codemzscodemzsMay 26, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.
In reply to: 191033404 [](ancestors = 191033404)
@sfilipisfilipiMay 26, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.
@codemzscodemzsMay 28, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.
In reply to: 191049219 [](ancestors = 191049219)
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "Transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand DownExpand Up@@ -3058,6 +3115,11 @@
 "Type": "PredictorModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/PipelinePattern.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 PipelineId = UniqueId.ToString("N"),
 Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 TrainingData = trainData,
 TestingData = testData,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 26 commits into

from

May 28, 2018
 Merged


Cross Validation and TrainTest
#212
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
3145971

initial commit.


codemzs May 18, 2018
f3e42ef

changes.


codemzs May 22, 2018
4ce6605

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
c39dfc7

resolve merge conflicts.


codemzs May 22, 2018
6f273a3

Add entry point to combine arrays of metrics data views into one data…


yaeldMS May 22, 2018
3543ddb

Add unit test for the multi-class case


yaeldMS May 22, 2018
d9aa28c

Merge


yaeldMS May 22, 2018
5676a27

Update CSharpApi.cs after merge


yaeldMS May 22, 2018
e930904

train-test big fix.


codemzs May 22, 2018
857d5ab

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
ae376a0

Fix unit test


yaeldMS May 22, 2018
363cad8

Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…


codemzs May 23, 2018
0ef9ce1

Merge PR# 207.


codemzs May 23, 2018
001fa53

Unit-test.


codemzs May 24, 2018
3f53309

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
372e764

resolve merge conflicts.


codemzs May 24, 2018
95f4e83

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
eaa5545

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
2769d9b

Add Train-Test and address PR feedback.


codemzs May 25, 2018
6371e06

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
1f520a2

clean up.


codemzs May 25, 2018
3991971

more cleanup.


codemzs May 25, 2018
3424775

PR feedback.


codemzs May 25, 2018
542b845

PR feedback.


codemzs May 25, 2018
072e61d

PR feedback.


codemzs May 25, 2018
9d6fb01

PR feedback.


codemzs May 28, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
ZBaselines/Common/EntryPoints/core_ep-list.tsv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	ImportText	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference	Pass dataview from memory to experiment	Microsoft.ML.Runtime.EntryPoints.DataViewReference	ImportData	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter	Create an array variable of IDataView	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create an array variable of IPredictorModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	TextLoader	Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter	Create an array variable of ITransformModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator	Evaluates an anomaly detection scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	AnomalyDetection	Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator	Evaluates a binary classification scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	Binary	Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator	Cross validation for binary classification	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	CrossValidateBinary	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down

92 changes: 77 additions & 15 deletions
ZBaselines/Common/EntryPoints/core_manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
 },
 {
 "Name": "Data.IDataViewArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IDataView",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
 },
 {
 "Name": "Data.PredictorModelArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IPredictorModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
 "ILearningPipelineLoader"
 ]
 },
 {
 "Name": "Data.TransformModelArrayConverter",
 "Desc": "Create an array variable of ITransformModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The models",
 "Required": true,
 "SortOrder": 1.0,
 "IsNullable": false
 }
 ],
 "Outputs": [
 {
 "Name": "OutputModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The model array"
 }
 ]
 },
 {
 "Name": "Models.AnomalyDetectionEvaluator",
 "Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
 "Label"
 ],
 "Required": false,
 "SortOrder": 6.0,
 "SortOrder": 5.0,
 "IsNullable": false,
 "Default": "Label"
 },
Expand All@@ -1320,7 +1349,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand DownExpand Up@@ -1408,12 +1437,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand All@@ -1430,7 +1469,7 @@
 "strat"
 ],
 "Required": false,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": null
 },
Expand All@@ -1442,7 +1481,7 @@
 "k"
 ],
 "Required": false,
 "SortOrder": 8.0,
 "SortOrder": 7.0,
 "IsNullable": false,
 "Default": 2
 },
Expand All@@ -1462,7 +1501,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 9.0,
 "SortOrder": 8.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand All@@ -1476,6 +1515,14 @@
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
@sfilipisfilipiMay 26, 2018•

edited by codemzs

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved
@codemzscodemzsMay 26, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.
In reply to: 191033404 [](ancestors = 191033404)
@sfilipisfilipiMay 26, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.
@codemzscodemzsMay 28, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.
In reply to: 191049219 [](ancestors = 191049219)
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "Transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand DownExpand Up@@ -3058,6 +3115,11 @@
 "Type": "PredictorModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/PipelinePattern.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 PipelineId = UniqueId.ToString("N"),
 Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 TrainingData = trainData,
 TestingData = testData,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 26 commits into

from

May 28, 2018
 Merged


Cross Validation and TrainTest
#212
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
3145971

initial commit.


codemzs May 18, 2018
f3e42ef

changes.


codemzs May 22, 2018
4ce6605

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
c39dfc7

resolve merge conflicts.


codemzs May 22, 2018
6f273a3

Add entry point to combine arrays of metrics data views into one data…


yaeldMS May 22, 2018
3543ddb

Add unit test for the multi-class case


yaeldMS May 22, 2018
d9aa28c

Merge


yaeldMS May 22, 2018
5676a27

Update CSharpApi.cs after merge


yaeldMS May 22, 2018
e930904

train-test big fix.


codemzs May 22, 2018
857d5ab

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
ae376a0

Fix unit test


yaeldMS May 22, 2018
363cad8

Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…


codemzs May 23, 2018
0ef9ce1

Merge PR# 207.


codemzs May 23, 2018
001fa53

Unit-test.


codemzs May 24, 2018
3f53309

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
372e764

resolve merge conflicts.


codemzs May 24, 2018
95f4e83

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
eaa5545

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
2769d9b

Add Train-Test and address PR feedback.


codemzs May 25, 2018
6371e06

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
1f520a2

clean up.


codemzs May 25, 2018
3991971

more cleanup.


codemzs May 25, 2018
3424775

PR feedback.


codemzs May 25, 2018
542b845

PR feedback.


codemzs May 25, 2018
072e61d

PR feedback.


codemzs May 25, 2018
9d6fb01

PR feedback.


codemzs May 28, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
ZBaselines/Common/EntryPoints/core_ep-list.tsv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	ImportText	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference	Pass dataview from memory to experiment	Microsoft.ML.Runtime.EntryPoints.DataViewReference	ImportData	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter	Create an array variable of IDataView	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create an array variable of IPredictorModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	TextLoader	Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter	Create an array variable of ITransformModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator	Evaluates an anomaly detection scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	AnomalyDetection	Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator	Evaluates a binary classification scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	Binary	Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator	Cross validation for binary classification	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	CrossValidateBinary	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down

92 changes: 77 additions & 15 deletions
ZBaselines/Common/EntryPoints/core_manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
 },
 {
 "Name": "Data.IDataViewArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IDataView",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
 },
 {
 "Name": "Data.PredictorModelArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IPredictorModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
 "ILearningPipelineLoader"
 ]
 },
 {
 "Name": "Data.TransformModelArrayConverter",
 "Desc": "Create an array variable of ITransformModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The models",
 "Required": true,
 "SortOrder": 1.0,
 "IsNullable": false
 }
 ],
 "Outputs": [
 {
 "Name": "OutputModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The model array"
 }
 ]
 },
 {
 "Name": "Models.AnomalyDetectionEvaluator",
 "Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
 "Label"
 ],
 "Required": false,
 "SortOrder": 6.0,
 "SortOrder": 5.0,
 "IsNullable": false,
 "Default": "Label"
 },
Expand All@@ -1320,7 +1349,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand DownExpand Up@@ -1408,12 +1437,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand All@@ -1430,7 +1469,7 @@
 "strat"
 ],
 "Required": false,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": null
 },
Expand All@@ -1442,7 +1481,7 @@
 "k"
 ],
 "Required": false,
 "SortOrder": 8.0,
 "SortOrder": 7.0,
 "IsNullable": false,
 "Default": 2
 },
Expand All@@ -1462,7 +1501,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 9.0,
 "SortOrder": 8.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand All@@ -1476,6 +1515,14 @@
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
@sfilipisfilipiMay 26, 2018•

edited by codemzs

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved
@codemzscodemzsMay 26, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.
In reply to: 191033404 [](ancestors = 191033404)
@sfilipisfilipiMay 26, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.
@codemzscodemzsMay 28, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.
In reply to: 191049219 [](ancestors = 191049219)
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "Transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand DownExpand Up@@ -3058,6 +3115,11 @@
 "Type": "PredictorModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/PipelinePattern.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 PipelineId = UniqueId.ToString("N"),
 Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 TrainingData = trainData,
 TestingData = testData,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 26 commits into

from

May 28, 2018
 Merged


Cross Validation and TrainTest
#212
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
3145971

initial commit.


codemzs May 18, 2018
f3e42ef

changes.


codemzs May 22, 2018
4ce6605

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
c39dfc7

resolve merge conflicts.


codemzs May 22, 2018
6f273a3

Add entry point to combine arrays of metrics data views into one data…


yaeldMS May 22, 2018
3543ddb

Add unit test for the multi-class case


yaeldMS May 22, 2018
d9aa28c

Merge


yaeldMS May 22, 2018
5676a27

Update CSharpApi.cs after merge


yaeldMS May 22, 2018
e930904

train-test big fix.


codemzs May 22, 2018
857d5ab

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
ae376a0

Fix unit test


yaeldMS May 22, 2018
363cad8

Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…


codemzs May 23, 2018
0ef9ce1

Merge PR# 207.


codemzs May 23, 2018
001fa53

Unit-test.


codemzs May 24, 2018
3f53309

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
372e764

resolve merge conflicts.


codemzs May 24, 2018
95f4e83

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
eaa5545

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
2769d9b

Add Train-Test and address PR feedback.


codemzs May 25, 2018
6371e06

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
1f520a2

clean up.


codemzs May 25, 2018
3991971

more cleanup.


codemzs May 25, 2018
3424775

PR feedback.


codemzs May 25, 2018
542b845

PR feedback.


codemzs May 25, 2018
072e61d

PR feedback.


codemzs May 25, 2018
9d6fb01

PR feedback.


codemzs May 28, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
ZBaselines/Common/EntryPoints/core_ep-list.tsv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	ImportText	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference	Pass dataview from memory to experiment	Microsoft.ML.Runtime.EntryPoints.DataViewReference	ImportData	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter	Create an array variable of IDataView	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create an array variable of IPredictorModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	TextLoader	Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter	Create an array variable of ITransformModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator	Evaluates an anomaly detection scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	AnomalyDetection	Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator	Evaluates a binary classification scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	Binary	Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator	Cross validation for binary classification	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	CrossValidateBinary	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down

92 changes: 77 additions & 15 deletions
ZBaselines/Common/EntryPoints/core_manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
 },
 {
 "Name": "Data.IDataViewArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IDataView",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
 },
 {
 "Name": "Data.PredictorModelArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IPredictorModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
 "ILearningPipelineLoader"
 ]
 },
 {
 "Name": "Data.TransformModelArrayConverter",
 "Desc": "Create an array variable of ITransformModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The models",
 "Required": true,
 "SortOrder": 1.0,
 "IsNullable": false
 }
 ],
 "Outputs": [
 {
 "Name": "OutputModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The model array"
 }
 ]
 },
 {
 "Name": "Models.AnomalyDetectionEvaluator",
 "Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
 "Label"
 ],
 "Required": false,
 "SortOrder": 6.0,
 "SortOrder": 5.0,
 "IsNullable": false,
 "Default": "Label"
 },
Expand All@@ -1320,7 +1349,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand DownExpand Up@@ -1408,12 +1437,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand All@@ -1430,7 +1469,7 @@
 "strat"
 ],
 "Required": false,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": null
 },
Expand All@@ -1442,7 +1481,7 @@
 "k"
 ],
 "Required": false,
 "SortOrder": 8.0,
 "SortOrder": 7.0,
 "IsNullable": false,
 "Default": 2
 },
Expand All@@ -1462,7 +1501,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 9.0,
 "SortOrder": 8.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand All@@ -1476,6 +1515,14 @@
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
@sfilipisfilipiMay 26, 2018•

edited by codemzs

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved
@codemzscodemzsMay 26, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.
In reply to: 191033404 [](ancestors = 191033404)
@sfilipisfilipiMay 26, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.
@codemzscodemzsMay 28, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.
In reply to: 191049219 [](ancestors = 191049219)
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "Transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand DownExpand Up@@ -3058,6 +3115,11 @@
 "Type": "PredictorModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/PipelinePattern.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 PipelineId = UniqueId.ToString("N"),
 Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 TrainingData = trainData,
 TestingData = testData,
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Cross Validation and TrainTest#212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 26 commits into

from

May 28, 2018
 Merged


Cross Validation and TrainTest
#212
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


26 commits


Select commit
Hold shift + click to select a range
3145971

initial commit.


codemzs May 18, 2018
f3e42ef

changes.


codemzs May 22, 2018
4ce6605

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
c39dfc7

resolve merge conflicts.


codemzs May 22, 2018
6f273a3

Add entry point to combine arrays of metrics data views into one data…


yaeldMS May 22, 2018
3543ddb

Add unit test for the multi-class case


yaeldMS May 22, 2018
d9aa28c

Merge


yaeldMS May 22, 2018
5676a27

Update CSharpApi.cs after merge


yaeldMS May 22, 2018
e930904

train-test big fix.


codemzs May 22, 2018
857d5ab

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 22, 2018
ae376a0

Fix unit test


yaeldMS May 22, 2018
363cad8

Merge branch 'cvmacro' of https://github.com/yaeldekel/machinelearnin…


codemzs May 23, 2018
0ef9ce1

Merge PR# 207.


codemzs May 23, 2018
001fa53

Unit-test.


codemzs May 24, 2018
3f53309

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
372e764

resolve merge conflicts.


codemzs May 24, 2018
95f4e83

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 24, 2018
eaa5545

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
2769d9b

Add Train-Test and address PR feedback.


codemzs May 25, 2018
6371e06

Merge branch 'master' of https://github.com/dotnet/machinelearning in…


codemzs May 25, 2018
1f520a2

clean up.


codemzs May 25, 2018
3991971

more cleanup.


codemzs May 25, 2018
3424775

PR feedback.


codemzs May 25, 2018
542b845

PR feedback.


codemzs May 25, 2018
072e61d

PR feedback.


codemzs May 25, 2018
9d6fb01

PR feedback.


codemzs May 28, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 3 additions & 2 deletions
ZBaselines/Common/EntryPoints/core_ep-list.tsv

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
Data.CustomTextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	ImportText	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Input	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.DataViewReference	Pass dataview from memory to experiment	Microsoft.ML.Runtime.EntryPoints.DataViewReference	ImportData	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Input	Microsoft.ML.Runtime.EntryPoints.DataViewReference+Output
Data.IDataViewArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create and array variable	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.IDataViewArrayConverter	Create an array variable of IDataView	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIDataViewOutput
Data.PredictorModelArrayConverter	Create an array variable of IPredictorModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayIPredictorModelOutput
Data.TextLoader	Import a dataset from a text file	Microsoft.ML.Runtime.EntryPoints.ImportTextData	TextLoader	Microsoft.ML.Runtime.EntryPoints.ImportTextData+LoaderInput	Microsoft.ML.Runtime.EntryPoints.ImportTextData+Output
Data.TransformModelArrayConverter	Create an array variable of ITransformModel	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	MakeArray	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelInput	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+ArrayITransformModelOutput
Models.AnomalyDetectionEvaluator	Evaluates an anomaly detection scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	AnomalyDetection	Microsoft.ML.Runtime.Data.AnomalyDetectionMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+CommonEvaluateOutput
Models.BinaryClassificationEvaluator	Evaluates a binary classification scored dataset.	Microsoft.ML.Runtime.Data.Evaluate	Binary	Microsoft.ML.Runtime.Data.BinaryClassifierMamlEvaluator+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+ClassificationEvaluateOutput
Models.BinaryCrossValidator	Cross validation for binary classification	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro	CrossValidateBinary	Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Arguments	Microsoft.ML.Runtime.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.Runtime.EntryPoints.CrossValidationBinaryMacro+Output]
Expand Down

92 changes: 77 additions & 15 deletions
ZBaselines/Common/EntryPoints/core_manifest.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,7 +63,7 @@
 },
 {
 "Name": "Data.IDataViewArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IDataView",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -92,7 +92,7 @@
 },
 {
 "Name": "Data.PredictorModelArrayConverter",
 "Desc": "Create and array variable",
 "Desc": "Create an array variable of IPredictorModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
Expand DownExpand Up@@ -469,6 +469,35 @@
 "ILearningPipelineLoader"
 ]
 },
 {
 "Name": "Data.TransformModelArrayConverter",
 "Desc": "Create an array variable of ITransformModel",
 "FriendlyName": null,
 "ShortName": null,
 "Inputs": [
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The models",
 "Required": true,
 "SortOrder": 1.0,
 "IsNullable": false
 }
 ],
 "Outputs": [
 {
 "Name": "OutputModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The model array"
 }
 ]
 },
 {
 "Name": "Models.AnomalyDetectionEvaluator",
 "Desc": "Evaluates an anomaly detection scored dataset.",
Expand DownExpand Up@@ -1300,7 +1329,7 @@
 "Label"
 ],
 "Required": false,
 "SortOrder": 6.0,
 "SortOrder": 5.0,
 "IsNullable": false,
 "Default": "Label"
 },
Expand All@@ -1320,7 +1349,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand DownExpand Up@@ -1408,12 +1437,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand All@@ -1430,7 +1469,7 @@
 "strat"
 ],
 "Required": false,
 "SortOrder": 7.0,
 "SortOrder": 6.0,
 "IsNullable": false,
 "Default": null
 },
Expand All@@ -1442,7 +1481,7 @@
 "k"
 ],
 "Required": false,
 "SortOrder": 8.0,
 "SortOrder": 7.0,
 "IsNullable": false,
 "Default": 2
 },
Expand All@@ -1462,7 +1501,7 @@
 },
 "Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
 "Required": true,
 "SortOrder": 9.0,
 "SortOrder": 8.0,
 "IsNullable": false,
 "Default": "SignatureBinaryClassifierTrainer"
 }
Expand All@@ -1476,6 +1515,14 @@
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": {
 "Kind": "Array",
 "ItemType": "TransformModel"
 },
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
@sfilipisfilipiMay 26, 2018•

edited by codemzs

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the description correct? #Resolved
@codemzscodemzsMay 26, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, so we introduced a second option in CV and TrainTest where the final model is of ITransformModel.
In reply to: 191033404 [](ancestors = 191033404)
@sfilipisfilipiMay 26, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the part of the comment that talks about bundling the predictor model in it.
@codemzscodemzsMay 28, 2018

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please clarify? The comment already talks about predictor being included in the final model.
In reply to: 191049219 [](ancestors = 191049219)
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand DownExpand Up@@ -2999,12 +3046,22 @@
 "Kind": "Struct",
 "Fields": [
 {
 "Name": "Model",
 "Name": "PredictorModel",
 "Type": "PredictorModel",
 "Desc": "The model",
 "Required": true,
 "Desc": "The predictor model",
 "Required": false,
 "SortOrder": 1.0,
 "IsNullable": false
 "IsNullable": false,
 "Default": null
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "Transform model",
 "Required": false,
 "SortOrder": 2.0,
 "IsNullable": false,
 "Default": null
 }
 ]
 },
Expand DownExpand Up@@ -3058,6 +3115,11 @@
 "Type": "PredictorModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "TransformModel",
 "Type": "TransformModel",
 "Desc": "The final model including the trained predictor model and the model from the transforms, provided as the Input.TransformModel."
 },
 {
 "Name": "Warnings",
 "Type": "DataView",
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.PipelineInference/PipelinePattern.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ public Experiment CreateTrainTestExperiment(IDataView trainData, IDataView testD
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 PipelineId = UniqueId.ToString("N"),
 Kind = MacroUtils.TrainerKindApiValue<Models.MacroUtilsTrainerKinds>(trainerKind),
Expand DownExpand Up@@ -189,7 +189,7 @@ public Models.TrainTestEvaluator.Output AddAsTrainTest(Var<IDataView> trainData,
 },
 Outputs =
 {
Model = finalOutput
PredictorModel = finalOutput
 },
 TrainingData = trainData,
 TestingData = testData,
Expand Down
Loading