Code cleanup#271

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
justinormont merged 1 commit into from
May 30, 2018
Merged

Code cleanup #271

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
6 changes: 3 additions & 3 deletions src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
public readonly Type[] OutputKinds;
public readonly ObsoleteAttribute ObsoleteAttribute;

internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
{
Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
if (attr == null)
continue;

var info = new EntryPointInfo(ectx, methodInfo, attr,
var info = new EntryPointInfo(ectx, methodInfo, attr,
methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
Contracts.CheckValue(argumentType, nameof(argumentType));

component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
return component != null;
}

Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
host.CheckValue(input, nameof(input));
EntryPointUtils.CheckInputArgs(host, input);


IPredictor predictor;
var inputData = input.Data;
RoleMappedData data;
input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

IDataView scoredPipe;
using (var ch = host.Start("Creating scoring pipeline"))
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.PipelineInference/AutoInference.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
testMetricVal += 1e-10;

// Save performance score
candidate.PerformanceSummary =
candidate.PerformanceSummary =
new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
_sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
_history.Add(candidate);
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ML.PipelineInference/AutoMlUtils.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
public static class AutoMlUtils
{
public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
{
Contracts.CheckValue(env, nameof(env));
env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
{
double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
}

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
}

public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
return result;
}


public sealed class ArrayIDataViewInput
{
[Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down
5 changes: 2 additions & 3 deletions src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
{
[Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
public Var<IPredictorModel> PredictorModel;

[Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
public Var<ITransformModel> TransformModel;
}
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
public IDataView ConfusionMatrix;
}


public sealed class CombineMetricsInput
{
[Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
}
else
args.Outputs.TransformModel = null;

// Set train/test trainer kind to match.
args.Kind = input.Kind;

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
var host = env.Register("ImportTextData");
env.CheckValue(input, nameof(input));
EntryPointUtils.CheckInputArgs(host, input);
var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
return new Output { Data = loader };
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
{
[Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
public Var<IPredictorModel> PredictorModel;

[Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
public Var<ITransformModel> TransformModel;
}
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
throw env.Except($"Invalid variable name '{varName}'.");

string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
node.GetOutputVariableName(nameof(Output.PredictorModel));

foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
var evalNodeTraining = evalInputOutputTraining.Item1;
var evalOutputTraining = evalInputOutputTraining.Item2;
evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
scoreNodeTrainingOutput.ScoredData.VarName;

if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down
50 changes: 25 additions & 25 deletions src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
private readonly string _regenerate;
private readonly HashSet<string> _excludedSet;
private const string RegistrationName = "CSharpApiGenerator";
public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
{
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
type = type.GetGenericArguments()[0];

if (_typesSymbolTable.ContainsKey(type.FullName))
if (TypesSymbolTable.ContainsKey(type.FullName))
continue;

if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
if (enumType == typeof(int))
writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
else
{
Contracts.Assert(enumType == typeof(byte));
writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
}

writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
if (typeEnum != TlcModule.DataKind.Unknown)
continue;

if (_typesSymbolTable.ContainsKey(type.FullName))
if (TypesSymbolTable.ContainsKey(type.FullName))
continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
string classBase = "";
if (type.IsSubclassOf(typeof(OneToOneColumn)))
classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
writer.WriteLine("{");
writer.Indent();
GenerateInputFields(writer, type, catalog, _typesSymbolTable);
GenerateInputFields(writer, type, catalog, TypesSymbolTable);
writer.Outdent();
writer.WriteLine("}");
writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
writer.Indent();
if (isArray)
{
writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
writer.WriteLine($"{fieldName} = list.ToArray();");
}
else
writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
writer.Outdent();
writer.WriteLine("}");
writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
writer.Indent();
if (isArray)
{
writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
writer.WriteLine($"{fieldName} = list.ToArray();");
}
else
writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
writer.Outdent();
writer.WriteLine("}");
writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
writer.Indent();
if (isArray)
{
writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
writer.WriteLine($"{fieldName} = list.ToArray();");
}
else
writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
writer.Outdent();
writer.WriteLine("}");
writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
writer.WriteLine($"/// {line}");
writer.WriteLine("/// </summary>");
if(entryPointInfo.ObsoleteAttribute != null)

if(entryPointInfo.ObsoleteAttribute != null)
writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
writer.WriteLine("{");
writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
writer.WriteLine();
GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
writer.WriteLine();

GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
writer.WriteLine("{");
writer.Indent();
GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
writer.Outdent();
writer.WriteLine("}");
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
Code cleanup#271

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

justinormont
merged 1 commit into

from

May 30, 2018
 Merged


Code cleanup
#271
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


6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
 public readonly Type[] OutputKinds;
 public readonly ObsoleteAttribute ObsoleteAttribute;

 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
 {
 Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
 if (attr == null)
 continue;

 var info = new EntryPointInfo(ectx, methodInfo, attr,
 var info = new EntryPointInfo(ectx, methodInfo, attr,
 methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

 entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
 Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
 Contracts.CheckValue(argumentType, nameof(argumentType));

 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 return component != null;
 }

Expand Down

5 changes: 1 addition & 4 deletions
src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
 host.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);


 IPredictor predictor;
 var inputData = input.Data;
 RoleMappedData data;
 input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
 input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

 IDataView scoredPipe;
 using (var ch = host.Start("Creating scoring pipeline"))
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
 testMetricVal += 1e-10;

 // Save performance score
 candidate.PerformanceSummary =
 candidate.PerformanceSummary =
 new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
 _sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
 _history.Add(candidate);
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
 public static class AutoMlUtils
 {
 public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
 public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
 {
 Contracts.CheckValue(env, nameof(env));
 env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

 public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
 {
 double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
 double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
 return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
 }

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

 var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
 var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
 testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
 testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
 }

 public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
 return result;
 }


 public sealed class ArrayIDataViewInput
 {
 [Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down

5 changes: 2 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
 public IDataView ConfusionMatrix;
 }


 public sealed class CombineMetricsInput
 {
 [Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 }
 else
 args.Outputs.TransformModel = null;

 // Set train/test trainer kind to match.
 args.Kind = input.Kind;

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
 var host = env.Register("ImportTextData");
 env.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 return new Output { Data = loader };
 }
 }
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
 throw env.Except($"Invalid variable name '{varName}'.");

 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 node.GetOutputVariableName(nameof(Output.PredictorModel));

 foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
 var evalNodeTraining = evalInputOutputTraining.Item1;
 var evalOutputTraining = evalInputOutputTraining.Item2;
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 scoreNodeTrainingOutput.ScoredData.VarName;

 if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down

50 changes: 25 additions & 25 deletions
src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
 private readonly string _regenerate;
 private readonly HashSet<string> _excludedSet;
 private const string RegistrationName = "CSharpApiGenerator";
 public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
 public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

 public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
 {
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
 type = type.GetGenericArguments()[0];

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

 if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

 var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 if (enumType == typeof(int))
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 else
 {
 Contracts.Assert(enumType == typeof(byte));
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 }

 writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
 if (typeEnum != TlcModule.DataKind.Unknown)
 continue;

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 string classBase = "";
 if (type.IsSubclassOf(typeof(OneToOneColumn)))
 classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
 classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, type, catalog, _typesSymbolTable);
 GenerateInputFields(writer, type, catalog, TypesSymbolTable);
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
 foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
 writer.WriteLine($"/// {line}");
 writer.WriteLine("/// </summary>");
 if(entryPointInfo.ObsoleteAttribute != null)

 if(entryPointInfo.ObsoleteAttribute != null)
 writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

 writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

 GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
 writer.WriteLine();
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
 writer.WriteLine();

 GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
 writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
 GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
 writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
 writer.Outdent();
 writer.WriteLine("}");
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
Code cleanup#271

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

justinormont
merged 1 commit into

from

May 30, 2018
 Merged


Code cleanup
#271
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


6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
 public readonly Type[] OutputKinds;
 public readonly ObsoleteAttribute ObsoleteAttribute;

 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
 {
 Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
 if (attr == null)
 continue;

 var info = new EntryPointInfo(ectx, methodInfo, attr,
 var info = new EntryPointInfo(ectx, methodInfo, attr,
 methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

 entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
 Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
 Contracts.CheckValue(argumentType, nameof(argumentType));

 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 return component != null;
 }

Expand Down

5 changes: 1 addition & 4 deletions
src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
 host.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);


 IPredictor predictor;
 var inputData = input.Data;
 RoleMappedData data;
 input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
 input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

 IDataView scoredPipe;
 using (var ch = host.Start("Creating scoring pipeline"))
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
 testMetricVal += 1e-10;

 // Save performance score
 candidate.PerformanceSummary =
 candidate.PerformanceSummary =
 new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
 _sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
 _history.Add(candidate);
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
 public static class AutoMlUtils
 {
 public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
 public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
 {
 Contracts.CheckValue(env, nameof(env));
 env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

 public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
 {
 double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
 double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
 return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
 }

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

 var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
 var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
 testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
 testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
 }

 public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
 return result;
 }


 public sealed class ArrayIDataViewInput
 {
 [Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down

5 changes: 2 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
 public IDataView ConfusionMatrix;
 }


 public sealed class CombineMetricsInput
 {
 [Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 }
 else
 args.Outputs.TransformModel = null;

 // Set train/test trainer kind to match.
 args.Kind = input.Kind;

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
 var host = env.Register("ImportTextData");
 env.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 return new Output { Data = loader };
 }
 }
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
 throw env.Except($"Invalid variable name '{varName}'.");

 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 node.GetOutputVariableName(nameof(Output.PredictorModel));

 foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
 var evalNodeTraining = evalInputOutputTraining.Item1;
 var evalOutputTraining = evalInputOutputTraining.Item2;
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 scoreNodeTrainingOutput.ScoredData.VarName;

 if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down

50 changes: 25 additions & 25 deletions
src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
 private readonly string _regenerate;
 private readonly HashSet<string> _excludedSet;
 private const string RegistrationName = "CSharpApiGenerator";
 public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
 public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

 public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
 {
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
 type = type.GetGenericArguments()[0];

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

 if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

 var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 if (enumType == typeof(int))
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 else
 {
 Contracts.Assert(enumType == typeof(byte));
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 }

 writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
 if (typeEnum != TlcModule.DataKind.Unknown)
 continue;

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 string classBase = "";
 if (type.IsSubclassOf(typeof(OneToOneColumn)))
 classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
 classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, type, catalog, _typesSymbolTable);
 GenerateInputFields(writer, type, catalog, TypesSymbolTable);
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
 foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
 writer.WriteLine($"/// {line}");
 writer.WriteLine("/// </summary>");
 if(entryPointInfo.ObsoleteAttribute != null)

 if(entryPointInfo.ObsoleteAttribute != null)
 writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

 writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

 GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
 writer.WriteLine();
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
 writer.WriteLine();

 GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
 writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
 GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
 writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
 writer.Outdent();
 writer.WriteLine("}");
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
Code cleanup#271

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

justinormont
merged 1 commit into

from

May 30, 2018
 Merged


Code cleanup
#271
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


6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
 public readonly Type[] OutputKinds;
 public readonly ObsoleteAttribute ObsoleteAttribute;

 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
 {
 Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
 if (attr == null)
 continue;

 var info = new EntryPointInfo(ectx, methodInfo, attr,
 var info = new EntryPointInfo(ectx, methodInfo, attr,
 methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

 entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
 Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
 Contracts.CheckValue(argumentType, nameof(argumentType));

 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 return component != null;
 }

Expand Down

5 changes: 1 addition & 4 deletions
src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
 host.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);


 IPredictor predictor;
 var inputData = input.Data;
 RoleMappedData data;
 input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
 input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

 IDataView scoredPipe;
 using (var ch = host.Start("Creating scoring pipeline"))
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
 testMetricVal += 1e-10;

 // Save performance score
 candidate.PerformanceSummary =
 candidate.PerformanceSummary =
 new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
 _sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
 _history.Add(candidate);
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
 public static class AutoMlUtils
 {
 public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
 public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
 {
 Contracts.CheckValue(env, nameof(env));
 env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

 public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
 {
 double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
 double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
 return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
 }

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

 var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
 var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
 testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
 testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
 }

 public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
 return result;
 }


 public sealed class ArrayIDataViewInput
 {
 [Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down

5 changes: 2 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
 public IDataView ConfusionMatrix;
 }


 public sealed class CombineMetricsInput
 {
 [Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 }
 else
 args.Outputs.TransformModel = null;

 // Set train/test trainer kind to match.
 args.Kind = input.Kind;

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
 var host = env.Register("ImportTextData");
 env.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 return new Output { Data = loader };
 }
 }
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
 throw env.Except($"Invalid variable name '{varName}'.");

 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 node.GetOutputVariableName(nameof(Output.PredictorModel));

 foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
 var evalNodeTraining = evalInputOutputTraining.Item1;
 var evalOutputTraining = evalInputOutputTraining.Item2;
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 scoreNodeTrainingOutput.ScoredData.VarName;

 if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down

50 changes: 25 additions & 25 deletions
src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
 private readonly string _regenerate;
 private readonly HashSet<string> _excludedSet;
 private const string RegistrationName = "CSharpApiGenerator";
 public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
 public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

 public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
 {
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
 type = type.GetGenericArguments()[0];

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

 if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

 var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 if (enumType == typeof(int))
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 else
 {
 Contracts.Assert(enumType == typeof(byte));
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 }

 writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
 if (typeEnum != TlcModule.DataKind.Unknown)
 continue;

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 string classBase = "";
 if (type.IsSubclassOf(typeof(OneToOneColumn)))
 classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
 classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, type, catalog, _typesSymbolTable);
 GenerateInputFields(writer, type, catalog, TypesSymbolTable);
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
 foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
 writer.WriteLine($"/// {line}");
 writer.WriteLine("/// </summary>");
 if(entryPointInfo.ObsoleteAttribute != null)

 if(entryPointInfo.ObsoleteAttribute != null)
 writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

 writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

 GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
 writer.WriteLine();
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
 writer.WriteLine();

 GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
 writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
 GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
 writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
 writer.Outdent();
 writer.WriteLine("}");
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
Code cleanup#271

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

justinormont
merged 1 commit into

from

May 30, 2018
 Merged


Code cleanup
#271
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


6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
 public readonly Type[] OutputKinds;
 public readonly ObsoleteAttribute ObsoleteAttribute;

 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
 {
 Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
 if (attr == null)
 continue;

 var info = new EntryPointInfo(ectx, methodInfo, attr,
 var info = new EntryPointInfo(ectx, methodInfo, attr,
 methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

 entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
 Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
 Contracts.CheckValue(argumentType, nameof(argumentType));

 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 return component != null;
 }

Expand Down

5 changes: 1 addition & 4 deletions
src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
 host.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);


 IPredictor predictor;
 var inputData = input.Data;
 RoleMappedData data;
 input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
 input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

 IDataView scoredPipe;
 using (var ch = host.Start("Creating scoring pipeline"))
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
 testMetricVal += 1e-10;

 // Save performance score
 candidate.PerformanceSummary =
 candidate.PerformanceSummary =
 new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
 _sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
 _history.Add(candidate);
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
 public static class AutoMlUtils
 {
 public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
 public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
 {
 Contracts.CheckValue(env, nameof(env));
 env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

 public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
 {
 double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
 double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
 return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
 }

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

 var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
 var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
 testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
 testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
 }

 public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
 return result;
 }


 public sealed class ArrayIDataViewInput
 {
 [Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down

5 changes: 2 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
 public IDataView ConfusionMatrix;
 }


 public sealed class CombineMetricsInput
 {
 [Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 }
 else
 args.Outputs.TransformModel = null;

 // Set train/test trainer kind to match.
 args.Kind = input.Kind;

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
 var host = env.Register("ImportTextData");
 env.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 return new Output { Data = loader };
 }
 }
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
 throw env.Except($"Invalid variable name '{varName}'.");

 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 node.GetOutputVariableName(nameof(Output.PredictorModel));

 foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
 var evalNodeTraining = evalInputOutputTraining.Item1;
 var evalOutputTraining = evalInputOutputTraining.Item2;
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 scoreNodeTrainingOutput.ScoredData.VarName;

 if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down

50 changes: 25 additions & 25 deletions
src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
 private readonly string _regenerate;
 private readonly HashSet<string> _excludedSet;
 private const string RegistrationName = "CSharpApiGenerator";
 public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
 public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

 public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
 {
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
 type = type.GetGenericArguments()[0];

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

 if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

 var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 if (enumType == typeof(int))
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 else
 {
 Contracts.Assert(enumType == typeof(byte));
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 }

 writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
 if (typeEnum != TlcModule.DataKind.Unknown)
 continue;

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 string classBase = "";
 if (type.IsSubclassOf(typeof(OneToOneColumn)))
 classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
 classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, type, catalog, _typesSymbolTable);
 GenerateInputFields(writer, type, catalog, TypesSymbolTable);
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
 foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
 writer.WriteLine($"/// {line}");
 writer.WriteLine("/// </summary>");
 if(entryPointInfo.ObsoleteAttribute != null)

 if(entryPointInfo.ObsoleteAttribute != null)
 writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

 writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

 GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
 writer.WriteLine();
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
 writer.WriteLine();

 GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
 writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
 GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
 writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
 writer.Outdent();
 writer.WriteLine("}");
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
Code cleanup#271

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

justinormont
merged 1 commit into

from

May 30, 2018
 Merged


Code cleanup
#271
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


6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
 public readonly Type[] OutputKinds;
 public readonly ObsoleteAttribute ObsoleteAttribute;

 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
 {
 Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
 if (attr == null)
 continue;

 var info = new EntryPointInfo(ectx, methodInfo, attr,
 var info = new EntryPointInfo(ectx, methodInfo, attr,
 methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

 entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
 Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
 Contracts.CheckValue(argumentType, nameof(argumentType));

 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 return component != null;
 }

Expand Down

5 changes: 1 addition & 4 deletions
src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
 host.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);


 IPredictor predictor;
 var inputData = input.Data;
 RoleMappedData data;
 input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
 input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

 IDataView scoredPipe;
 using (var ch = host.Start("Creating scoring pipeline"))
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
 testMetricVal += 1e-10;

 // Save performance score
 candidate.PerformanceSummary =
 candidate.PerformanceSummary =
 new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
 _sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
 _history.Add(candidate);
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
 public static class AutoMlUtils
 {
 public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
 public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
 {
 Contracts.CheckValue(env, nameof(env));
 env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

 public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
 {
 double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
 double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
 return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
 }

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

 var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
 var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
 testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
 testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
 }

 public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
 return result;
 }


 public sealed class ArrayIDataViewInput
 {
 [Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down

5 changes: 2 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
 public IDataView ConfusionMatrix;
 }


 public sealed class CombineMetricsInput
 {
 [Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 }
 else
 args.Outputs.TransformModel = null;

 // Set train/test trainer kind to match.
 args.Kind = input.Kind;

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
 var host = env.Register("ImportTextData");
 env.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 return new Output { Data = loader };
 }
 }
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
 throw env.Except($"Invalid variable name '{varName}'.");

 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 node.GetOutputVariableName(nameof(Output.PredictorModel));

 foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
 var evalNodeTraining = evalInputOutputTraining.Item1;
 var evalOutputTraining = evalInputOutputTraining.Item2;
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 scoreNodeTrainingOutput.ScoredData.VarName;

 if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down

50 changes: 25 additions & 25 deletions
src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
 private readonly string _regenerate;
 private readonly HashSet<string> _excludedSet;
 private const string RegistrationName = "CSharpApiGenerator";
 public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
 public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

 public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
 {
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
 type = type.GetGenericArguments()[0];

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

 if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

 var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 if (enumType == typeof(int))
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 else
 {
 Contracts.Assert(enumType == typeof(byte));
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 }

 writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
 if (typeEnum != TlcModule.DataKind.Unknown)
 continue;

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 string classBase = "";
 if (type.IsSubclassOf(typeof(OneToOneColumn)))
 classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
 classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, type, catalog, _typesSymbolTable);
 GenerateInputFields(writer, type, catalog, TypesSymbolTable);
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
 foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
 writer.WriteLine($"/// {line}");
 writer.WriteLine("/// </summary>");
 if(entryPointInfo.ObsoleteAttribute != null)

 if(entryPointInfo.ObsoleteAttribute != null)
 writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

 writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

 GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
 writer.WriteLine();
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
 writer.WriteLine();

 GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
 writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
 GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
 writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
 writer.Outdent();
 writer.WriteLine("}");
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
Code cleanup#271

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

justinormont
merged 1 commit into

from

May 30, 2018
 Merged


Code cleanup
#271
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


6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
 public readonly Type[] OutputKinds;
 public readonly ObsoleteAttribute ObsoleteAttribute;

 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
 {
 Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
 if (attr == null)
 continue;

 var info = new EntryPointInfo(ectx, methodInfo, attr,
 var info = new EntryPointInfo(ectx, methodInfo, attr,
 methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

 entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
 Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
 Contracts.CheckValue(argumentType, nameof(argumentType));

 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 return component != null;
 }

Expand Down

5 changes: 1 addition & 4 deletions
src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
 host.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);


 IPredictor predictor;
 var inputData = input.Data;
 RoleMappedData data;
 input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
 input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

 IDataView scoredPipe;
 using (var ch = host.Start("Creating scoring pipeline"))
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
 testMetricVal += 1e-10;

 // Save performance score
 candidate.PerformanceSummary =
 candidate.PerformanceSummary =
 new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
 _sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
 _history.Add(candidate);
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
 public static class AutoMlUtils
 {
 public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
 public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
 {
 Contracts.CheckValue(env, nameof(env));
 env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

 public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
 {
 double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
 double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
 return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
 }

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

 var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
 var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
 testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
 testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
 }

 public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
 return result;
 }


 public sealed class ArrayIDataViewInput
 {
 [Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down

5 changes: 2 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
 public IDataView ConfusionMatrix;
 }


 public sealed class CombineMetricsInput
 {
 [Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 }
 else
 args.Outputs.TransformModel = null;

 // Set train/test trainer kind to match.
 args.Kind = input.Kind;

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
 var host = env.Register("ImportTextData");
 env.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 return new Output { Data = loader };
 }
 }
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
 throw env.Except($"Invalid variable name '{varName}'.");

 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 node.GetOutputVariableName(nameof(Output.PredictorModel));

 foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
 var evalNodeTraining = evalInputOutputTraining.Item1;
 var evalOutputTraining = evalInputOutputTraining.Item2;
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 scoreNodeTrainingOutput.ScoredData.VarName;

 if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down

50 changes: 25 additions & 25 deletions
src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
 private readonly string _regenerate;
 private readonly HashSet<string> _excludedSet;
 private const string RegistrationName = "CSharpApiGenerator";
 public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
 public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

 public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
 {
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
 type = type.GetGenericArguments()[0];

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

 if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

 var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 if (enumType == typeof(int))
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 else
 {
 Contracts.Assert(enumType == typeof(byte));
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 }

 writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
 if (typeEnum != TlcModule.DataKind.Unknown)
 continue;

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 string classBase = "";
 if (type.IsSubclassOf(typeof(OneToOneColumn)))
 classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
 classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, type, catalog, _typesSymbolTable);
 GenerateInputFields(writer, type, catalog, TypesSymbolTable);
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
 foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
 writer.WriteLine($"/// {line}");
 writer.WriteLine("/// </summary>");
 if(entryPointInfo.ObsoleteAttribute != null)

 if(entryPointInfo.ObsoleteAttribute != null)
 writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

 writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

 GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
 writer.WriteLine();
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
 writer.WriteLine();

 GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
 writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
 GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
 writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
 writer.Outdent();
 writer.WriteLine("}");
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
Code cleanup#271

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

justinormont
merged 1 commit into

from

May 30, 2018
 Merged


Code cleanup
#271
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


6 changes: 3 additions & 3 deletions
src/Microsoft.ML.Core/EntryPoints/ModuleCatalog.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ public sealed class EntryPointInfo
 public readonly Type[] OutputKinds;
 public readonly ObsoleteAttribute ObsoleteAttribute;

 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 internal EntryPointInfo(IExceptionContext ectx, MethodInfo method,
 TlcModule.EntryPointAttribute attribute, ObsoleteAttribute obsoleteAttribute)
 {
 Contracts.AssertValueOrNull(ectx);
Expand DownExpand Up@@ -187,7 +187,7 @@ private ModuleCatalog(IExceptionContext ectx)
 if (attr == null)
 continue;

 var info = new EntryPointInfo(ectx, methodInfo, attr,
 var info = new EntryPointInfo(ectx, methodInfo, attr,
 methodInfo.GetCustomAttributes(typeof(ObsoleteAttribute), false).FirstOrDefault() as ObsoleteAttribute);

 entryPoints.Add(info);
Expand DownExpand Up@@ -315,7 +315,7 @@ public bool TryFindComponent(Type interfaceType, Type argumentType, out Componen
 Contracts.CheckParam(interfaceType.IsInterface, nameof(interfaceType), "Must be interface");
 Contracts.CheckValue(argumentType, nameof(argumentType));

 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 component = _components.FirstOrDefault(x => x.InterfaceType == interfaceType && x.ArgumentType == argumentType);
 return component != null;
 }

Expand Down

5 changes: 1 addition & 4 deletions
src/Microsoft.ML.Data/EntryPoints/ScoreModel.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -72,11 +72,8 @@ public static Output Score(IHostEnvironment env, Input input)
 host.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);


 IPredictor predictor;
 var inputData = input.Data;
 RoleMappedData data;
 input.PredictorModel.PrepareData(host, inputData, out data, out predictor);
 input.PredictorModel.PrepareData(host, inputData, out RoleMappedData data, out IPredictor predictor);

 IDataView scoredPipe;
 using (var ch = host.Start("Creating scoring pipeline"))
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.PipelineInference/AutoInference.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ private void ProcessPipeline(Sweeper.Algorithms.SweeperProbabilityUtils utils, S
 testMetricVal += 1e-10;

 // Save performance score
 candidate.PerformanceSummary =
 candidate.PerformanceSummary =
 new RunSummary(testMetricVal, randomizedNumberOfRows, stopwatch.ElapsedMilliseconds, trainMetricVal);
 _sortedSampledElements.Add(candidate.PerformanceSummary.MetricValue, candidate);
 _history.Add(candidate);
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ namespace Microsoft.ML.Runtime.PipelineInference
{
 public static class AutoMlUtils
 {
 public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result, string columnName)
 public static double ExtractValueFromIdv(IHostEnvironment env, IDataView result, string columnName)
 {
 Contracts.CheckValue(env, nameof(env));
 env.CheckValue(result, nameof(result));
Expand All@@ -40,8 +40,8 @@ public static double ExtractValueFromIDV(IHostEnvironment env, IDataView result,

 public static AutoInference.RunSummary ExtractRunSummary(IHostEnvironment env, IDataView result, string metricColumnName, IDataView trainResult = null)
 {
 double testingMetricValue = ExtractValueFromIDV(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIDV(env, trainResult, metricColumnName) : double.MinValue;
 double testingMetricValue = ExtractValueFromIdv(env, result, metricColumnName);
 double trainingMetricValue = trainResult != null ? ExtractValueFromIdv(env, trainResult, metricColumnName) : double.MinValue;
 return new AutoInference.RunSummary(testingMetricValue, 0, 0, trainingMetricValue);
 }

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@@ -213,8 +213,8 @@ public void RunTrainTestExperiment(IDataView trainData, IDataView testData,

 var dataOut = experiment.GetOutput(trainTestOutput.OverallMetrics);
 var dataOutTraining = experiment.GetOutput(trainTestOutput.TrainingOverallMetrics);
 testMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIDV(_env, dataOutTraining, metric.Name);
 testMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOut, metric.Name);
 trainMetricValue = AutoMlUtils.ExtractValueFromIdv(_env, dataOutTraining, metric.Name);
 }

 public static PipelineResultRow[] ExtractResults(IHostEnvironment env, IDataView data,
Expand Down

1 change: 0 additions & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationBinaryMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -256,7 +256,6 @@ public static ArrayITransformModelOutput MakeArray(IHostEnvironment env, ArrayIT
 return result;
 }


 public sealed class ArrayIDataViewInput
 {
 [Argument(ArgumentType.Required, HelpText = "The data sets", SortOrder = 1)]
Expand Down

5 changes: 2 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "The transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -104,7 +104,6 @@ public sealed class Output
 public IDataView ConfusionMatrix;
 }


 public sealed class CombineMetricsInput
 {
 [Argument(ArgumentType.Multiple, HelpText = "Overall metrics datasets", SortOrder = 1)]
Expand DownExpand Up@@ -219,7 +218,7 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
 }
 else
 args.Outputs.TransformModel = null;

 // Set train/test trainer kind to match.
 args.Kind = input.Kind;

Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML/Runtime/EntryPoints/ImportTextData.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ public static Output TextLoader(IHostEnvironment env, LoaderInput input)
 var host = env.Register("ImportTextData");
 env.CheckValue(input, nameof(input));
 EntryPointUtils.CheckInputArgs(host, input);
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 var loader = host.CreateLoader(input.Arguments, new FileHandleSource(input.InputFile));
 return new Output { Data = loader };
 }
 }
Expand Down

6 changes: 3 additions & 3 deletions
src/Microsoft.ML/Runtime/EntryPoints/TrainTestMacro.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public sealed class SubGraphOutput
 {
 [Argument(ArgumentType.AtMostOnce, HelpText = "The predictor model", SortOrder = 1)]
 public Var<IPredictorModel> PredictorModel;

 [Argument(ArgumentType.AtMostOnce, HelpText = "Transform model", SortOrder = 2)]
 public Var<ITransformModel> TransformModel;
 }
Expand DownExpand Up@@ -130,7 +130,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 if (!subGraphRunContext.TryGetVariable(varName, out dataVariable))
 throw env.Except($"Invalid variable name '{varName}'.");

 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 string outputVarName = input.Outputs.PredictorModel == null ? node.GetOutputVariableName(nameof(Output.TransformModel)) :
 node.GetOutputVariableName(nameof(Output.PredictorModel));

 foreach (var subGraphNode in subGraphNodes)
Expand DownExpand Up@@ -249,7 +249,7 @@ public static CommonOutputs.MacroOutput<Output> TrainTest(
 var evalInputOutputTraining = MacroUtils.GetEvaluatorInputOutput(input.Kind, settings);
 var evalNodeTraining = evalInputOutputTraining.Item1;
 var evalOutputTraining = evalInputOutputTraining.Item2;
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 evalNodeTraining.Data.VarName = input.Outputs.PredictorModel == null ? datasetTransformNodeTrainingOutput.OutputData.VarName :
 scoreNodeTrainingOutput.ScoredData.VarName;

 if (node.OutputMap.TryGetValue(nameof(Output.TrainingWarnings), out outVariableName))
Expand Down

50 changes: 25 additions & 25 deletions
src/Microsoft.ML/Runtime/Internal/Tools/CSharpApiGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -408,7 +408,7 @@ public static string GetJsonFromField(string fieldName, Type fieldType)
 private readonly string _regenerate;
 private readonly HashSet<string> _excludedSet;
 private const string RegistrationName = "CSharpApiGenerator";
 public Dictionary<string, string> _typesSymbolTable = new Dictionary<string, string>();
 public Dictionary<string, string> TypesSymbolTable = new Dictionary<string, string>();

 public CSharpApiGenerator(IHostEnvironment env, Arguments args, string regenerate)
 {
Expand DownExpand Up@@ -612,7 +612,7 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu
 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Optional<>))
 type = type.GetGenericArguments()[0];

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

 if (!type.IsEnum)
Expand All@@ -625,13 +625,13 @@ private void GenerateEnums(IndentingTextWriter writer, Type inputType, string cu

 var enumType = Enum.GetUnderlyingType(type);

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 if (enumType == typeof(int))
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}");
 else
 {
 Contracts.Assert(enumType == typeof(byte));
 writer.WriteLine($"public enum {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 writer.WriteLine($"public enum {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)} : byte");
 }

 writer.Write("{");
Expand DownExpand Up@@ -707,19 +707,19 @@ private void GenerateStructs(IndentingTextWriter writer,
 if (typeEnum != TlcModule.DataKind.Unknown)
 continue;

 if (_typesSymbolTable.ContainsKey(type.FullName))
 if (TypesSymbolTable.ContainsKey(type.FullName))
 continue;

_typesSymbolTable[type.FullName] = GetSymbolFromType(_typesSymbolTable, type, currentNamespace);
TypesSymbolTable[type.FullName] = GetSymbolFromType(TypesSymbolTable, type, currentNamespace);
 string classBase = "";
 if (type.IsSubclassOf(typeof(OneToOneColumn)))
 classBase = $" : OneToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 classBase = $" : OneToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IOneToOneColumn";
 else if (type.IsSubclassOf(typeof(ManyToOneColumn)))
 classBase = $" : ManyToOneColumn<{_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {_typesSymbolTable[type.FullName].Substring(_typesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 classBase = $" : ManyToOneColumn<{TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}>, IManyToOneColumn";
 writer.WriteLine($"public sealed partial class {TypesSymbolTable[type.FullName].Substring(TypesSymbolTable[type.FullName].LastIndexOf('.') + 1)}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, type, catalog, _typesSymbolTable);
 GenerateInputFields(writer, type, catalog, TypesSymbolTable);
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -858,12 +858,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand All@@ -872,12 +872,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = OneToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = OneToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -905,12 +905,12 @@ private void GenerateColumnAddMethods(IndentingTextWriter writer,
 writer.Indent();
 if (isArray)
 {
 writer.WriteLine($"var list = {fieldName} == null ? new List<{_typesSymbolTable[type.FullName]}>() : new List<{_typesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"var list = {fieldName} == null ? new List<{TypesSymbolTable[type.FullName]}>() : new List<{TypesSymbolTable[type.FullName]}>({fieldName});");
 writer.WriteLine($"list.Add(ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source));");
 writer.WriteLine($"{fieldName} = list.ToArray();");
 }
 else
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{_typesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.WriteLine($"{fieldName} = ManyToOneColumn<{TypesSymbolTable[type.FullName]}>.Create(name, source);");
 writer.Outdent();
 writer.WriteLine("}");
 writer.WriteLine();
Expand DownExpand Up@@ -942,10 +942,10 @@ private void GenerateInput(IndentingTextWriter writer,
 foreach (var line in entryPointInfo.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
 writer.WriteLine($"/// {line}");
 writer.WriteLine("/// </summary>");
 if(entryPointInfo.ObsoleteAttribute != null)

 if(entryPointInfo.ObsoleteAttribute != null)
 writer.WriteLine($"[Obsolete(\"{entryPointInfo.ObsoleteAttribute.Message}\")]");

 writer.WriteLine($"public sealed partial class {classAndMethod.Item2}{classBase}");
 writer.WriteLine("{");
 writer.Indent();
Expand All@@ -955,7 +955,7 @@ private void GenerateInput(IndentingTextWriter writer,

 GenerateColumnAddMethods(writer, entryPointInfo.InputType, catalog, classAndMethod.Item2, out Type transformType);
 writer.WriteLine();
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, _typesSymbolTable);
 GenerateInputFields(writer, entryPointInfo.InputType, catalog, TypesSymbolTable);
 writer.WriteLine();

 GenerateOutput(writer, entryPointInfo, out HashSet<string> outputVariableNames);
Expand DownExpand Up@@ -1191,7 +1191,7 @@ private void GenerateComponent(IndentingTextWriter writer, ModuleCatalog.Compone
 writer.WriteLine($"public sealed class {GeneratorUtils.GetComponentName(component)} : {component.Kind}");
 writer.WriteLine("{");
 writer.Indent();
 GenerateInputFields(writer, component.ArgumentType, catalog, _typesSymbolTable, "Microsoft.ML.");
 GenerateInputFields(writer, component.ArgumentType, catalog, TypesSymbolTable, "Microsoft.ML.");
 writer.WriteLine($"internal override string ComponentName => \"{component.Name}\";");
 writer.Outdent();
 writer.WriteLine("}");
Expand Down