Fix CV macro to output the warnings data view properly.#385

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
yaeldekel merged 1 commit into from
Jun 20, 2018
Merged

Fix CV macro to output the warnings data view properly. #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
{
get
{
if (_numInstances == 0)
return 0;

@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)

maybe NaN?

@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?

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

Double macroAvgAccuracy = 0;
int countOfNonEmptyClasses = 0;
for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
}
}

Contracts.Assert(countOfNonEmptyClasses > 0);
return macroAvgAccuracy / countOfNonEmptyClasses;
return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
}
}

Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
"OLS Linear Regression Executor",
OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down
4 changes: 4 additions & 0 deletions src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
// Set the input bindings for the CombineMetrics entry point.
var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down
83 changes: 83 additions & 0 deletions test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
}
Assert.Equal(0, rowCount);
}

var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
using (var cursor = warnings.GetRowCursor(col => true))
Assert.False(cursor.MoveNext());
}
}

[Fact]
public void TestCrossValidationMacroMultiClassWithWarnings()
{
var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
using (var env = new TlcEnvironment(42))
{
var subGraph = env.CreateExperiment();

var nop = new ML.Transforms.NoOperation();

@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371

var nopOutput = subGraph.Add(nop);

var learnerInput = new ML.Trainers.LogisticRegressionClassifier
{
TrainingData = nopOutput.OutputData,
NumThreads = 1
};
var learnerOutput = subGraph.Add(learnerInput);

var experiment = env.CreateExperiment();
var importInput = new ML.Data.TextLoader(dataPath);
var importOutput = experiment.Add(importInput);

var filter = new ML.Transforms.RowRangeFilter();
filter.Data = importOutput.Data;
filter.Column = "Label";
filter.Min = 0;
filter.Max = 5;
var filterOutput = experiment.Add(filter);

var term = new ML.Transforms.TextToKeyConverter();
term.Column = new[]
{
new ML.Transforms.TermTransformColumn()
{
Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
}
};
term.Data = filterOutput.OutputData;
var termOutput = experiment.Add(term);

var crossValidate = new ML.Models.CrossValidator
{
Data = termOutput.OutputData,
Nodes = subGraph,
Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
TransformModel = null,
StratificationColumn = "Strat"
};
crossValidate.Inputs.Data = nop.Data;
crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
var crossValidateOutput = experiment.Add(crossValidate);

experiment.Compile();
importInput.SetInput(env, experiment);
experiment.Run();
var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

var schema = warnings.Schema;
var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
Assert.True(b);
using (var cursor = warnings.GetRowCursor(col => col == warningCol))
{
var getter = cursor.GetGetter<DvText>(warningCol);

b = cursor.MoveNext();
Assert.True(b);
var warning = default(DvText);
getter(ref warning);
Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
b = cursor.MoveNext();
Assert.True(b);
getter(ref warning);
Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
b = cursor.MoveNext();
Assert.False(b);
}
}
}

Expand Down
, '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
Fix CV macro to output the warnings data view properly.#385

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

yaeldekel
merged 1 commit into

from

Jun 20, 2018
 Merged


Fix CV macro to output the warnings data view properly.
#385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
 {
 get
 {
 if (_numInstances == 0)
 return 0;
@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)
maybe NaN?
@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?
In reply to: 196921243 [](ancestors = 196921243)
 Double macroAvgAccuracy = 0;
 int countOfNonEmptyClasses = 0;
 for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
 }
 }

 Contracts.Assert(countOfNonEmptyClasses > 0);
 return macroAvgAccuracy / countOfNonEmptyClasses;
 return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
 "OLS Linear Regression Executor",
 OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
 public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down

4 changes: 4 additions & 0 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 // Set the input bindings for the CombineMetrics entry point.
 var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
 var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

 var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
 combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
 combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
 var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
 combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
 combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down

