From 36e575f186dc9c763909a208a7b4402f5943990f Mon Sep 17 00:00:00 2001 From: Dmitry Akhutin Date: Wed, 17 Apr 2019 12:37:29 -0700 Subject: [PATCH 1/5] publish AutoML package --- build.proj | 6 +++--- build/BranchInfo.props | 2 +- .../Microsoft.ML.Auto.nupkgproj | 14 ++++++++++++++ .../Microsoft.ML.Auto.symbols.nupkgproj | 5 +++++ src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj | 17 +---------------- 5 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj create mode 100644 pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj diff --git a/build.proj b/build.proj index 3dd5edd0e7..793fd4888e 100644 --- a/build.proj +++ b/build.proj @@ -21,7 +21,7 @@ - + @@ -34,7 +34,7 @@ CreateOrUpdateCurrentVersionFile; RestoreProjects; BuildRedist; - BuildNative; + $(TraversalBuildDependsOn); DownloadExternalTestFiles; @@ -68,7 +68,7 @@ - + 0 - 13 + 2 0 preview diff --git a/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj new file mode 100644 index 0000000000..c08c4fac4c --- /dev/null +++ b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj @@ -0,0 +1,14 @@ + + + + netstandard2.0 + ML.NET AutoML: Optimizes an ML pipelineĀ for your dataset, by automatically locating the best feature engineering, model, and hyperparameters + + + + + + + + + diff --git a/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj new file mode 100644 index 0000000000..e469ae82eb --- /dev/null +++ b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj @@ -0,0 +1,5 @@ + + + + + diff --git a/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj b/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj index b13120524f..4dc935cf0f 100644 --- a/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj +++ b/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj @@ -6,28 +6,13 @@ false false + Microsoft.ML.Auto - - - Microsoft - LICENSE - https://dot.net/ml - https://aka.ms/mlnetlogo - https://aka.ms/mlnetreleasenotes - - ML.NET ML Machine Learning AutoML - Microsoft.ML.Auto - - - - - - From 37f816a2370df1064a97dbff9bfa5c2d788477cc Mon Sep 17 00:00:00 2001 From: Dmitry Akhutin Date: Wed, 17 Apr 2019 18:04:13 -0700 Subject: [PATCH 2/5] Only leave automl and mlnet tests to run --- src/mlnet/mlnet.csproj | 1 + test/run-tests.proj | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mlnet/mlnet.csproj b/src/mlnet/mlnet.csproj index f1e2fd5ae3..25aa48a34c 100644 --- a/src/mlnet/mlnet.csproj +++ b/src/mlnet/mlnet.csproj @@ -19,6 +19,7 @@ + diff --git a/test/run-tests.proj b/test/run-tests.proj index a5afe75dd3..68328d01c9 100644 --- a/test/run-tests.proj +++ b/test/run-tests.proj @@ -2,8 +2,9 @@ - - + + + From f721e4c41fa93f9a43e5546efcdf56018f0174e8 Mon Sep 17 00:00:00 2001 From: Dmitry Akhutin Date: Wed, 17 Apr 2019 12:37:29 -0700 Subject: [PATCH 3/5] publish AutoML package --- build.proj | 7 ++-- build/BranchInfo.props | 2 +- .../Microsoft.ML.Auto.nupkgproj | 14 +++++++ .../Microsoft.ML.Auto.symbols.nupkgproj | 5 +++ .../Microsoft.ML.Auto.csproj | 38 +++---------------- 5 files changed, 29 insertions(+), 37 deletions(-) create mode 100644 pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj create mode 100644 pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj diff --git a/build.proj b/build.proj index 15fea4e309..793fd4888e 100644 --- a/build.proj +++ b/build.proj @@ -21,7 +21,8 @@ - + + @@ -33,7 +34,7 @@ CreateOrUpdateCurrentVersionFile; RestoreProjects; BuildRedist; - BuildNative; + $(TraversalBuildDependsOn); DownloadExternalTestFiles; @@ -67,7 +68,7 @@ - + 0 - 13 + 2 0 preview diff --git a/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj new file mode 100644 index 0000000000..c08c4fac4c --- /dev/null +++ b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj @@ -0,0 +1,14 @@ + + + + netstandard2.0 + ML.NET AutoML: Optimizes an ML pipelineĀ for your dataset, by automatically locating the best feature engineering, model, and hyperparameters + + + + + + + + + diff --git a/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj new file mode 100644 index 0000000000..e469ae82eb --- /dev/null +++ b/pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj @@ -0,0 +1,5 @@ + + + + + diff --git a/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj b/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj index d07b6b91d0..c9550f1d7d 100644 --- a/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj +++ b/src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj @@ -6,46 +6,18 @@ false false + Microsoft.ML.Auto - + + + - - Microsoft - LICENSE - https://dot.net/ml - https://aka.ms/mlnetlogo - https://aka.ms/mlnetreleasenotes - - ML.NET ML Machine Learning AutoML - Microsoft.ML.Auto - - true - - 1701;1702 - - - - - - - - - - - - - - - - - - - + From dc97cedf4753044b0c180b216335183d6688b61a Mon Sep 17 00:00:00 2001 From: Dmitry Akhutin Date: Wed, 17 Apr 2019 18:04:13 -0700 Subject: [PATCH 4/5] Only leave automl and mlnet tests to run --- src/mlnet/mlnet.csproj | 1 + test/run-tests.proj | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mlnet/mlnet.csproj b/src/mlnet/mlnet.csproj index 02be3cc03b..3947d04105 100644 --- a/src/mlnet/mlnet.csproj +++ b/src/mlnet/mlnet.csproj @@ -20,6 +20,7 @@ + diff --git a/test/run-tests.proj b/test/run-tests.proj index a5afe75dd3..68328d01c9 100644 --- a/test/run-tests.proj +++ b/test/run-tests.proj @@ -2,8 +2,9 @@ - - + + + From efce09813c2dfc0b720ddcd69c90510b05e0a194 Mon Sep 17 00:00:00 2001 From: Dmitry Akhutin Date: Thu, 18 Apr 2019 11:30:26 -0700 Subject: [PATCH 5/5] fix build issues when ml.net is not building --- Microsoft.ML.AutoML.sln | 78 +++++++++++++++++++ src/mlnet/mlnet.csproj | 18 ----- .../Microsoft.ML.AutoML.Tests.csproj | 6 -- 3 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 Microsoft.ML.AutoML.sln diff --git a/Microsoft.ML.AutoML.sln b/Microsoft.ML.AutoML.sln new file mode 100644 index 0000000000..f78a9a2bde --- /dev/null +++ b/Microsoft.ML.AutoML.sln @@ -0,0 +1,78 @@ +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.Auto", "src\Microsoft.ML.Auto\Microsoft.ML.Auto.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 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet", "src\mlnet\mlnet.csproj", "{ED714FA5-6F89-401B-9E7F-CADF1373C553}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet.Tests", "test\mlnet.Tests\mlnet.Tests.csproj", "{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug-Intrinsics|Any CPU = Debug-Intrinsics|Any CPU + Debug-netfx|Any CPU = Debug-netfx|Any CPU + Release|Any CPU = Release|Any CPU + Release-Intrinsics|Any CPU = Release-Intrinsics|Any CPU + Release-netfx|Any CPU = Release-netfx|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Release|Any CPU.Build.0 = Release|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU + {B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release|Any CPU.Build.0 = Release|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU + {55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release|Any CPU.Build.0 = Release|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU + {ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release|Any CPU.Build.0 = Release|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU + {AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8C1BC26C-B87E-47CD-928E-00EFE4353B40} + EndGlobalSection +EndGlobal \ No newline at end of file diff --git a/src/mlnet/mlnet.csproj b/src/mlnet/mlnet.csproj index 3947d04105..d68e5b154d 100644 --- a/src/mlnet/mlnet.csproj +++ b/src/mlnet/mlnet.csproj @@ -27,18 +27,6 @@ - - - mscorlib - - - System - - - System.Core - - - @@ -117,11 +105,5 @@ ModelBuilder.cs - - - - - - diff --git a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj index dc4c3b29aa..0f8802a55f 100644 --- a/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj +++ b/test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj @@ -38,10 +38,4 @@ - - - - - -