diff --git a/src/mlnet/Templates/Console/ModelProject.cs b/src/mlnet/Templates/Console/ModelProject.cs index fe882ca4b4..f20b483152 100644 --- a/src/mlnet/Templates/Console/ModelProject.cs +++ b/src/mlnet/Templates/Console/ModelProject.cs @@ -17,12 +17,9 @@ namespace Microsoft.ML.CLI.Templates.Console /// /// Class to produce the template output /// - - #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 { -#line hidden /// /// Create the template output /// @@ -31,67 +28,29 @@ public virtual string TransformText() this.Write("\r\n\r\n \r\n netc" + "oreapp2.1\r\n \r\n \r\n \r\n"); - - #line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt" if(IncludeLightGBMPackage){ - - #line default - #line hidden this.Write(" \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(" \r\n"); - - #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt" } - - #line default - #line hidden - - #line 19 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt" if(IncludeFastTreePackage){ - - #line default - #line hidden this.Write(" \r" + "\n"); - - #line 21 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt" } - - #line default - #line hidden this.Write(" \r\n\r\n \r\n \r\n PreserveNewest\r\n \r\n \r\n \r\n\r\n"); return this.GenerationEnvironment.ToString(); } - - #line 31 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt" public bool IncludeLightGBMPackage {get;set;} public bool IncludeMklComponentsPackage {get;set;} public bool IncludeFastTreePackage {get;set;} - - #line default - #line hidden } - - #line default - #line hidden #region Base class /// /// Base class for this transformation diff --git a/src/mlnet/Templates/Console/ModelProject.tt b/src/mlnet/Templates/Console/ModelProject.tt index 8feee325e6..b1c5a83839 100644 --- a/src/mlnet/Templates/Console/ModelProject.tt +++ b/src/mlnet/Templates/Console/ModelProject.tt @@ -1,4 +1,4 @@ -<#@ template language="C#" #> +<#@ template language="C#" linePragmas="false" #> <#@ assembly name="System.Core" #> <#@ import namespace="System.Linq" #> <#@ import namespace="System.Text" #> diff --git a/src/mlnet/Templates/Console/ObservationClass.cs b/src/mlnet/Templates/Console/ObservationClass.cs index 62b660bd39..411f62d016 100644 --- a/src/mlnet/Templates/Console/ObservationClass.cs +++ b/src/mlnet/Templates/Console/ObservationClass.cs @@ -17,12 +17,9 @@ namespace Microsoft.ML.CLI.Templates.Console /// /// Class to produce the template output /// - - #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] public partial class ObservationClass : ObservationClassBase { -#line hidden /// /// Create the template output /// @@ -37,49 +34,21 @@ public virtual string TransformText() using Microsoft.ML.Data; namespace "); - - #line 14 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Namespace)); - - #line default - #line hidden this.Write(".Model.DataModels\r\n{\r\n public class SampleObservation\r\n {\r\n"); - - #line 18 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt" foreach(var label in ClassLabels){ - - #line default - #line hidden this.Write(" "); - - #line 19 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt" this.Write(this.ToStringHelper.ToStringWithCulture(label)); - - #line default - #line hidden this.Write("\r\n"); - - #line 20 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt" } - - #line default - #line hidden this.Write("}\r\n}\r\n"); return this.GenerationEnvironment.ToString(); } - - #line 23 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt" public IList ClassLabels {get;set;} public string Namespace {get;set;} - - #line default - #line hidden } - - #line default - #line hidden #region Base class /// /// Base class for this transformation diff --git a/src/mlnet/Templates/Console/ObservationClass.tt b/src/mlnet/Templates/Console/ObservationClass.tt index 07da8f56cc..296e9ef6c4 100644 --- a/src/mlnet/Templates/Console/ObservationClass.tt +++ b/src/mlnet/Templates/Console/ObservationClass.tt @@ -1,4 +1,4 @@ -<#@ template language="C#" #> +<#@ template language="C#" linePragmas="false" #> <#@ assembly name="System.Core" #> <#@ import namespace="System.Linq" #> <#@ import namespace="System.Text" #> diff --git a/src/mlnet/Templates/Console/PredictProgram.cs b/src/mlnet/Templates/Console/PredictProgram.cs index bffb3eced4..40bb69d39b 100644 --- a/src/mlnet/Templates/Console/PredictProgram.cs +++ b/src/mlnet/Templates/Console/PredictProgram.cs @@ -19,12 +19,9 @@ namespace Microsoft.ML.CLI.Templates.Console /// /// Class to produce the template output /// - - #line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] public partial class PredictProgram : PredictProgramBase { -#line hidden /// /// Create the template output /// @@ -41,56 +38,21 @@ public virtual string TransformText() using System.Linq; using Microsoft.ML; using "); - - #line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Namespace)); - - #line default - #line hidden this.Write(".Model.DataModels;\r\n\r\n\r\nnamespace "); - - #line 21 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Namespace)); - - #line default - #line hidden this.Write(".ConsoleApp\r\n{\r\n class Program\r\n {\r\n //Machine Learning model to loa" + "d and use for predictions\r\n private const string MODEL_FILEPATH = @\"MLMod" + "el.zip\";\r\n\r\n //Dataset to use for predictions \r\n"); - - #line 29 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" if(string.IsNullOrEmpty(TestDataPath)){ - - #line default - #line hidden this.Write(" private const string DATA_FILEPATH = @\""); - - #line 30 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(TrainDataPath)); - - #line default - #line hidden this.Write("\";\r\n"); - - #line 31 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" } else{ - - #line default - #line hidden this.Write(" private const string DATA_FILEPATH = @\""); - - #line 32 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(TestDataPath)); - - #line default - #line hidden this.Write("\";\r\n"); - - #line 33 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" } - - #line default - #line hidden this.Write(@" static void Main(string[] args) { @@ -109,55 +71,20 @@ static void Main(string[] args) SamplePrediction predictionResult = predEngine.Predict(sampleData); "); - - #line 51 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" if("BinaryClassification".Equals(TaskType)){ - - #line default - #line hidden this.Write(" Console.WriteLine($\"Single Prediction --> Actual value: {sampleData."); - - #line 52 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Utils.Normalize(LabelName))); - - #line default - #line hidden this.Write("} | Predicted value: {predictionResult.Prediction}\");\r\n"); - - #line 53 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" }else if("Regression".Equals(TaskType)){ - - #line default - #line hidden this.Write(" Console.WriteLine($\"Single Prediction --> Actual value: {sampleData."); - - #line 54 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Utils.Normalize(LabelName))); - - #line default - #line hidden this.Write("} | Predicted value: {predictionResult.Score}\");\r\n"); - - #line 55 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" } else if("MulticlassClassification".Equals(TaskType)){ - - #line default - #line hidden this.Write(" Console.WriteLine($\"Single Prediction --> Actual value: {sampleData."); - - #line 56 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Utils.Normalize(LabelName))); - - #line default - #line hidden this.Write("} | Predicted value: {predictionResult.Prediction} | Predicted scores: [{String.J" + "oin(\",\", predictionResult.Score)}]\");\r\n"); - - #line 57 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" } - - #line default - #line hidden this.Write(@" Console.WriteLine(""=============== End of process, hit any key to finish ===============""); Console.ReadKey(); @@ -171,33 +98,13 @@ private static SampleObservation CreateSingleDataSample(MLContext mlContext, str IDataView dataView = mlContext.Data.LoadFromTextFile( path: dataFilePath, hasHeader : "); - - #line 70 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(HasHeader.ToString().ToLowerInvariant())); - - #line default - #line hidden this.Write(",\r\n separatorChar : \'"); - - #line 71 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Regex.Escape(Separator.ToString()))); - - #line default - #line hidden this.Write("\',\r\n allowQuoting : "); - - #line 72 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(AllowQuoting.ToString().ToLowerInvariant())); - - #line default - #line hidden this.Write(",\r\n allowSparse: "); - - #line 73 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" this.Write(this.ToStringHelper.ToStringWithCulture(AllowSparse.ToString().ToLowerInvariant())); - - #line default - #line hidden this.Write(@"); // Here (SampleObservation object) you could provide new test data, hardcoded or from the end-user application, instead of the row from the file. @@ -220,8 +127,6 @@ public static string GetAbsolutePath(string relativePath) "); return this.GenerationEnvironment.ToString(); } - - #line 92 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt" public string TaskType {get;set;} public string Namespace {get;set;} @@ -233,13 +138,7 @@ public static string GetAbsolutePath(string relativePath) public bool AllowSparse {get;set;} public bool HasHeader {get;set;} - - #line default - #line hidden } - - #line default - #line hidden #region Base class /// /// Base class for this transformation diff --git a/src/mlnet/Templates/Console/PredictProgram.tt b/src/mlnet/Templates/Console/PredictProgram.tt index e0ecb9c21c..96b07606e4 100644 --- a/src/mlnet/Templates/Console/PredictProgram.tt +++ b/src/mlnet/Templates/Console/PredictProgram.tt @@ -1,4 +1,4 @@ -<#@ template language="C#" #> +<#@ template language="C#" linePragmas="false" #> <#@ assembly name="System.Core" #> <#@ import namespace="System.Linq" #> <#@ import namespace="System.Text" #> diff --git a/src/mlnet/Templates/Console/PredictionClass.cs b/src/mlnet/Templates/Console/PredictionClass.cs index 11d5303d2c..8b571f93e5 100644 --- a/src/mlnet/Templates/Console/PredictionClass.cs +++ b/src/mlnet/Templates/Console/PredictionClass.cs @@ -17,12 +17,9 @@ namespace Microsoft.ML.CLI.Templates.Console /// /// Class to produce the template output /// - - #line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")] public partial class PredictionClass : PredictionClassBase { -#line hidden /// /// Create the template output /// @@ -38,81 +35,33 @@ public virtual string TransformText() using Microsoft.ML.Data; namespace "); - - #line 15 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" this.Write(this.ToStringHelper.ToStringWithCulture(Namespace)); - - #line default - #line hidden this.Write(".Model.DataModels\r\n{\r\n public class SamplePrediction\r\n {\r\n"); - - #line 19 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" if("BinaryClassification".Equals(TaskType)){ - - #line default - #line hidden this.Write(" // ColumnName attribute is used to change the column name from\r\n /" + "/ its default value, which is the name of the field.\r\n [ColumnName(\"Predi" + "ctedLabel\")]\r\n public bool Prediction { get; set; }\r\n\r\n"); - - #line 25 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" } if("MulticlassClassification".Equals(TaskType)){ - - #line default - #line hidden this.Write(" // ColumnName attribute is used to change the column name from\r\n /" + "/ its default value, which is the name of the field.\r\n [ColumnName(\"Predi" + "ctedLabel\")]\r\n public "); - - #line 29 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" this.Write(this.ToStringHelper.ToStringWithCulture(PredictionLabelType)); - - #line default - #line hidden this.Write(" Prediction { get; set; }\r\n"); - - #line 30 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" } - - #line default - #line hidden - - #line 31 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" if("MulticlassClassification".Equals(TaskType)){ - - #line default - #line hidden this.Write(" public float[] Score { get; set; }\r\n"); - - #line 33 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" }else{ - - #line default - #line hidden this.Write(" public float Score { get; set; }\r\n"); - - #line 35 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" } - - #line default - #line hidden this.Write(" }\r\n}\r\n"); return this.GenerationEnvironment.ToString(); } - - #line 38 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\PredictionClass.tt" public string TaskType {get;set;} public string PredictionLabelType {get;set;} public string Namespace {get;set;} - - #line default - #line hidden } - - #line default - #line hidden #region Base class /// /// Base class for this transformation diff --git a/src/mlnet/Templates/Console/PredictionClass.tt b/src/mlnet/Templates/Console/PredictionClass.tt index 2497a440a8..5cea1d14fd 100644 --- a/src/mlnet/Templates/Console/PredictionClass.tt +++ b/src/mlnet/Templates/Console/PredictionClass.tt @@ -1,4 +1,4 @@ -<#@ template language="C#" #> +<#@ template language="C#" linePragmas="false" #> <#@ assembly name="System.Core" #> <#@ import namespace="System.Linq" #> <#@ import namespace="System.Text" #>