83 changes: 83 additions & 0 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
 }
 Assert.Equal(0, rowCount);
 }

 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
 using (var cursor = warnings.GetRowCursor(col => true))
 Assert.False(cursor.MoveNext());
 }
 }

 [Fact]
 public void TestCrossValidationMacroMultiClassWithWarnings()
 {
 var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
 using (var env = new TlcEnvironment(42))
 {
 var subGraph = env.CreateExperiment();

 var nop = new ML.Transforms.NoOperation();
@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371
 var nopOutput = subGraph.Add(nop);

 var learnerInput = new ML.Trainers.LogisticRegressionClassifier
 {
 TrainingData = nopOutput.OutputData,
 NumThreads = 1
 };
 var learnerOutput = subGraph.Add(learnerInput);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importOutput = experiment.Add(importInput);

 var filter = new ML.Transforms.RowRangeFilter();
 filter.Data = importOutput.Data;
 filter.Column = "Label";
 filter.Min = 0;
 filter.Max = 5;
 var filterOutput = experiment.Add(filter);

 var term = new ML.Transforms.TextToKeyConverter();
 term.Column = new[]
 {
 new ML.Transforms.TermTransformColumn()
 {
 Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
 }
 };
 term.Data = filterOutput.OutputData;
 var termOutput = experiment.Add(term);

 var crossValidate = new ML.Models.CrossValidator
 {
 Data = termOutput.OutputData,
 Nodes = subGraph,
 Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
 TransformModel = null,
 StratificationColumn = "Strat"
 };
 crossValidate.Inputs.Data = nop.Data;
 crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
 var crossValidateOutput = experiment.Add(crossValidate);

 experiment.Compile();
 importInput.SetInput(env, experiment);
 experiment.Run();
 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

 var schema = warnings.Schema;
 var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
 Assert.True(b);
 using (var cursor = warnings.GetRowCursor(col => col == warningCol))
 {
 var getter = cursor.GetGetter<DvText>(warningCol);

 b = cursor.MoveNext();
 Assert.True(b);
 var warning = default(DvText);
 getter(ref warning);
 Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
 b = cursor.MoveNext();
 Assert.True(b);
 getter(ref warning);
 Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
 b = cursor.MoveNext();
 Assert.False(b);
 }
 }
 }

Expand Down

, '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
Fix CV macro to output the warnings data view properly.#385

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

yaeldekel
merged 1 commit into

from

Jun 20, 2018
 Merged


Fix CV macro to output the warnings data view properly.
#385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
 {
 get
 {
 if (_numInstances == 0)
 return 0;
@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)
maybe NaN?
@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?
In reply to: 196921243 [](ancestors = 196921243)
 Double macroAvgAccuracy = 0;
 int countOfNonEmptyClasses = 0;
 for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
 }
 }

 Contracts.Assert(countOfNonEmptyClasses > 0);
 return macroAvgAccuracy / countOfNonEmptyClasses;
 return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
 "OLS Linear Regression Executor",
 OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
 public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down

4 changes: 4 additions & 0 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 // Set the input bindings for the CombineMetrics entry point.
 var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
 var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

 var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
 combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
 combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
 var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
 combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
 combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down

