[AutoML] Pull out Code Gen as separate library plus some changes in CodeGen

Microsoft.ML.AutoML.sln

@@ -16,6 +16,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalCodeAn
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools-local", "tools-local", "{2DEB692B-D982-4301-A074-DAA095658230}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CodeGenerator", "src\Microsoft.ML.CodeGen\Microsoft.ML.CodeGenerator.csproj", "{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -98,6 +100,18 @@ Global
 		{954F14B0-BBDF-4A30-811E-2D86FDB5B399}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
 		{954F14B0-BBDF-4A30-811E-2D86FDB5B399}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
 		{954F14B0-BBDF-4A30-811E-2D86FDB5B399}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
+		{3148A8CF-A686-4A9C-A5C6-C3E41CAAD64D}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Microsoft.ML.AutoML/Assembly.cs

@@ -8,3 +8,5 @@
 [assembly: InternalsVisibleTo("mlnet, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
 [assembly: InternalsVisibleTo("mlnet.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
 [assembly: InternalsVisibleTo("Benchmark, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly: InternalsVisibleTo("Microsoft.ML.CodeGenerator, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly: InternalsVisibleTo("Microsoft.ML.ModelBuilder, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]

src/Microsoft.ML.CodeGen/Assembly.cs

@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.ML.CodeGen.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("Microsoft.ML.ModelBuilder, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo("mlnet, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly:InternalsVisibleTo("mlnet.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]

src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/CodeGenerator.cs

@@ -9,12 +9,12 @@
 using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.ML.AutoML;
-using Microsoft.ML.CLI.Templates.Console;
-using Microsoft.ML.CLI.Utilities;
+using Microsoft.ML.CodeGenerator.Templates.Console;
+using Microsoft.ML.CodeGenerator.Utilities;
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
-    internal class CodeGenerator : IProjectGenerator
+    public class CodeGenerator : IProjectGenerator
     {
         private readonly Pipeline _pipeline;
         private readonly CodeGeneratorSettings _settings;
@@ -55,6 +55,7 @@ public void GenerateOutput()
 
             Utils.WriteOutputToFiles(modelProjectContents.ModelInputCSFileContent, "ModelInput.cs", dataModelsDir);
             Utils.WriteOutputToFiles(modelProjectContents.ModelOutputCSFileContent, "ModelOutput.cs", dataModelsDir);
+            Utils.WriteOutputToFiles(modelProjectContents.ConsumeModelCSFileContent, "ConsumeModel.cs", dataModelsDir);
             Utils.WriteOutputToFiles(modelProjectContents.ModelProjectFileContent, modelProjectName, modelprojectDir);
 
             // Generate ConsoleApp Project
@@ -106,7 +107,7 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
             var predictProgramCSFileContent = GeneratePredictProgramCSFileContent(namespaceValue);
             predictProgramCSFileContent = Utils.FormatCode(predictProgramCSFileContent);
 
-            var predictProjectFileContent = GeneratPredictProjectFileContent(namespaceValue, includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage);
+            var predictProjectFileContent = GeneratPredictProjectFileContent(_settings.OutputName, includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage);
 
             var transformsAndTrainers = GenerateTransformsAndTrainers();
             var modelBuilderCSFileContent = GenerateModelBuilderCSFileContent(transformsAndTrainers.Usings, transformsAndTrainers.TrainerMethod, transformsAndTrainers.PreTrainerTransforms, transformsAndTrainers.PostTrainerTransforms, namespaceValue, _pipeline.CacheBeforeTrainer, labelTypeCsharp.Name);
@@ -115,15 +116,33 @@ private void SetRequiredNugetPackages(IEnumerable<PipelineNode> trainerNodes, re
             return (predictProgramCSFileContent, predictProjectFileContent, modelBuilderCSFileContent);
         }
 
-        internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage, bool includeFastTreePackage)
+        internal (string ModelInputCSFileContent, string ModelOutputCSFileContent, string ConsumeModelCSFileContent, string ModelProjectFileContent) GenerateModelProjectContents(string namespaceValue, Type labelTypeCsharp, bool includeLightGbmPackage, bool includeMklComponentsPackage, bool includeFastTreePackage)
         {
             var classLabels = GenerateClassLabels();
+
+            // generate ModelInput.cs
             var modelInputCSFileContent = GenerateModelInputCSFileContent(namespaceValue, classLabels);
             modelInputCSFileContent = Utils.FormatCode(modelInputCSFileContent);
+
+            // generate ModelOutput.cs
             var modelOutputCSFileContent = GenerateModelOutputCSFileContent(labelTypeCsharp.Name, namespaceValue);
             modelOutputCSFileContent = Utils.FormatCode(modelOutputCSFileContent);
+
+            // generate ConsumeModel.cs
+            var consumeModelCSFileContent = GenerateConsumeModelCSFileContent(namespaceValue);
+            consumeModelCSFileContent = Utils.FormatCode(consumeModelCSFileContent);
             var modelProjectFileContent = GenerateModelProjectFileContent(includeLightGbmPackage, includeMklComponentsPackage, includeFastTreePackage);
-            return (modelInputCSFileContent, modelOutputCSFileContent, modelProjectFileContent);
+            return (modelInputCSFileContent, modelOutputCSFileContent, consumeModelCSFileContent, modelProjectFileContent);
+        }
+
+        private string GenerateConsumeModelCSFileContent(string namespaceValue)
+        {
+            ConsumeModel consumeModel = new ConsumeModel()
+            {
+                Namespace = namespaceValue,
+                Target = _settings.Target,
+            };
+            return consumeModel.TransformText();
         }
 
         internal (string Usings, string TrainerMethod, List<string> PreTrainerTransforms, List<string> PostTrainerTransforms) GenerateTransformsAndTrainers()
@@ -262,13 +281,22 @@ private static string GenerateModelProjectFileContent(bool includeLightGbmPackag
 
         private string GenerateModelOutputCSFileContent(string predictionLabelType, string namespaceValue)
         {
-            ModelOutputClass modelOutputClass = new ModelOutputClass() { TaskType = _settings.MlTask.ToString(), PredictionLabelType = predictionLabelType, Namespace = namespaceValue };
+            ModelOutputClass modelOutputClass = new ModelOutputClass() {
+                TaskType = _settings.MlTask.ToString(),
+                PredictionLabelType = predictionLabelType,
+                Namespace = namespaceValue,
+                Target = _settings.Target,
+            };
             return modelOutputClass.TransformText();
         }
 
         private string GenerateModelInputCSFileContent(string namespaceValue, IList<string> classLabels)
         {
-            ModelInputClass modelInputClass = new ModelInputClass() { Namespace = namespaceValue, ClassLabels = classLabels };
+            ModelInputClass modelInputClass = new ModelInputClass() {
+                Namespace = namespaceValue,
+                ClassLabels = classLabels,
+                Target = _settings.Target,
+            };
             return modelInputClass.TransformText();
         }
         #endregion
@@ -282,6 +310,8 @@ private static string GeneratPredictProjectFileContent(string namespaceValue, bo
 
         private string GeneratePredictProgramCSFileContent(string namespaceValue)
         {
+            var columns = _columnInferenceResult.TextLoaderOptions.Columns;
+            var featuresList = columns.Where((str) => str.Name != _settings.LabelName).Select((str) => str.Name).ToList();
             PredictProgram predictProgram = new PredictProgram()
             {
                 TaskType = _settings.MlTask.ToString(),
@@ -293,6 +323,8 @@ private string GeneratePredictProgramCSFileContent(string namespaceValue)
                 Separator = _columnInferenceResult.TextLoaderOptions.Separators.FirstOrDefault(),
                 AllowQuoting = _columnInferenceResult.TextLoaderOptions.AllowQuoting,
                 AllowSparse = _columnInferenceResult.TextLoaderOptions.AllowSparse,
+                Features = featuresList,
+                Target = _settings.Target,
             };
             return predictProgram.TransformText();
         }
@@ -321,6 +353,7 @@ private string GenerateModelBuilderCSFileContent(string usings,
                 Namespace = namespaceValue,
                 LabelName = _settings.LabelName,
                 CacheBeforeTrainer = cacheBeforeTrainer,
+                Target = _settings.Target,
             };
 
             return modelBuilder.TransformText();

src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/CodeGeneratorSettings.cs

@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using Microsoft.ML.AutoML;
+
+namespace Microsoft.ML.CodeGenerator.CSharp
+{
+    public class CodeGeneratorSettings
+    {
+        public CodeGeneratorSettings()
+        {
+            // set default value
+            Target = GenerateTarget.Cli;
+        }
+
+        public string LabelName { get; set; }
+
+        public string ModelPath { get; set; }
+
+        public string OutputName { get; set; }
+
+        public string OutputBaseDir { get; set; }
+
+        public string TrainDataset { get; set; }
+
+        public string TestDataset { get; set; }
+
+        public GenerateTarget Target { get; set; }
+
+        internal TaskKind MlTask { get; set; }
+
+    }
+
+    public enum GenerateTarget
+    {
+        ModelBuilder = 0,
+        Cli = 1,
+    };
+}

src/mlnet/CodeGenerator/CSharp/Symbols.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/Symbols.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
     internal static class Symbols
     {

src/mlnet/CodeGenerator/CSharp/TrainerGeneratorBase.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/TrainerGeneratorBase.cs

@@ -9,7 +9,7 @@
 using System.Text;
 using Microsoft.ML.AutoML;
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
     /// <summary>
     /// Supports generation of code for trainers (Binary,Multi,Regression)

src/mlnet/CodeGenerator/CSharp/TrainerGeneratorFactory.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/TrainerGeneratorFactory.cs

@@ -4,9 +4,9 @@
 
 using System;
 using Microsoft.ML.AutoML;
-using static Microsoft.ML.CLI.CodeGenerator.CSharp.TrainerGenerators;
+using static Microsoft.ML.CodeGenerator.CSharp.TrainerGenerators;
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
     internal interface ITrainerGenerator
     {

src/mlnet/CodeGenerator/CSharp/TrainerGenerators.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/TrainerGenerators.cs

@@ -6,7 +6,7 @@
 using System.Text;
 using Microsoft.ML.AutoML;
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
     internal static class TrainerGenerators
     {

src/mlnet/CodeGenerator/CSharp/TransformGeneratorBase.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/TransformGeneratorBase.cs

@@ -4,7 +4,7 @@
 
 using Microsoft.ML.AutoML;
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
     /// <summary>
     /// Supports generation of code for trainers (Binary,Multi,Regression)

src/mlnet/CodeGenerator/CSharp/TransformGeneratorFactory.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/TransformGeneratorFactory.cs

@@ -5,7 +5,7 @@
 using System;
 using Microsoft.ML.AutoML;
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
     internal interface ITransformGenerator
     {

src/mlnet/CodeGenerator/CSharp/TransformGenerators.cs → src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/TransformGenerators.cs

@@ -7,7 +7,7 @@
 using System.Text;
 using Microsoft.ML.AutoML;
 
-namespace Microsoft.ML.CLI.CodeGenerator.CSharp
+namespace Microsoft.ML.CodeGenerator.CSharp
 {
     internal class Normalizer : TransformGeneratorBase
     {

src/mlnet/CodeGenerator/IProjectGenerator.cs → src/Microsoft.ML.CodeGen/CodeGenerator/IProjectGenerator.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.ML.CLI.CodeGenerator
+namespace Microsoft.ML.CodeGenerator
 {
     internal interface IProjectGenerator
     {