Skip to content

Commit e6ad884

Browse files
Dmitry-ADmitry-A
committed
[AutoML] turn off line pragmas in .tt files to play nice with signing (dotnet#3617)
* turn off line pragmas in .tt files to play nice with signing * dedupe tags
1 parent e47a02a commit e6ad884

8 files changed

+4
-228
lines changed

‎src/mlnet/Templates/Console/ModelProject.cs

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ namespace Microsoft.ML.CLI.Templates.Console
1717
/// <summary>
1818
/// Class to produce the template output
1919
/// </summary>
20-
21-
#line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
2220
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
2321
public partial class ModelProject : ModelProjectBase
2422
{
25-
#line hidden
2623
/// <summary>
2724
/// Create the template output
2825
/// </summary>
@@ -31,67 +28,29 @@ public virtual string TransformText()
3128
this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <TargetFramework>netc" +
3229
"oreapp2.1</TargetFramework>\r\n </PropertyGroup>\r\n <ItemGroup>\r\n <PackageRefe" +
3330
"rence Include=\"Microsoft.ML\" Version=\"1.0.0-preview\" />\r\n");
34-
35-
#line 13 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
3631
if(IncludeLightGBMPackage){
37-
38-
#line default
39-
#line hidden
4032
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
4133
"\n");
42-
43-
#line 15 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
4434
}
45-
46-
#line default
47-
#line hidden
48-
49-
#line 16 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
5035
if(IncludeMklComponentsPackage){
51-
52-
#line default
53-
#line hidden
5436
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
5537
"w\" />\r\n");
56-
57-
#line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
5838
}
59-
60-
#line default
61-
#line hidden
62-
63-
#line 19 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
6439
if(IncludeFastTreePackage){
65-
66-
#line default
67-
#line hidden
6840
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.0.0-preview\" />\r" +
6941
"\n");
70-
71-
#line 21 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
7242
}
73-
74-
#line default
75-
#line hidden
7643
this.Write(" </ItemGroup>\r\n\r\n <ItemGroup>\r\n <None Update=\"MLModel.zip\">\r\n <CopyToOu" +
7744
"tputDirectory>PreserveNewest</CopyToOutputDirectory>\r\n </None>\r\n </ItemGroup" +
7845
">\r\n \r\n</Project>\r\n");
7946
return this.GenerationEnvironment.ToString();
8047
}
81-
82-
#line 31 "E:\src\machinelearning\src\mlnet\Templates\Console\ModelProject.tt"
8348

8449
public bool IncludeLightGBMPackage {get;set;}
8550
public bool IncludeMklComponentsPackage {get;set;}
8651
public bool IncludeFastTreePackage {get;set;}
8752

88-
89-
#line default
90-
#line hidden
9153
}
92-
93-
#line default
94-
#line hidden
9554
#region Base class
9655
/// <summary>
9756
/// Base class for this transformation

‎src/mlnet/Templates/Console/ModelProject.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#@ template language="C#" #>
1+
<#@ template language="C#" linePragmas="false" #>
22
<#@ assembly name="System.Core" #>
33
<#@ import namespace="System.Linq" #>
44
<#@ import namespace="System.Text" #>

‎src/mlnet/Templates/Console/ObservationClass.cs

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ namespace Microsoft.ML.CLI.Templates.Console
1717
/// <summary>
1818
/// Class to produce the template output
1919
/// </summary>
20-
21-
#line 1 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt"
2220
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
2321
public partial class ObservationClass : ObservationClassBase
2422
{
25-
#line hidden
2623
/// <summary>
2724
/// Create the template output
2825
/// </summary>
@@ -37,49 +34,21 @@ public virtual string TransformText()
3734
using Microsoft.ML.Data;
3835
3936
namespace ");
40-
41-
#line 14 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt"
4237
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
43-
44-
#line default
45-
#line hidden
4638
this.Write(".Model.DataModels\r\n{\r\n public class SampleObservation\r\n {\r\n");
47-
48-
#line 18 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt"
4939
foreach(var label in ClassLabels){
50-
51-
#line default
52-
#line hidden
5340
this.Write(" ");
54-
55-
#line 19 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt"
5641
this.Write(this.ToStringHelper.ToStringWithCulture(label));
57-
58-
#line default
59-
#line hidden
6042
this.Write("\r\n");
61-
62-
#line 20 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt"
6343
}
64-
65-
#line default
66-
#line hidden
6744
this.Write("}\r\n}\r\n");
6845
return this.GenerationEnvironment.ToString();
6946
}
70-
71-
#line 23 "E:\src\machinelearning-automl\src\mlnet\Templates\Console\ObservationClass.tt"
7247

