[AutoML] Minor changes to generated project in CLI based on feedback#3371

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
srsaggam merged 3 commits into from
Apr 17, 2019
Merged

[AutoML] Minor changes to generated project in CLI based on feedback #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2db62a
nitpicks for generated project
srsaggam Apr 16, 2019
e77a5cb
Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…
srsaggam Apr 16, 2019
1c33b78
revert back the target framework
srsaggam Apr 17, 2019
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
55 changes: 42 additions & 13 deletions src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
private readonly Pipeline pipeline;
private readonly CodeGeneratorSettings settings;
private readonly ColumnInferenceResults columnInferenceResult;
private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
{
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

public void GenerateOutput()
{
// Get the extra nuget packages to be included in the generated project.
var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

bool includeLightGbmPackage = false;
bool includeMklComponentsPackage = false;
SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

// Get Namespace
var namespaceValue = Utils.Normalize(settings.OutputName);
var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
Type labelTypeCsharp = Utils.GetCSharpType(labelType);

// Generate Model Project
var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

// Write files to disk.
var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
var modelProjectName = $"{settings.OutputName}.Model.csproj";

Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

// Generate ConsoleApp Project
var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

// Write files to disk.
var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
}

internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
{
foreach (var node in trainerNodes)
{
PipelineNode currentNode = node;
if (currentNode.Name == TrainerName.Ova.ToString())
{
currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
}

if (LightGBMTrainers.Contains(currentNode.Name))
{
includeLightGbmPackage = true;
}
else if (mklComponentsTrainers.Contains(currentNode.Name))
{
includeMklComponentsPackage = true;
}
}
}

internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
{
var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

var transformsAndTrainers = GenerateTransformsAndTrainers();
var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
}

internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
{
var classLabels = this.GenerateClassLabels();
var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
observationCSFileContent = Utils.FormatCode(observationCSFileContent);
var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
var modelProjectFileContent = GenerateModelProjectFileContent();
var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
}

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
}

#region Model project
private static string GenerateModelProjectFileContent()
private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
{
ModelProject modelProject = new ModelProject();
ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
return modelProject.TransformText();
}

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
#endregion

#region Predict Project
private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
{
var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
return predictProjectFileContent.TransformText();
}

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
return modelBuilder.TransformText();
}
#endregion

}
}
4 changes: 1 addition & 3 deletions src/mlnet/Templates/Console/ModelBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
{
// Save/persist the trained model to a .ZIP file
Console.WriteLine($""=============== Saving the model ==============="");
using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
mlContext.Model.Save(mlModel, modelInputSchema, fs);

mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
}

Expand Down
4 changes: 1 addition & 3 deletions src/mlnet/Templates/Console/ModelBuilder.tt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
{
// Save/persist the trained model to a .ZIP file
Console.WriteLine($"=============== Saving the model ===============");
using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
mlContext.Model.Save(mlModel, modelInputSchema, fs);

mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
}

Expand Down
67 changes: 44 additions & 23 deletions src/mlnet/Templates/Console/ModelProject.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
/// Class to produce the template output
/// </summary>

#line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
#line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
public partial class ModelProject : ModelProjectBase
{
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
/// </summary>
public virtual string TransformText()
{
this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<RestoreSources>
https://api.nuget.org/v3/index.json;
</RestoreSources>
</PropertyGroup>
<ItemGroup>
<PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
</ItemGroup>

<ItemGroup>
<None Update=""MLModel.zip"">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
");
this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
"oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
"rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

#line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
if(IncludeLightGBMPackage){

#line default
#line hidden
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
"\n");

#line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

#line default
#line hidden

#line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
if(IncludeMklComponentsPackage){

#line default
#line hidden
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
"w\" />\r\n");

#line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

#line default
#line hidden
this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
"tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
">\r\n \r\n</Project>\r\n");
return this.GenerationEnvironment.ToString();
}

#line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


#line default
#line hidden
}

#line default
Expand Down
15 changes: 10 additions & 5 deletions src/mlnet/Templates/Console/ModelProject.tt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<RestoreSources>
https://api.nuget.org/v3/index.json;
</RestoreSources>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
</ItemGroup>