83 changes: 83 additions & 0 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
 }
 Assert.Equal(0, rowCount);
 }

 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
 using (var cursor = warnings.GetRowCursor(col => true))
 Assert.False(cursor.MoveNext());
 }
 }

 [Fact]
 public void TestCrossValidationMacroMultiClassWithWarnings()
 {
 var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
 using (var env = new TlcEnvironment(42))
 {
 var subGraph = env.CreateExperiment();

 var nop = new ML.Transforms.NoOperation();
@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371
 var nopOutput = subGraph.Add(nop);

 var learnerInput = new ML.Trainers.LogisticRegressionClassifier
 {
 TrainingData = nopOutput.OutputData,
 NumThreads = 1
 };
 var learnerOutput = subGraph.Add(learnerInput);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importOutput = experiment.Add(importInput);

 var filter = new ML.Transforms.RowRangeFilter();
 filter.Data = importOutput.Data;
 filter.Column = "Label";
 filter.Min = 0;
 filter.Max = 5;
 var filterOutput = experiment.Add(filter);

 var term = new ML.Transforms.TextToKeyConverter();
 term.Column = new[]
 {
 new ML.Transforms.TermTransformColumn()
 {
 Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
 }
 };
 term.Data = filterOutput.OutputData;
 var termOutput = experiment.Add(term);

 var crossValidate = new ML.Models.CrossValidator
 {
 Data = termOutput.OutputData,
 Nodes = subGraph,
 Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
 TransformModel = null,
 StratificationColumn = "Strat"
 };
 crossValidate.Inputs.Data = nop.Data;
 crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
 var crossValidateOutput = experiment.Add(crossValidate);

 experiment.Compile();
 importInput.SetInput(env, experiment);
 experiment.Run();
 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

 var schema = warnings.Schema;
 var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
 Assert.True(b);
 using (var cursor = warnings.GetRowCursor(col => col == warningCol))
 {
 var getter = cursor.GetGetter<DvText>(warningCol);

 b = cursor.MoveNext();
 Assert.True(b);
 var warning = default(DvText);
 getter(ref warning);
 Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
 b = cursor.MoveNext();
 Assert.True(b);
 getter(ref warning);
 Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
 b = cursor.MoveNext();
 Assert.False(b);
 }
 }
 }

Expand Down

, '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
Fix CV macro to output the warnings data view properly.#385

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

yaeldekel
merged 1 commit into

from

Jun 20, 2018
 Merged


Fix CV macro to output the warnings data view properly.
#385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
 {
 get
 {
 if (_numInstances == 0)
 return 0;
@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)
maybe NaN?
@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?
In reply to: 196921243 [](ancestors = 196921243)
 Double macroAvgAccuracy = 0;
 int countOfNonEmptyClasses = 0;
 for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
 }
 }

 Contracts.Assert(countOfNonEmptyClasses > 0);
 return macroAvgAccuracy / countOfNonEmptyClasses;
 return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
 "OLS Linear Regression Executor",
 OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
 public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down

4 changes: 4 additions & 0 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 // Set the input bindings for the CombineMetrics entry point.
 var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
 var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

 var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
 combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
 combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
 var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
 combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
 combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down

83 changes: 83 additions & 0 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
 }
 Assert.Equal(0, rowCount);
 }

 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
 using (var cursor = warnings.GetRowCursor(col => true))
 Assert.False(cursor.MoveNext());
 }
 }

 [Fact]
 public void TestCrossValidationMacroMultiClassWithWarnings()
 {
 var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
 using (var env = new TlcEnvironment(42))
 {
 var subGraph = env.CreateExperiment();

 var nop = new ML.Transforms.NoOperation();
@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371
 var nopOutput = subGraph.Add(nop);

 var learnerInput = new ML.Trainers.LogisticRegressionClassifier
 {
 TrainingData = nopOutput.OutputData,
 NumThreads = 1
 };
 var learnerOutput = subGraph.Add(learnerInput);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importOutput = experiment.Add(importInput);

 var filter = new ML.Transforms.RowRangeFilter();
 filter.Data = importOutput.Data;
 filter.Column = "Label";
 filter.Min = 0;
 filter.Max = 5;
 var filterOutput = experiment.Add(filter);

 var term = new ML.Transforms.TextToKeyConverter();
 term.Column = new[]
 {
 new ML.Transforms.TermTransformColumn()
 {
 Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
 }
 };
 term.Data = filterOutput.OutputData;
 var termOutput = experiment.Add(term);

 var crossValidate = new ML.Models.CrossValidator
 {
 Data = termOutput.OutputData,
 Nodes = subGraph,
 Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
 TransformModel = null,
 StratificationColumn = "Strat"
 };
 crossValidate.Inputs.Data = nop.Data;
 crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
 var crossValidateOutput = experiment.Add(crossValidate);

 experiment.Compile();
 importInput.SetInput(env, experiment);
 experiment.Run();
 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

 var schema = warnings.Schema;
 var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
 Assert.True(b);
 using (var cursor = warnings.GetRowCursor(col => col == warningCol))
 {
 var getter = cursor.GetGetter<DvText>(warningCol);

 b = cursor.MoveNext();
 Assert.True(b);
 var warning = default(DvText);
 getter(ref warning);
 Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
 b = cursor.MoveNext();
 Assert.True(b);
 getter(ref warning);
 Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
 b = cursor.MoveNext();
 Assert.False(b);
 }
 }
 }

