Skip to content

[AutoML] Upgrade ml.net package in generated code #3644

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 4 commits into from
May 2, 2019
Merged

[AutoML] Upgrade ml.net package in generated code #3644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a11321f
upgrade the mlnet package in gen code
srsaggam May 2, 2019
e3f2767
Update src/mlnet/Templates/Console/ModelProject.cs
justinormont May 2, 2019
c8da3dc
Update src/mlnet/Templates/Console/ModelProject.tt
justinormont May 2, 2019
4ea9634
added spaces
srsaggam May 2, 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
17 changes: 7 additions & 10 deletions src/mlnet/Templates/Console/ModelProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,15 @@ 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");
if(IncludeLightGBMPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
"\n");
"rence Include=\"Microsoft.ML\" Version=\"1.0.0\" />\r\n");
if (IncludeLightGBMPackage) {
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0\" />\r\n");
}
if(IncludeMklComponentsPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
"w\" />\r\n");
if (IncludeMklComponentsPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0\" />\r\n");
}
if(IncludeFastTreePackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.0.0-preview\" />\r" +
"\n");
if (IncludeFastTreePackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.0.0\" />\r\n");
}
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" +
Expand Down
14 changes: 7 additions & 7 deletions src/mlnet/Templates/Console/ModelProject.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML" Version="1.0.0" />
<# if (IncludeLightGBMPackage) { #>
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<# if (IncludeMklComponentsPackage){ #>
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0" />
<#}#>
<# if(IncludeFastTreePackage){ #>
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview" />
<# if (IncludeFastTreePackage){ #>
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0" />
<#}#>
</ItemGroup>

Expand Down
19 changes: 8 additions & 11 deletions src/mlnet/Templates/Console/PredictProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,16 @@ public virtual string TransformText()
{
this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n <PropertyGroup>\r\n <OutputType>Exe</Outp" +
"utType>\r\n <TargetFramework>netcoreapp2.1</TargetFramework>\r\n </PropertyGroup" +
">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"1.0.0-pr" +
"eview\" />\r\n");
if(IncludeLightGBMPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0-preview\" />\r" +
"\n");
">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"1.0.0\" /" +
">\r\n");
if (IncludeLightGBMPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.0.0\" />\r\n");
}
if(IncludeMklComponentsPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0-previe" +
"w\" />\r\n");
if (IncludeMklComponentsPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.0.0\" />\r\n");
}
if(IncludeFastTreePackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.0.0-preview\" />\r" +
"\n");
if (IncludeFastTreePackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.0.0\" />\r\n");
}
this.Write(" </ItemGroup>\r\n <ItemGroup>\r\n <ProjectReference Include=\"..\\");
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
Expand Down
14 changes: 7 additions & 7 deletions src/mlnet/Templates/Console/PredictProject.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<# if(IncludeLightGBMPackage){ #>
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML" Version="1.0.0" />
<# if (IncludeLightGBMPackage){ #>
Copy link
Contributor

@justinormont justinormont May 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Suggested change
<# if (IncludeLightGBMPackage){ #>
<# if (IncludeLightGBMPackage) { #>

<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0" />
<#}#>
<# if(IncludeMklComponentsPackage){ #>
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<# if (IncludeMklComponentsPackage){ #>
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0" />
<#}#>
<# if(IncludeFastTreePackage){ #>
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview" />
<# if (IncludeFastTreePackage){ #>
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0" />
<#}#>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...sts/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML" Version="1.0.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TestNamespace.Model\TestNamespace.Model.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions ...et.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ModelProjectFileContentTest.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML" Version="1.0.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down