<ItemGroup>
Expand All@@ -24,3 +25,7 @@
</ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[AutoML] Minor changes to generated project in CLI based on feedback#3371

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

srsaggam
merged 3 commits into

from

Apr 17, 2019
 Merged


[AutoML] Minor changes to generated project in CLI based on feedback
#3371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b2db62a

nitpicks for generated project


srsaggam Apr 16, 2019
e77a5cb

Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…


srsaggam Apr 16, 2019
1c33b78

revert back the target framework


srsaggam Apr 17, 2019

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


55 changes: 42 additions & 13 deletions
src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
 private readonly Pipeline pipeline;
 private readonly CodeGeneratorSettings settings;
 private readonly ColumnInferenceResults columnInferenceResult;
 private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
 private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

 internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
 {
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

 public void GenerateOutput()
 {
 // Get the extra nuget packages to be included in the generated project.
 var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

 bool includeLightGbmPackage = false;
 bool includeMklComponentsPackage = false;
 SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

 // Get Namespace
 var namespaceValue = Utils.Normalize(settings.OutputName);
 var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
 Type labelTypeCsharp = Utils.GetCSharpType(labelType);

 // Generate Model Project
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
 var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
 var modelProjectName = $"{settings.OutputName}.Model.csproj";

 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

 // Generate ConsoleApp Project
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
 Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
 private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
 {
 foreach (var node in trainerNodes)
 {
 PipelineNode currentNode = node;
 if (currentNode.Name == TrainerName.Ova.ToString())
 {
 currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
 }

 if (LightGBMTrainers.Contains(currentNode.Name))
 {
 includeLightGbmPackage = true;
 }
 else if (mklComponentsTrainers.Contains(currentNode.Name))
 {
 includeMklComponentsPackage = true;
 }
 }
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
 predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
 return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
 }

 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var classLabels = this.GenerateClassLabels();
 var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
 observationCSFileContent = Utils.FormatCode(observationCSFileContent);
 var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
 predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
 var modelProjectFileContent = GenerateModelProjectFileContent();
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
 return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
 }

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
 }

 #region Model project
 private static string GenerateModelProjectFileContent()
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 ModelProject modelProject = new ModelProject();
 ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
 return modelProject.TransformText();
 }

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
 #endregion

 #region Predict Project
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
 return predictProjectFileContent.TransformText();
 }

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
 return modelBuilder.TransformText();
 }
 #endregion

 }
}

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($""=============== Saving the model ==============="");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
 }

Expand Down

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($"=============== Saving the model ===============");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
 }

Expand Down

67 changes: 44 additions & 23 deletions
src/mlnet/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
 /// Class to produce the template output
 /// </summary>

 #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
 #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
 public partial class ModelProject : ModelProjectBase
 {
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
 /// </summary>
 public virtual string TransformText()
 {
 this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
 </ItemGroup>

 <ItemGroup>
 <None Update=""MLModel.zip"">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>

</Project>
");
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
 "oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
 "rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

 #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeLightGBMPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
 "\n");

 #line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden

 #line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeMklComponentsPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
 "w\" />\r\n");

 #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
 "tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
 ">\r\n \r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

 #line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


 #line default
 #line hidden
 }

 #line default
Expand Down

15 changes: 10 additions & 5 deletions
src/mlnet/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
 <PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
 <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
 </ItemGroup>

 <ItemGroup>
Expand All@@ -24,3 +25,7 @@
 </ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading

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

Skip to content
[AutoML] Minor changes to generated project in CLI based on feedback#3371

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

srsaggam
merged 3 commits into

from

Apr 17, 2019
 Merged


[AutoML] Minor changes to generated project in CLI based on feedback
#3371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b2db62a

nitpicks for generated project


srsaggam Apr 16, 2019
e77a5cb

Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…


srsaggam Apr 16, 2019
1c33b78

revert back the target framework


srsaggam Apr 17, 2019

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


