Skip to content

[AutoML] take dependency on a specific ml.net version #3610

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 27, 2019
+15 −5
Merged

[AutoML] take dependency on a specific ml.net version #3610

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
34cf7c3
take dependency on a specific ml.net version
Dmitry-A Apr 27, 2019
f90d599
catch up to spelling fix for OptimizationTolerance
Dmitry-A Apr 27, 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 Microsoft.ML.AutoML.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2050
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.AutML", "src\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj", "{B3727729-3DF8-47E0-8710-9B41DAF55817}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.AutoML", "src\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj", "{B3727729-3DF8-47E0-8710-9B41DAF55817}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.AutoML.Tests", "test\Microsoft.ML.AutoML.Tests\Microsoft.ML.AutoML.Tests.csproj", "{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}"
EndProject
Expand Down
6 changes: 6 additions & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="DotNetMyGet" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" protocolVersion="3" />
Copy link
Member

Choose a reason for hiding this comment

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

Did you actually need this file? You shouldn't have needed this because it is already specified here:

machinelearning/Directory.Build.props

Lines 17 to 22 in a819b46

<RestoreSources>
https://api.nuget.org/v3/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json;
</RestoreSources>

I don't believe this nuget.config does anything because we define the feeds in that msbuild property.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

woops, no. thanks for catching this!

</packageSources>
</configuration>
10 changes: 7 additions & 3 deletions 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 @@ -9,10 +9,14 @@
<IncludeInPackage>Microsoft.ML.AutoML</IncludeInPackage>
</PropertyGroup>

<PropertyGroup>
<MlDotNetPackageVersion>1.0.0-preview-27625-16</MlDotNetPackageVersion>
</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="$(MlDotNetPackageVersion)" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="$(MlDotNetPackageVersion)" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="$(MlDotNetPackageVersion)" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.AutoML/TrainerExtensions/SweepableParams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private static IEnumerable<SweepableParam> BuildLbfgsArgsParams()
return new SweepableParam[] {
new SweepableFloatParam("L2Regularization", 0.0f, 1.0f, numSteps: 4),
new SweepableFloatParam("L1Regularization", 0.0f, 1.0f, numSteps: 4),
new SweepableDiscreteParam("OptmizationTolerance", new object[] { 1e-4f, 1e-7f }),
new SweepableDiscreteParam("OptimizationTolerance", new object[] { 1e-4f, 1e-7f }),
new SweepableDiscreteParam("HistorySize", new object[] { 5, 20, 50 }),
new SweepableLongParam("MaximumNumberOfIterations", 1, int.MaxValue),
new SweepableFloatParam("InitialWeightsDiameter", 0.0f, 1.0f, numSteps: 5),
Expand Down