Expand Down

, '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
Fix CV macro to output the warnings data view properly.#385

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

yaeldekel
merged 1 commit into

from

Jun 20, 2018
 Merged


Fix CV macro to output the warnings data view properly.
#385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
 {
 get
 {
 if (_numInstances == 0)
 return 0;
@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)
maybe NaN?
@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?
In reply to: 196921243 [](ancestors = 196921243)
 Double macroAvgAccuracy = 0;
 int countOfNonEmptyClasses = 0;
 for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
 }
 }

 Contracts.Assert(countOfNonEmptyClasses > 0);
 return macroAvgAccuracy / countOfNonEmptyClasses;
 return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
 "OLS Linear Regression Executor",
 OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
 public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down

4 changes: 4 additions & 0 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 // Set the input bindings for the CombineMetrics entry point.
 var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
 var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

 var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
 combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
 combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
 var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
 combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
 combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down

83 changes: 83 additions & 0 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
 }
 Assert.Equal(0, rowCount);
 }

 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
 using (var cursor = warnings.GetRowCursor(col => true))
 Assert.False(cursor.MoveNext());
 }
 }

 [Fact]
 public void TestCrossValidationMacroMultiClassWithWarnings()
 {
 var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
 using (var env = new TlcEnvironment(42))
 {
 var subGraph = env.CreateExperiment();

 var nop = new ML.Transforms.NoOperation();
@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371
 var nopOutput = subGraph.Add(nop);

 var learnerInput = new ML.Trainers.LogisticRegressionClassifier
 {
 TrainingData = nopOutput.OutputData,
 NumThreads = 1
 };
 var learnerOutput = subGraph.Add(learnerInput);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importOutput = experiment.Add(importInput);

 var filter = new ML.Transforms.RowRangeFilter();
 filter.Data = importOutput.Data;
 filter.Column = "Label";
 filter.Min = 0;
 filter.Max = 5;
 var filterOutput = experiment.Add(filter);

 var term = new ML.Transforms.TextToKeyConverter();
 term.Column = new[]
 {
 new ML.Transforms.TermTransformColumn()
 {
 Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
 }
 };
 term.Data = filterOutput.OutputData;
 var termOutput = experiment.Add(term);

 var crossValidate = new ML.Models.CrossValidator
 {
 Data = termOutput.OutputData,
 Nodes = subGraph,
 Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
 TransformModel = null,
 StratificationColumn = "Strat"
 };
 crossValidate.Inputs.Data = nop.Data;
 crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
 var crossValidateOutput = experiment.Add(crossValidate);

 experiment.Compile();
 importInput.SetInput(env, experiment);
 experiment.Run();
 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

 var schema = warnings.Schema;
 var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
 Assert.True(b);
 using (var cursor = warnings.GetRowCursor(col => col == warningCol))
 {
 var getter = cursor.GetGetter<DvText>(warningCol);

 b = cursor.MoveNext();
 Assert.True(b);
 var warning = default(DvText);
 getter(ref warning);
 Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
 b = cursor.MoveNext();
 Assert.True(b);
 getter(ref warning);
 Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
 b = cursor.MoveNext();
 Assert.False(b);
 }
 }
 }

Expand Down

, '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
Fix CV macro to output the warnings data view properly.#385

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

yaeldekel
merged 1 commit into

from

Jun 20, 2018
 Merged


Fix CV macro to output the warnings data view properly.
#385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
 {
 get
 {
 if (_numInstances == 0)
 return 0;
@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)
maybe NaN?
@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?
In reply to: 196921243 [](ancestors = 196921243)
 Double macroAvgAccuracy = 0;
 int countOfNonEmptyClasses = 0;
 for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
 }
 }

 Contracts.Assert(countOfNonEmptyClasses > 0);
 return macroAvgAccuracy / countOfNonEmptyClasses;
 return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
 "OLS Linear Regression Executor",
 OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
 public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down