55 changes: 42 additions & 13 deletions
src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
 private readonly Pipeline pipeline;
 private readonly CodeGeneratorSettings settings;
 private readonly ColumnInferenceResults columnInferenceResult;
 private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
 private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

 internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
 {
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

 public void GenerateOutput()
 {
 // Get the extra nuget packages to be included in the generated project.
 var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

 bool includeLightGbmPackage = false;
 bool includeMklComponentsPackage = false;
 SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

 // Get Namespace
 var namespaceValue = Utils.Normalize(settings.OutputName);
 var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
 Type labelTypeCsharp = Utils.GetCSharpType(labelType);

 // Generate Model Project
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
 var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
 var modelProjectName = $"{settings.OutputName}.Model.csproj";

 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

 // Generate ConsoleApp Project
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
 Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
 private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
 {
 foreach (var node in trainerNodes)
 {
 PipelineNode currentNode = node;
 if (currentNode.Name == TrainerName.Ova.ToString())
 {
 currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
 }

 if (LightGBMTrainers.Contains(currentNode.Name))
 {
 includeLightGbmPackage = true;
 }
 else if (mklComponentsTrainers.Contains(currentNode.Name))
 {
 includeMklComponentsPackage = true;
 }
 }
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
 predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
 return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
 }

 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var classLabels = this.GenerateClassLabels();
 var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
 observationCSFileContent = Utils.FormatCode(observationCSFileContent);
 var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
 predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
 var modelProjectFileContent = GenerateModelProjectFileContent();
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
 return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
 }

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
 }

 #region Model project
 private static string GenerateModelProjectFileContent()
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 ModelProject modelProject = new ModelProject();
 ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
 return modelProject.TransformText();
 }

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
 #endregion

 #region Predict Project
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
 return predictProjectFileContent.TransformText();
 }

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
 return modelBuilder.TransformText();
 }
 #endregion

 }
}

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($""=============== Saving the model ==============="");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
 }

Expand Down

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($"=============== Saving the model ===============");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
 }

Expand Down

67 changes: 44 additions & 23 deletions
src/mlnet/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
 /// Class to produce the template output
 /// </summary>

 #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
 #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
 public partial class ModelProject : ModelProjectBase
 {
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
 /// </summary>
 public virtual string TransformText()
 {
 this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
 </ItemGroup>

 <ItemGroup>
 <None Update=""MLModel.zip"">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>

</Project>
");
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
 "oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
 "rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

 #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeLightGBMPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
 "\n");

 #line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden

 #line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeMklComponentsPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
 "w\" />\r\n");

 #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
 "tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
 ">\r\n \r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

 #line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


 #line default
 #line hidden
 }

 #line default
Expand Down

15 changes: 10 additions & 5 deletions
src/mlnet/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
 <PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
 <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
 </ItemGroup>

 <ItemGroup>
Expand All@@ -24,3 +25,7 @@
 </ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading

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

Skip to content
[AutoML] Minor changes to generated project in CLI based on feedback#3371

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

srsaggam
merged 3 commits into

from

Apr 17, 2019
 Merged


[AutoML] Minor changes to generated project in CLI based on feedback
#3371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b2db62a

nitpicks for generated project


srsaggam Apr 16, 2019
e77a5cb

Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…


srsaggam Apr 16, 2019
1c33b78

revert back the target framework


srsaggam Apr 17, 2019

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


55 changes: 42 additions & 13 deletions
src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
 private readonly Pipeline pipeline;
 private readonly CodeGeneratorSettings settings;
 private readonly ColumnInferenceResults columnInferenceResult;
 private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
 private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

 internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
 {
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

 public void GenerateOutput()
 {
 // Get the extra nuget packages to be included in the generated project.
 var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

 bool includeLightGbmPackage = false;
 bool includeMklComponentsPackage = false;
 SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

 // Get Namespace
 var namespaceValue = Utils.Normalize(settings.OutputName);
 var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
 Type labelTypeCsharp = Utils.GetCSharpType(labelType);

 // Generate Model Project
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
 var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
 var modelProjectName = $"{settings.OutputName}.Model.csproj";

 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

 // Generate ConsoleApp Project
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
 Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
 private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
 {
 foreach (var node in trainerNodes)
 {
 PipelineNode currentNode = node;
 if (currentNode.Name == TrainerName.Ova.ToString())
 {
 currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
 }

 if (LightGBMTrainers.Contains(currentNode.Name))
 {
 includeLightGbmPackage = true;
 }
 else if (mklComponentsTrainers.Contains(currentNode.Name))
 {
 includeMklComponentsPackage = true;
 }
 }
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
 predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
 return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
 }

 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var classLabels = this.GenerateClassLabels();
 var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
 observationCSFileContent = Utils.FormatCode(observationCSFileContent);
 var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
 predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
 var modelProjectFileContent = GenerateModelProjectFileContent();
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
 return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
 }

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
 }

 #region Model project
 private static string GenerateModelProjectFileContent()
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 ModelProject modelProject = new ModelProject();
 ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
 return modelProject.TransformText();
 }

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
 #endregion

 #region Predict Project
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
 return predictProjectFileContent.TransformText();
 }

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
 return modelBuilder.TransformText();
 }
 #endregion

 }
}

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($""=============== Saving the model ==============="");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
 }

