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
merged 26 commits into from
May 28, 2018
Merged

Cross Validation and TrainTest #212

Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/dotnet/machinelearning in… 
…to macros

# Conflicts:
#	ZBaselines/Common/EntryPoints/core_manifest.json
#	src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs
#	src/Microsoft.ML.Data/Evaluators/EvaluatorUtils.cs
#	src/Microsoft.ML.Data/Evaluators/MamlEvaluator.cs
#	src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs
#	test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs
#	test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj
  • Loading branch information
@codemzs
codemzs committed May 24, 2018
commit 95f4e835c14bb31360f4c462f0cd416b2b5ea69c
130 changes: 25 additions & 105 deletions ZBaselines/Common/EntryPoints/core_manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,35 +469,6 @@
"ILearningPipelineLoader"
]
},
{
"Name": "Data.TransformModelArrayConverter",
"Desc": "Create and array variable",
"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 Down Expand Up @@ -1273,26 +1244,6 @@
"FriendlyName": null,
"ShortName": null,
"Inputs": [
{
"Name": "Kind",
"Type": {
"Kind": "Enum",
"Values": [
"SignatureBinaryClassifierTrainer",
"SignatureMultiClassClassifierTrainer",
"SignatureRankerTrainer",
"SignatureRegressorTrainer",
"SignatureMultiOutputRegressorTrainer",
"SignatureAnomalyDetectorTrainer",
"SignatureClusteringTrainer"
]
},
"Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
"Required": true,
"SortOrder": 0.0,
"IsNullable": false,
"Default": "SignatureBinaryClassifierTrainer"
},
{
"Name": "OverallMetrics",
"Type": {
Expand Down Expand Up @@ -1349,9 +1300,29 @@
"Label"
],
"Required": false,
"SortOrder": 4.0,
"SortOrder": 6.0,
"IsNullable": false,
"Default": "Label"
},
{
"Name": "Kind",
"Type": {
"Kind": "Enum",
"Values": [
"SignatureBinaryClassifierTrainer",
"SignatureMultiClassClassifierTrainer",
"SignatureRankerTrainer",
"SignatureRegressorTrainer",
"SignatureMultiOutputRegressorTrainer",
"SignatureAnomalyDetectorTrainer",
"SignatureClusteringTrainer"
]
},
"Desc": "Specifies the trainer kind, which determines the evaluator to be used.",
"Required": true,
"SortOrder": 7.0,
"IsNullable": false,
"Default": "SignatureBinaryClassifierTrainer"
}
],
"Outputs": [
Expand Down Expand Up @@ -1440,28 +1411,9 @@
"Name": "Model",
"Type": "PredictorModel",
"Desc": "The model",
"Required": false,
"Required": true,
"SortOrder": 1.0,
"IsNullable": false,
"Default": null
},
{
"Name": "TransformModel",
"Type": "TransformModel",
"Desc": "The transform model",
"Required": false,
"SortOrder": 2.0,
"IsNullable": false,
"Default": null
},
{
"Name": "UseTransformModel",
"Type": "Bool",
"Desc": "Indicates to use transform model instead of predictor model.",
"Required": false,
"SortOrder": 3.0,
"IsNullable": false,
"Default": false
"IsNullable": false
}
]
},
Expand Down Expand Up @@ -1524,14 +1476,6 @@
},
"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."
},
{
"Name": "Warnings",
"Type": "DataView",
Expand Down Expand Up @@ -3058,28 +3002,9 @@
"Name": "Model",
"Type": "PredictorModel",
"Desc": "The model",
"Required": false,
"Required": true,
"SortOrder": 1.0,
"IsNullable": false,
"Default": null
},
{
"Name": "TransformModel",
"Type": "TransformModel",
"Desc": "Transform model",
"Required": false,
"SortOrder": 2.0,
"IsNullable": false,
"Default": null
},
{
"Name": "UseTransformModel",
"Type": "Bool",
"Desc": "Indicates to use transform model instead of predictor model.",
"Required": false,
"SortOrder": 3.0,
"IsNullable": false,
"Default": false
"IsNullable": false
}
]
},
Expand Down Expand Up @@ -3133,11 +3058,6 @@
"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
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ private void RunCore(IChannel ch, string cmd)
// Save the per-instance results.
if (!string.IsNullOrWhiteSpace(Args.OutputDataFile))
{
var perInstance = EvaluateUtils.CombinePerInstanceDataViews(Host, eval, Args.CollateMetrics,
var perInstance = EvaluateUtils.ConcatenatePerInstanceDataViews(Host, eval, Args.CollateMetrics,
Args.OutputExampleFoldIndex, tasks.Select(t => t.Result.PerInstanceResults).ToArray(), out var variableSizeVectorColumnNames);
if (variableSizeVectorColumnNames.Length > 0)
{
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.