4 changes: 4 additions & 0 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 // Set the input bindings for the CombineMetrics entry point.
 var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
 var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

 var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
 combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
 combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
 var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
 combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
 combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down

83 changes: 83 additions & 0 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
 }
 Assert.Equal(0, rowCount);
 }

 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
 using (var cursor = warnings.GetRowCursor(col => true))
 Assert.False(cursor.MoveNext());
 }
 }

 [Fact]
 public void TestCrossValidationMacroMultiClassWithWarnings()
 {
 var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
 using (var env = new TlcEnvironment(42))
 {
 var subGraph = env.CreateExperiment();

 var nop = new ML.Transforms.NoOperation();
@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371
 var nopOutput = subGraph.Add(nop);

 var learnerInput = new ML.Trainers.LogisticRegressionClassifier
 {
 TrainingData = nopOutput.OutputData,
 NumThreads = 1
 };
 var learnerOutput = subGraph.Add(learnerInput);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importOutput = experiment.Add(importInput);

 var filter = new ML.Transforms.RowRangeFilter();
 filter.Data = importOutput.Data;
 filter.Column = "Label";
 filter.Min = 0;
 filter.Max = 5;
 var filterOutput = experiment.Add(filter);

 var term = new ML.Transforms.TextToKeyConverter();
 term.Column = new[]
 {
 new ML.Transforms.TermTransformColumn()
 {
 Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
 }
 };
 term.Data = filterOutput.OutputData;
 var termOutput = experiment.Add(term);

 var crossValidate = new ML.Models.CrossValidator
 {
 Data = termOutput.OutputData,
 Nodes = subGraph,
 Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
 TransformModel = null,
 StratificationColumn = "Strat"
 };
 crossValidate.Inputs.Data = nop.Data;
 crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
 var crossValidateOutput = experiment.Add(crossValidate);

 experiment.Compile();
 importInput.SetInput(env, experiment);
 experiment.Run();
 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

 var schema = warnings.Schema;
 var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
 Assert.True(b);
 using (var cursor = warnings.GetRowCursor(col => col == warningCol))
 {
 var getter = cursor.GetGetter<DvText>(warningCol);

 b = cursor.MoveNext();
 Assert.True(b);
 var warning = default(DvText);
 getter(ref warning);
 Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
 b = cursor.MoveNext();
 Assert.True(b);
 getter(ref warning);
 Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
 b = cursor.MoveNext();
 Assert.False(b);
 }
 }
 }

Expand Down

, '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
Fix CV macro to output the warnings data view properly.#385

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

yaeldekel
merged 1 commit into

from

Jun 20, 2018
 Merged


Fix CV macro to output the warnings data view properly.
#385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
 {
 get
 {
 if (_numInstances == 0)
 return 0;
@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)
maybe NaN?
@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?
In reply to: 196921243 [](ancestors = 196921243)
 Double macroAvgAccuracy = 0;
 int countOfNonEmptyClasses = 0;
 for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
 }
 }

 Contracts.Assert(countOfNonEmptyClasses > 0);
 return macroAvgAccuracy / countOfNonEmptyClasses;
 return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
 "OLS Linear Regression Executor",
 OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
 public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down

4 changes: 4 additions & 0 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 // Set the input bindings for the CombineMetrics entry point.
 var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
 var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

 var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
 combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
 combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
 var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
 combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
 combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down