Expand Down

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($"=============== Saving the model ===============");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
 }

Expand Down

67 changes: 44 additions & 23 deletions
src/mlnet/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
 /// Class to produce the template output
 /// </summary>

 #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
 #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
 public partial class ModelProject : ModelProjectBase
 {
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
 /// </summary>
 public virtual string TransformText()
 {
 this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
 </ItemGroup>

 <ItemGroup>
 <None Update=""MLModel.zip"">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>

</Project>
");
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
 "oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
 "rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

 #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeLightGBMPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
 "\n");

 #line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden

 #line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeMklComponentsPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
 "w\" />\r\n");

 #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
 "tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
 ">\r\n \r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

 #line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


 #line default
 #line hidden
 }

 #line default
Expand Down

15 changes: 10 additions & 5 deletions
src/mlnet/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
 <PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
 <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
 </ItemGroup>

 <ItemGroup>
Expand All@@ -24,3 +25,7 @@
 </ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading

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

Skip to content
[AutoML] Minor changes to generated project in CLI based on feedback#3371

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

srsaggam
merged 3 commits into

from

Apr 17, 2019
 Merged


[AutoML] Minor changes to generated project in CLI based on feedback
#3371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b2db62a

nitpicks for generated project


srsaggam Apr 16, 2019
e77a5cb

Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…


srsaggam Apr 16, 2019
1c33b78

revert back the target framework


srsaggam Apr 17, 2019

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


55 changes: 42 additions & 13 deletions
src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
 private readonly Pipeline pipeline;
 private readonly CodeGeneratorSettings settings;
 private readonly ColumnInferenceResults columnInferenceResult;
 private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
 private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

 internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
 {
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

 public void GenerateOutput()
 {
 // Get the extra nuget packages to be included in the generated project.
 var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

 bool includeLightGbmPackage = false;
 bool includeMklComponentsPackage = false;
 SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

 // Get Namespace
 var namespaceValue = Utils.Normalize(settings.OutputName);
 var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
 Type labelTypeCsharp = Utils.GetCSharpType(labelType);

 // Generate Model Project
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
 var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
 var modelProjectName = $"{settings.OutputName}.Model.csproj";

 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

 // Generate ConsoleApp Project
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
 Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
 private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
 {
 foreach (var node in trainerNodes)
 {
 PipelineNode currentNode = node;
 if (currentNode.Name == TrainerName.Ova.ToString())
 {
 currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
 }

 if (LightGBMTrainers.Contains(currentNode.Name))
 {
 includeLightGbmPackage = true;
 }
 else if (mklComponentsTrainers.Contains(currentNode.Name))
 {
 includeMklComponentsPackage = true;
 }
 }
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
 predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
 return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
 }

 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var classLabels = this.GenerateClassLabels();
 var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
 observationCSFileContent = Utils.FormatCode(observationCSFileContent);
 var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
 predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
 var modelProjectFileContent = GenerateModelProjectFileContent();
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
 return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
 }

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
 }

 #region Model project
 private static string GenerateModelProjectFileContent()
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 ModelProject modelProject = new ModelProject();
 ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
 return modelProject.TransformText();
 }

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
 #endregion

 #region Predict Project
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
 return predictProjectFileContent.TransformText();
 }

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
 return modelBuilder.TransformText();
 }
 #endregion

 }
}

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($""=============== Saving the model ==============="");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
 }

Expand Down

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($"=============== Saving the model ===============");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
 }

Expand Down

