Skip to content

[AutoML] turn off line pragmas in .tt files to play nice with signing #3617

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
merged 2 commits into from
Apr 29, 2019
Merged

[AutoML] turn off line pragmas in .tt files to play nice with signing #3617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84b5c35
turn off line pragmas in .tt files to play nice with signing
Dmitry-A Apr 29, 2019
7ee2aa8
dedupe tags
Dmitry-A Apr 29, 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
41 changes: 0 additions & 41 deletions src/mlnet/Templates/Console/ModelProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ namespace Microsoft.ML.CLI.Templates.Console
/// <summary>
/// Class to produce the template output
/// </summary>

#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
/// <summary>
/// Create the template output
/// </summary>
Expand All @@ -31,67 +28,29 @@ public virtual string TransformText()
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

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

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

#line 21 "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 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
/// <summary>
/// Base class for this transformation
Expand Down
2 changes: 1 addition & 1 deletion src/mlnet/Templates/Console/ModelProject.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<#@ template language="C#" #>
<#@ template language="C#" linePragmas="false" #>
<#@ assembly name="System.Core" #>
<#@ import namespace="System.Linq" #>
<#@ import namespace="System.Text" #>
Expand Down
31 changes: 0 additions & 31 deletions src/mlnet/Templates/Console/ObservationClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ namespace Microsoft.ML.CLI.Templates.Console
/// <summary>
/// Class to produce the template output
/// </summary>

#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
/// <summary>
/// Create the template output
/// </summary>
Expand All @@ -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<string> ClassLabels {get;set;}
public string Namespace {get;set;}


#line default
#line hidden
}

#line default
#line hidden
#region Base class
/// <summary>
/// Base class for this transformation
Expand Down
2 changes: 1 addition & 1 deletion src/mlnet/Templates/Console/ObservationClass.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<#@ template language="C#" #>
<#@ template language="C#" linePragmas="false" #>
<#@ assembly name="System.Core" #>
<#@ import namespace="System.Linq" #>
<#@ import namespace="System.Text" #>
Expand Down
101 changes: 0 additions & 101 deletions src/mlnet/Templates/Console/PredictProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ namespace Microsoft.ML.CLI.Templates.Console
/// <summary>
/// Class to produce the template output
/// </summary>

#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
/// <summary>
/// Create the template output
/// </summary>
Expand All @@ -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)
{
Expand All @@ -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();
Expand All @@ -171,33 +98,13 @@ private static SampleObservation CreateSingleDataSample(MLContext mlContext, str
IDataView dataView = mlContext.Data.LoadFromTextFile<SampleObservation>(
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.
Expand All @@ -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;}
Expand All @@ -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
/// <summary>
/// Base class for this transformation
Expand Down
2 changes: 1 addition & 1 deletion src/mlnet/Templates/Console/PredictProgram.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<#@ template language="C#" #>
<#@ template language="C#" linePragmas="false" #>
<#@ assembly name="System.Core" #>
<#@ import namespace="System.Linq" #>
<#@ import namespace="System.Text" #>
Expand Down
Loading