83 changes: 83 additions & 0 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
 }
 Assert.Equal(0, rowCount);
 }

 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
 using (var cursor = warnings.GetRowCursor(col => true))
 Assert.False(cursor.MoveNext());
 }
 }

 [Fact]
 public void TestCrossValidationMacroMultiClassWithWarnings()
 {
 var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
 using (var env = new TlcEnvironment(42))
 {
 var subGraph = env.CreateExperiment();

 var nop = new ML.Transforms.NoOperation();
@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371
 var nopOutput = subGraph.Add(nop);

 var learnerInput = new ML.Trainers.LogisticRegressionClassifier
 {
 TrainingData = nopOutput.OutputData,
 NumThreads = 1
 };
 var learnerOutput = subGraph.Add(learnerInput);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importOutput = experiment.Add(importInput);

 var filter = new ML.Transforms.RowRangeFilter();
 filter.Data = importOutput.Data;
 filter.Column = "Label";
 filter.Min = 0;
 filter.Max = 5;
 var filterOutput = experiment.Add(filter);

 var term = new ML.Transforms.TextToKeyConverter();
 term.Column = new[]
 {
 new ML.Transforms.TermTransformColumn()
 {
 Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
 }
 };
 term.Data = filterOutput.OutputData;
 var termOutput = experiment.Add(term);

 var crossValidate = new ML.Models.CrossValidator
 {
 Data = termOutput.OutputData,
 Nodes = subGraph,
 Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
 TransformModel = null,
 StratificationColumn = "Strat"
 };
 crossValidate.Inputs.Data = nop.Data;
 crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
 var crossValidateOutput = experiment.Add(crossValidate);

 experiment.Compile();
 importInput.SetInput(env, experiment);
 experiment.Run();
 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

 var schema = warnings.Schema;
 var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
 Assert.True(b);
 using (var cursor = warnings.GetRowCursor(col => col == warningCol))
 {
 var getter = cursor.GetGetter<DvText>(warningCol);

 b = cursor.MoveNext();
 Assert.True(b);
 var warning = default(DvText);
 getter(ref warning);
 Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
 b = cursor.MoveNext();
 Assert.True(b);
 getter(ref warning);
 Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
 b = cursor.MoveNext();
 Assert.False(b);
 }
 }
 }

Expand Down

, '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
Fix CV macro to output the warnings data view properly.#385

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

yaeldekel
merged 1 commit into

from

Jun 20, 2018
 Merged


Fix CV macro to output the warnings data view properly.
#385
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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
src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,8 @@ public Double MacroAvgAccuracy
 {
 get
 {
 if (_numInstances == 0)
 return 0;
@Ivanidzo4kaIvanidzo4kaJun 20, 2018

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

0 [](start = 35, length = 1)
maybe NaN?
@codemzscodemzsJun 20, 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.

NaN means not a number but if instances are zero then isn't it accurate to say accuracy is zero?
In reply to: 196921243 [](ancestors = 196921243)
 Double macroAvgAccuracy = 0;
 int countOfNonEmptyClasses = 0;
 for (int i = 0; i < _numClasses; ++i)
Expand All@@ -267,8 +269,7 @@ public Double MacroAvgAccuracy
 }
 }

 Contracts.Assert(countOfNonEmptyClasses > 0);
 return macroAvgAccuracy / countOfNonEmptyClasses;
 return countOfNonEmptyClasses > 0 ? macroAvgAccuracy / countOfNonEmptyClasses : 0;
 }
 }

Expand Down

2 changes: 0 additions & 2 deletions
src/Microsoft.ML.StandardLearners/Standard/OlsLinearRegression.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,6 @@
 "OLS Linear Regression Executor",
 OlsLinearRegressionPredictor.LoaderSignature)]

[assembly: LoadableClass(typeof(void), typeof(OlsLinearRegressionTrainer), null, typeof(SignatureEntryPointModule), OlsLinearRegressionTrainer.LoadNameValue)]

namespace Microsoft.ML.Runtime.Learners
{
 public sealed class OlsLinearRegressionTrainer : TrainerBase<RoleMappedData, OlsLinearRegressionPredictor>
Expand Down

4 changes: 4 additions & 0 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,6 +381,10 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 // Set the input bindings for the CombineMetrics entry point.
 var combineInputBindingMap = new Dictionary<string, List<ParameterBinding>>();
 var combineInputMap = new Dictionary<ParameterBinding, VariableBinding>();