67 changes: 44 additions & 23 deletions
src/mlnet/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
 /// Class to produce the template output
 /// </summary>

 #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
 #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
 public partial class ModelProject : ModelProjectBase
 {
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
 /// </summary>
 public virtual string TransformText()
 {
 this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
 </ItemGroup>

 <ItemGroup>
 <None Update=""MLModel.zip"">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>

</Project>
");
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
 "oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
 "rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

 #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeLightGBMPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
 "\n");

 #line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden

 #line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeMklComponentsPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
 "w\" />\r\n");

 #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
 "tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
 ">\r\n \r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

 #line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


 #line default
 #line hidden
 }

 #line default
Expand Down

15 changes: 10 additions & 5 deletions
src/mlnet/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
 <PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
 <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
 </ItemGroup>

 <ItemGroup>
Expand All@@ -24,3 +25,7 @@
 </ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading

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

Skip to content
[AutoML] Minor changes to generated project in CLI based on feedback#3371

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

srsaggam
merged 3 commits into

from

Apr 17, 2019
 Merged


[AutoML] Minor changes to generated project in CLI based on feedback
#3371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b2db62a

nitpicks for generated project


srsaggam Apr 16, 2019
e77a5cb

Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…


srsaggam Apr 16, 2019
1c33b78

revert back the target framework


srsaggam Apr 17, 2019

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


55 changes: 42 additions & 13 deletions
src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
 private readonly Pipeline pipeline;
 private readonly CodeGeneratorSettings settings;
 private readonly ColumnInferenceResults columnInferenceResult;
 private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
 private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

 internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
 {
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

 public void GenerateOutput()
 {
 // Get the extra nuget packages to be included in the generated project.
 var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

 bool includeLightGbmPackage = false;
 bool includeMklComponentsPackage = false;
 SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

 // Get Namespace
 var namespaceValue = Utils.Normalize(settings.OutputName);
 var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
 Type labelTypeCsharp = Utils.GetCSharpType(labelType);

 // Generate Model Project
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
 var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
 var modelProjectName = $"{settings.OutputName}.Model.csproj";

 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

 // Generate ConsoleApp Project
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
 Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
 private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
 {
 foreach (var node in trainerNodes)
 {
 PipelineNode currentNode = node;
 if (currentNode.Name == TrainerName.Ova.ToString())
 {
 currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
 }

 if (LightGBMTrainers.Contains(currentNode.Name))
 {
 includeLightGbmPackage = true;
 }
 else if (mklComponentsTrainers.Contains(currentNode.Name))
 {
 includeMklComponentsPackage = true;
 }
 }
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
 predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
 return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
 }

 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var classLabels = this.GenerateClassLabels();
 var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
 observationCSFileContent = Utils.FormatCode(observationCSFileContent);
 var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
 predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
 var modelProjectFileContent = GenerateModelProjectFileContent();
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
 return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
 }

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
 }

 #region Model project
 private static string GenerateModelProjectFileContent()
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 ModelProject modelProject = new ModelProject();
 ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
 return modelProject.TransformText();
 }

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
 #endregion

 #region Predict Project
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
 return predictProjectFileContent.TransformText();
 }

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
 return modelBuilder.TransformText();
 }
 #endregion

 }
}

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($""=============== Saving the model ==============="");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
 }

Expand Down

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($"=============== Saving the model ===============");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
 }

Expand Down

67 changes: 44 additions & 23 deletions
src/mlnet/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
 /// Class to produce the template output
 /// </summary>

 #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
 #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
 public partial class ModelProject : ModelProjectBase
 {
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
 /// </summary>
 public virtual string TransformText()
 {
 this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
 </ItemGroup>

 <ItemGroup>
 <None Update=""MLModel.zip"">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>

</Project>
");
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
 "oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
 "rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

 #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeLightGBMPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
 "\n");

 #line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden

 #line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeMklComponentsPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
 "w\" />\r\n");

 #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
 "tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
 ">\r\n \r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

 #line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


 #line default
 #line hidden
 }

 #line default
Expand Down

15 changes: 10 additions & 5 deletions
src/mlnet/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
 <PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
 <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
 </ItemGroup>

 <ItemGroup>
