Skip to content
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

[AutoML] Bump version to ML.NET 1.3.1 in AutoML API and CLI and AutoML package version to 0.15.1 #4071

Merged
merged 3 commits into from
Aug 6, 2019
Merged

[AutoML] Bump version to ML.NET 1.3.1 in AutoML API and CLI and AutoML package version to 0.15.1 #4071

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
211de22
bumped version
srsaggam Aug 6, 2019
913f896
change versions in nupkg
srsaggam Aug 6, 2019
dd4c1d2
revert version bump in branch props
srsaggam Aug 6, 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
2 changes: 1 addition & 1 deletion build/BranchInfo.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(IsStableProject)' != 'true'">
<MajorVersion>0</MajorVersion>
<MinorVersion>15</MinorVersion>
<MinorVersion>16</MinorVersion>
<PatchVersion>0</PatchVersion>
Copy link
Contributor

Choose a reason for hiding this comment

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

ML.NET was released at 1.3.1 & 0.15.1 for preview. So this preview version should match at 0.15.1.

After we release, we'll bump our version to 0.16.0. Same as ML.NET did after releasing (PR).

Ordering:

  • Set AutoML/CLI version to 0.15.1
  • Update the AutoML/CLI to use ML.NET 1.3.1
  • (release)
  • Update AutoML/CLI version to 0.16.0

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks.

#resolved

<PreReleaseLabel>preview</PreReleaseLabel>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
</PropertyGroup>

<ItemGroup>
<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" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.3.1" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions pkg/mlnet/mlnet.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
<!-- references from AutoML -->
<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" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.3.1" />
  </ItemGroup>

  <Target Name="CreateManifestResourceNames" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<PropertyGroup>
<MlDotNetPackageVersion>1.2.0</MlDotNetPackageVersion>
<MlDotNetPackageVersion>1.3.1</MlDotNetPackageVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 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,15 +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.2.0\" />\r\n");
"rence Include=\"Microsoft.ML\" Version=\"1.3.1\" />\r\n");
Copy link
Contributor

Choose a reason for hiding this comment

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

ugh. can you make it a const somewhere so it's not duplicated all over the place?

if (IncludeLightGBMPackage) {
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.2.0\" />\r\n");
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.3.1\" />\r\n");
}
if (IncludeMklComponentsPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.2.0\" />\r\n");
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.3.1\" />\r\n");
}
if (IncludeFastTreePackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.2.0\" />\r\n");
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.3.1\" />\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
8 changes: 4 additions & 4 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.2.0" />
<PackageReference Include="Microsoft.ML" Version="1.3.1" />
<# if (IncludeLightGBMPackage) { #>
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.3.1" />
<#}#>
<# if (IncludeMklComponentsPackage){ #>
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.3.1" />
<#}#>
<# if (IncludeFastTreePackage){ #>
<PackageReference Include="Microsoft.ML.FastTree" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="1.3.1" />
<#}#>
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 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,16 +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.2.0\" /" +
">\r\n <ItemGroup>\r\n <PackageReference Include=\"Microsoft.ML\" Version=\"1.3.1\" /" +
">\r\n");
if (IncludeLightGBMPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.2.0\" />\r\n");
this.Write(" <PackageReference Include=\"Microsoft.ML.LightGBM\" Version=\"1.3.1\" />\r\n");
}
if (IncludeMklComponentsPackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.2.0\" />\r\n");
this.Write(" <PackageReference Include=\"Microsoft.ML.Mkl.Components\" Version=\"1.3.1\" />\r\n");
}
if (IncludeFastTreePackage){
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.2.0\" />\r\n");
this.Write(" <PackageReference Include=\"Microsoft.ML.FastTree\" Version=\"1.3.1\" />\r\n");
}
this.Write(" </ItemGroup>\r\n <ItemGroup>\r\n <ProjectReference Include=\"..\\");
this.Write(this.ToStringHelper.ToStringWithCulture(Namespace));
Expand Down
8 changes: 4 additions & 4 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.2.0" />
<PackageReference Include="Microsoft.ML" Version="1.3.1" />
<# if (IncludeLightGBMPackage){ #>
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.3.1" />
<#}#>
<# if (IncludeMklComponentsPackage){ #>
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.3.1" />
<#}#>
<# if (IncludeFastTreePackage){ #>
<PackageReference Include="Microsoft.ML.FastTree" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="1.3.1" />
<#}#>
</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.2.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.2.0" />
<PackageReference Include="Microsoft.ML" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.3.1" />
</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.2.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.FastTree" Version="1.2.0" />
<PackageReference Include="Microsoft.ML" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.FastTree" Version="1.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down