 var warningsArray = new SimpleParameterBinding(nameof(combineArgs.Warnings));
 combineInputBindingMap.Add(nameof(combineArgs.Warnings), new List<ParameterBinding> { warningsArray });
 combineInputMap.Add(warningsArray, new SimpleVariableBinding(warningsOutput.OutputData.VarName));
 var overallArray = new SimpleParameterBinding(nameof(combineArgs.OverallMetrics));
 combineInputBindingMap.Add(nameof(combineArgs.OverallMetrics), new List<ParameterBinding> { overallArray });
 combineInputMap.Add(overallArray, new SimpleVariableBinding(overallMetricsOutput.OutputData.VarName));
Expand Down

83 changes: 83 additions & 0 deletions
test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -528,6 +528,89 @@ public void TestCrossValidationMacroWithMultiClass()
 }
 Assert.Equal(0, rowCount);
 }

 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);
 using (var cursor = warnings.GetRowCursor(col => true))
 Assert.False(cursor.MoveNext());
 }
 }

 [Fact]
 public void TestCrossValidationMacroMultiClassWithWarnings()
 {
 var dataPath = GetDataPath(@"Train-Tiny-28x28.txt");
 using (var env = new TlcEnvironment(42))
 {
 var subGraph = env.CreateExperiment();

 var nop = new ML.Transforms.NoOperation();
@codemzscodemzsJun 20, 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.

Using entrypoints graph is fine for now in C# but please consider not using it and instead call the low level C# APIs for component initialization from now on. We will be getting rid of CSharpCodeGenerator as there is no need to use C# code generated APIs when low level C# APIs already exist. Refer to issue #371
 var nopOutput = subGraph.Add(nop);

 var learnerInput = new ML.Trainers.LogisticRegressionClassifier
 {
 TrainingData = nopOutput.OutputData,
 NumThreads = 1
 };
 var learnerOutput = subGraph.Add(learnerInput);

 var experiment = env.CreateExperiment();
 var importInput = new ML.Data.TextLoader(dataPath);
 var importOutput = experiment.Add(importInput);

 var filter = new ML.Transforms.RowRangeFilter();
 filter.Data = importOutput.Data;
 filter.Column = "Label";
 filter.Min = 0;
 filter.Max = 5;
 var filterOutput = experiment.Add(filter);

 var term = new ML.Transforms.TextToKeyConverter();
 term.Column = new[]
 {
 new ML.Transforms.TermTransformColumn()
 {
 Source = "Label", Name = "Strat", Sort = ML.Transforms.TermTransformSortOrder.Value
 }
 };
 term.Data = filterOutput.OutputData;
 var termOutput = experiment.Add(term);

 var crossValidate = new ML.Models.CrossValidator
 {
 Data = termOutput.OutputData,
 Nodes = subGraph,
 Kind = ML.Models.MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer,
 TransformModel = null,
 StratificationColumn = "Strat"
 };
 crossValidate.Inputs.Data = nop.Data;
 crossValidate.Outputs.PredictorModel = learnerOutput.PredictorModel;
 var crossValidateOutput = experiment.Add(crossValidate);

 experiment.Compile();
 importInput.SetInput(env, experiment);
 experiment.Run();
 var warnings = experiment.GetOutput(crossValidateOutput.Warnings);

 var schema = warnings.Schema;
 var b = schema.TryGetColumnIndex("WarningText", out int warningCol);
 Assert.True(b);
 using (var cursor = warnings.GetRowCursor(col => col == warningCol))
 {
 var getter = cursor.GetGetter<DvText>(warningCol);

 b = cursor.MoveNext();
 Assert.True(b);
 var warning = default(DvText);
 getter(ref warning);
 Assert.Contains("test instances with class values not seen in the training set.", warning.ToString());
 b = cursor.MoveNext();
 Assert.True(b);
 getter(ref warning);
 Assert.Contains("Detected columns of variable length: SortedScores, SortedClasses", warning.ToString());
 b = cursor.MoveNext();
 Assert.False(b);
 }
 }
 }

Expand Down