Expand All@@ -24,3 +25,7 @@
 </ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading

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

Skip to content
[AutoML] Minor changes to generated project in CLI based on feedback#3371

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

srsaggam
merged 3 commits into

from

Apr 17, 2019
 Merged


[AutoML] Minor changes to generated project in CLI based on feedback
#3371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b2db62a

nitpicks for generated project


srsaggam Apr 16, 2019
e77a5cb

Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…


srsaggam Apr 16, 2019
1c33b78

revert back the target framework


srsaggam Apr 17, 2019

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


55 changes: 42 additions & 13 deletions
src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
 private readonly Pipeline pipeline;
 private readonly CodeGeneratorSettings settings;
 private readonly ColumnInferenceResults columnInferenceResult;
 private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
 private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

 internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
 {
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

 public void GenerateOutput()
 {
 // Get the extra nuget packages to be included in the generated project.
 var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

 bool includeLightGbmPackage = false;
 bool includeMklComponentsPackage = false;
 SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

 // Get Namespace
 var namespaceValue = Utils.Normalize(settings.OutputName);
 var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
 Type labelTypeCsharp = Utils.GetCSharpType(labelType);

 // Generate Model Project
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
 var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
 var modelProjectName = $"{settings.OutputName}.Model.csproj";

 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

 // Generate ConsoleApp Project
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
 Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
 private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
 {
 foreach (var node in trainerNodes)
 {
 PipelineNode currentNode = node;
 if (currentNode.Name == TrainerName.Ova.ToString())
 {
 currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
 }

 if (LightGBMTrainers.Contains(currentNode.Name))
 {
 includeLightGbmPackage = true;
 }
 else if (mklComponentsTrainers.Contains(currentNode.Name))
 {
 includeMklComponentsPackage = true;
 }
 }
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
 predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
 return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
 }

 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var classLabels = this.GenerateClassLabels();
 var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
 observationCSFileContent = Utils.FormatCode(observationCSFileContent);
 var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
 predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
 var modelProjectFileContent = GenerateModelProjectFileContent();
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
 return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
 }

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
 }

 #region Model project
 private static string GenerateModelProjectFileContent()
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 ModelProject modelProject = new ModelProject();
 ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
 return modelProject.TransformText();
 }

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
 #endregion

 #region Predict Project
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
 return predictProjectFileContent.TransformText();
 }

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
 return modelBuilder.TransformText();
 }
 #endregion

 }
}

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($""=============== Saving the model ==============="");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
 }

Expand Down

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($"=============== Saving the model ===============");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
 }

Expand Down

67 changes: 44 additions & 23 deletions
src/mlnet/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
 /// Class to produce the template output
 /// </summary>

 #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
 #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
 public partial class ModelProject : ModelProjectBase
 {
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
 /// </summary>
 public virtual string TransformText()
 {
 this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
 </ItemGroup>

 <ItemGroup>
 <None Update=""MLModel.zip"">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>

</Project>
");
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
 "oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
 "rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

 #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeLightGBMPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
 "\n");

 #line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden

 #line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeMklComponentsPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
 "w\" />\r\n");

 #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
 "tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
 ">\r\n \r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

 #line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


 #line default
 #line hidden
 }

 #line default
Expand Down

15 changes: 10 additions & 5 deletions
src/mlnet/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
 <PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
 <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
 </ItemGroup>

 <ItemGroup>
Expand All@@ -24,3 +25,7 @@
 </ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading

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

Skip to content
[AutoML] Minor changes to generated project in CLI based on feedback#3371

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

srsaggam
merged 3 commits into

from

Apr 17, 2019
 Merged


[AutoML] Minor changes to generated project in CLI based on feedback
#3371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b2db62a

nitpicks for generated project


srsaggam Apr 16, 2019
e77a5cb

Merge remote-tracking branch 'prod/features/automl' into dev/srsaggam…


srsaggam Apr 16, 2019
1c33b78

revert back the target framework


srsaggam Apr 17, 2019

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