7348
public IList<string> ClassLabels {get;set;}
7449
public string Namespace {get;set;}
7550

76-
77-
#line default
78-
#line hidden
7951
}
80-
81-
#line default
82-
#line hidden
8352
#region Base class
8453
/// <summary>
8554
/// Base class for this transformation

‎src/mlnet/Templates/Console/ObservationClass.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#@ template language="C#" #>
1+
<#@ template language="C#" linePragmas="false" #>
22
<#@ assembly name="System.Core" #>
33
<#@ import namespace="System.Linq" #>
44
<#@ import namespace="System.Text" #>

‎src/mlnet/Templates/Console/PredictProgram.cs

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ namespace Microsoft.ML.CLI.Templates.Console
1919
/// <summary>
2020
/// Class to produce the template output
2121
/// </summary>
22-
23-
#line 1 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
2422
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
2523
public partial class PredictProgram : PredictProgramBase
2624
{
27-
#line hidden
2825
/// <summary>
2926
/// Create the template output
3027
/// </summary>
@@ -41,56 +38,21 @@ public virtual string TransformText()
4138
using System.Linq;
4239
using Microsoft.ML;
4340
using ");
44-
45-
#line 18 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
4641
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
47-
48-
#line default
49-
#line hidden
5042
this.Write(".Model.DataModels;\r\n\r\n\r\nnamespace ");
51-
52-
#line 21 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
5343
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
54-
55-
#line default
56-
#line hidden
5744
this.Write(".ConsoleApp\r\n{\r\n class Program\r\n {\r\n //Machine Learning model to loa" +
5845
"d and use for predictions\r\n private const string MODEL_FILEPATH = @\"MLMod" +
5946
"el.zip\";\r\n\r\n //Dataset to use for predictions \r\n");
60-
61-
#line 29 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
6247
if(string.IsNullOrEmpty(TestDataPath)){
63-
64-
#line default
65-
#line hidden
6648
this.Write(" private const string DATA_FILEPATH = @\"");
67-
68-
#line 30 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
6949
this.Write(this.ToStringHelper.ToStringWithCulture(TrainDataPath));
70-
71-
#line default
72-
#line hidden
7350
this.Write("\";\r\n");
74-
75-
#line 31 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
7651
} else{
77-
78-
#line default
79-
#line hidden
8052
this.Write(" private const string DATA_FILEPATH = @\"");
81-
82-
#line 32 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
8353
this.Write(this.ToStringHelper.ToStringWithCulture(TestDataPath));
84-
85-
#line default
86-
#line hidden
8754
this.Write("\";\r\n");
88-
89-
#line 33 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
9055
}
91-
92-
#line default
93-
#line hidden
9456
this.Write(@"
9557
static void Main(string[] args)
9658
{
@@ -109,55 +71,20 @@ static void Main(string[] args)
10971
SamplePrediction predictionResult = predEngine.Predict(sampleData);
11072
11173
");
112-
113-
#line 51 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
11474
if("BinaryClassification".Equals(TaskType)){
115-
116-
#line default
117-
#line hidden
11875
this.Write(" Console.WriteLine($\"Single Prediction --> Actual value: {sampleData.");
119-
120-
#line 52 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
12176
this.Write(this.ToStringHelper.ToStringWithCulture(Utils.Normalize(LabelName)));
122-
123-
#line default
124-
#line hidden
12577
this.Write("} | Predicted value: {predictionResult.Prediction}\");\r\n");
126-
127-
#line 53 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
12878
}else if("Regression".Equals(TaskType)){
129-
130-
#line default
131-
#line hidden
13279
this.Write(" Console.WriteLine($\"Single Prediction --> Actual value: {sampleData.");
133-
134-
#line 54 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
13580
this.Write(this.ToStringHelper.ToStringWithCulture(Utils.Normalize(LabelName)));
136-
137-
#line default
138-
#line hidden
13981
this.Write("} | Predicted value: {predictionResult.Score}\");\r\n");
140-
141-
#line 55 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
14282
} else if("MulticlassClassification".Equals(TaskType)){
143-
144-
#line default
145-
#line hidden
14683
this.Write(" Console.WriteLine($\"Single Prediction --> Actual value: {sampleData.");
147-
148-
#line 56 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
14984
this.Write(this.ToStringHelper.ToStringWithCulture(Utils.Normalize(LabelName)));
150-
151-
#line default
152-
#line hidden
15385
this.Write("} | Predicted value: {predictionResult.Prediction} | Predicted scores: [{String.J" +
15486
"oin(\",\", predictionResult.Score)}]\");\r\n");
155-
156-
#line 57 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
15787
}
158-
159-
#line default
160-
#line hidden
16188
this.Write(@"
16289
Console.WriteLine(""=============== End of process, hit any key to finish ==============="");
16390
Console.ReadKey();
@@ -171,33 +98,13 @@ private static SampleObservation CreateSingleDataSample(MLContext mlContext, str
17198
IDataView dataView = mlContext.Data.LoadFromTextFile<SampleObservation>(
17299
path: dataFilePath,
173100
hasHeader : ");
174-
175-
#line 70 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
176101
this.Write(this.ToStringHelper.ToStringWithCulture(HasHeader.ToString().ToLowerInvariant()));
177-
178-
#line default
179-
#line hidden
180102
this.Write(",\r\n separatorChar : \'");
181-
182-
#line 71 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
183103
this.Write(this.ToStringHelper.ToStringWithCulture(Regex.Escape(Separator.ToString())));
184-
185-
#line default
186-
#line hidden
187104
this.Write("\',\r\n allowQuoting : ");
188-
189-
#line 72 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
190105
this.Write(this.ToStringHelper.ToStringWithCulture(AllowQuoting.ToString().ToLowerInvariant()));
191-
192-
#line default
193-
#line hidden
194106
this.Write(",\r\n allowSparse: ");
195-
196-
#line 73 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
197107
this.Write(this.ToStringHelper.ToStringWithCulture(AllowSparse.ToString().ToLowerInvariant()));
198-
199-
#line default
200-
#line hidden
201108
this.Write(@");
202109
203110
// 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)
220127
");
221128
return this.GenerationEnvironment.ToString();
222129
}
223-
224-
#line 92 "E:\src\machinelearning\src\mlnet\Templates\Console\PredictProgram.tt"
225130

226131
public string TaskType {get;set;}
227132
public string Namespace {get;set;}
@@ -233,13 +138,7 @@ public static string GetAbsolutePath(string relativePath)
233138
public bool AllowSparse {get;set;}
234139
public bool HasHeader {get;set;}
235140

236-
237-
#line default
238-
#line hidden
239141
}
240-
241-
#line default
242-
#line hidden
243142
#region Base class
244143
/// <summary>
245144
/// Base class for this transformation

‎src/mlnet/Templates/Console/PredictProgram.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<#@ template language="C#" #>
1+
<#@ template language="C#" linePragmas="false" #>
22
<#@ assembly name="System.Core" #>
33
<#@ import namespace="System.Linq" #>
44
<#@ import namespace="System.Text" #>

0 commit comments

Comments
 (0)