55 changes: 42 additions & 13 deletions
src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ internal class CodeGenerator : IProjectGenerator
 private readonly Pipeline pipeline;
 private readonly CodeGeneratorSettings settings;
 private readonly ColumnInferenceResults columnInferenceResult;
 private readonly HashSet<string> LightGBMTrainers = new HashSet<string>() { TrainerName.LightGbmBinary.ToString(), TrainerName.LightGbmMulti.ToString(), TrainerName.LightGbmRegression.ToString() };
 private readonly HashSet<string> mklComponentsTrainers = new HashSet<string>() { TrainerName.OlsRegression.ToString(), TrainerName.SymbolicSgdLogisticRegressionBinary.ToString() };

 internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInferenceResult, CodeGeneratorSettings settings)
 {
Expand All@@ -29,25 +31,32 @@ internal CodeGenerator(Pipeline pipeline, ColumnInferenceResults columnInference

 public void GenerateOutput()
 {
 // Get the extra nuget packages to be included in the generated project.
 var trainerNodes = pipeline.Nodes.Where(t => t.NodeType == PipelineNodeType.Trainer);

 bool includeLightGbmPackage = false;
 bool includeMklComponentsPackage = false;
 SetRequiredNugetPackages(trainerNodes, ref includeLightGbmPackage, ref includeMklComponentsPackage);

 // Get Namespace
 var namespaceValue = Utils.Normalize(settings.OutputName);
 var labelType = columnInferenceResult.TextLoaderOptions.Columns.Where(t => t.Name == columnInferenceResult.ColumnInformation.LabelColumnName).First().DataKind;
 Type labelTypeCsharp = Utils.GetCSharpType(labelType);

 // Generate Model Project
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp);
 var modelProjectContents = GenerateModelProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var modelprojectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.Model");
 var dataModelsDir = Path.Combine(modelprojectDir, "DataModels");
 var modelProjectName = $"{settings.OutputName}.Model.csproj";

 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "Observation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "Prediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ObservationCSFileContent, "SampleObservation.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.PredictionCSFileContent, "SamplePrediction.cs", dataModelsDir);
 Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);

 // Generate ConsoleApp Project
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp);
 var consoleAppProjectContents = GenerateConsoleAppProjectContents(namespaceValue, labelTypeCsharp, includeLightGbmPackage, includeMklComponentsPackage);

 // Write files to disk. 
 var consoleAppProjectDir = Path.Combine(settings.OutputBaseDir, $"{settings.OutputName}.ConsoleApp");
Expand All@@ -65,12 +74,33 @@ public void GenerateOutput()
 Utils.AddProjectsToSolution(modelprojectDir, modelProjectName, consoleAppProjectDir, consoleAppProjectName, solutionPath);
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp)
 private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, ref bool includeLightGbmPackage, ref bool includeMklComponentsPackage)
 {
 foreach (var node in trainerNodes)
 {
 PipelineNode currentNode = node;
 if (currentNode.Name == TrainerName.Ova.ToString())
 {
 currentNode = (PipelineNode)currentNode.Properties["BinaryTrainer"];
 }

 if (LightGBMTrainers.Contains(currentNode.Name))
 {
 includeLightGbmPackage = true;
 }
 else if (mklComponentsTrainers.Contains(currentNode.Name))
 {
 includeMklComponentsPackage = true;
 }
 }
 }

 internal (string ConsoleAppProgramCSFileContent, string ConsoleAppProjectFileContent, string modelBuilderCSFileContent) GenerateConsoleAppProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
 predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);

 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, true, true);
 var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage);

 var transformsAndTrainers = GenerateTransformsAndTrainers();
 var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
Expand All@@ -79,14 +109,14 @@ public void GenerateOutput()
 return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
 }

 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp)
 internal (string ObservationCSFileContent, string PredictionCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var classLabels = this.GenerateClassLabels();
 var observationCSFileContent = GenerateObservationCSFileContent(namespaceValue, classLabels);
 observationCSFileContent = Utils.FormatCode(observationCSFileContent);
 var predictionCSFileContent = GeneratePredictionCSFileContent(labelTypeCsharp.Name, namespaceValue);
 predictionCSFileContent = Utils.FormatCode(predictionCSFileContent);
 var modelProjectFileContent = GenerateModelProjectFileContent();
 var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage);
 return (observationCSFileContent, predictionCSFileContent, modelProjectFileContent);
 }

Expand DownExpand Up@@ -218,9 +248,9 @@ internal IList<string> GenerateClassLabels()
 }

 #region Model project
 private static string GenerateModelProjectFileContent()
 private static string GenerateModelProjectFileContent(bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 ModelProject modelProject = new ModelProject();
 ModelProject modelProject = new ModelProject() { IncludeLightGBMPackage = includeLightGbmPackage, IncludeMklComponentsPackage = includeMklComponentsPackage };
 return modelProject.TransformText();
 }

Expand All@@ -238,9 +268,9 @@ private string GenerateObservationCSFileContent(string namespaceValue, IList<str
 #endregion

 #region Predict Project
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeMklComponentsPackage, bool includeLightGBMPackage)
 private static string GeneratPredictProjectFileContent(string namespaceValue, bool includeLightGbmPackage, bool includeMklComponentsPackage)
 {
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGBMPackage };
 var predictProjectFileContent = new PredictProject() { Namespace = namespaceValue, IncludeMklComponentsPackage = includeMklComponentsPackage, IncludeLightGBMPackage = includeLightGbmPackage };
 return predictProjectFileContent.TransformText();
 }

Expand DownExpand Up@@ -290,6 +320,5 @@ private string GenerateModelBuilderCSFileContent(string usings,
 return modelBuilder.TransformText();
 }
 #endregion

 }
}

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -224,9 +224,7 @@ public static ITransformer TrainModel(MLContext mlContext, IDataView trainingDat
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($""=============== Saving the model ==============="");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine(""The model is saved to {0}"", GetAbsolutePath(modelRelativePath));
 }

Expand Down

4 changes: 1 addition & 3 deletions
src/mlnet/Templates/Console/ModelBuilder.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -156,9 +156,7 @@ else{#>
 {
 // Save/persist the trained model to a .ZIP file
 Console.WriteLine($"=============== Saving the model ===============");
 using (var fs = new FileStream(GetAbsolutePath(modelRelativePath), FileMode.Create, FileAccess.Write, FileShare.Write))
 mlContext.Model.Save(mlModel, modelInputSchema, fs);

 mlContext.Model.Save(mlModel, modelInputSchema, GetAbsolutePath(modelRelativePath));
 Console.WriteLine("The model is saved to {0}", GetAbsolutePath(modelRelativePath));
 }

Expand Down

67 changes: 44 additions & 23 deletions
src/mlnet/Templates/Console/ModelProject.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
 /// Class to produce the template output
 /// </summary>

 #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ModelProject.tt"
 #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
 public partial class ModelProject : ModelProjectBase
 {
Expand All@@ -28,30 +28,51 @@ public partial class ModelProject : ModelProjectBase
 /// </summary>
 public virtual string TransformText()
 {
 this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include=""Microsoft.ML"" Version=""1.0.0-preview"" />
 </ItemGroup>

 <ItemGroup>
 <None Update=""MLModel.zip"">
 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 </None>
 </ItemGroup>

</Project>
");
 this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
 "oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
 "rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");

 #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeLightGBMPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
 "\n");

 #line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden

 #line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
 if(IncludeMklComponentsPackage){ 

 #line default
 #line hidden
 this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
 "w\" />\r\n");

 #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
}

 #line default
 #line hidden
 this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
 "tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
 ">\r\n \r\n</Project>\r\n");
 return this.GenerationEnvironment.ToString();
 }

 #line 28 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"

public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}


 #line default
 #line hidden
 }

 #line default
Expand Down

15 changes: 10 additions & 5 deletions
src/mlnet/Templates/Console/ModelProject.tt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,15 @@

 <PropertyGroup>
 <TargetFramework>netcoreapp2.1</TargetFramework>
 </PropertyGroup>
 <PropertyGroup>
 <RestoreSources>
 https://api.nuget.org/v3/index.json;
 </RestoreSources>
 </PropertyGroup>
 <ItemGroup>
 <PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
 <PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
 <PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<#}#>
 </ItemGroup>

 <ItemGroup>
Expand All@@ -24,3 +25,7 @@
 </ItemGroup>

</Project>
<#+
public bool IncludeLightGBMPackage {get;set;}
public bool IncludeMklComponentsPackage {get;set;}
#>
Loading