Skip to content

Commit 9b0d13f

Browse files
daholsteDmitry-A
daholste
authored and
Dmitry-A
committed
[AutoML] Migrate AutoML back to its own solution, w/ NuGet dependencies (dotnet#3373)
* Migrate AutoML back to its own solution, w/ NuGet dependencies * build project updates; parameter name revert * dummy change * Revert "dummy change" This reverts commit 3e85742.
1 parent b96f41d commit 9b0d13f

16 files changed

+85
-263
lines changed

‎Microsoft.ML.AutoML.sln

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.28010.2050
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Auto", "src\Microsoft.ML.Auto\Microsoft.ML.Auto.csproj", "{B3727729-3DF8-47E0-8710-9B41DAF55817}"
6+
EndProject
7+
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}"
8+
EndProject
9+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet", "src\mlnet\mlnet.csproj", "{ED714FA5-6F89-401B-9E7F-CADF1373C553}"
10+
EndProject
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mlnet.Tests", "test\mlnet.Tests\mlnet.Tests.csproj", "{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}"
12+
EndProject
13+
Global
14+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15+
Debug|Any CPU = Debug|Any CPU
16+
Debug-Intrinsics|Any CPU = Debug-Intrinsics|Any CPU
17+
Debug-netfx|Any CPU = Debug-netfx|Any CPU
18+
Release|Any CPU = Release|Any CPU
19+
Release-Intrinsics|Any CPU = Release-Intrinsics|Any CPU
20+
Release-netfx|Any CPU = Release-netfx|Any CPU
21+
EndGlobalSection
22+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
26+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
27+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
28+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
29+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
32+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
33+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
34+
{B3727729-3DF8-47E0-8710-9B41DAF55817}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
35+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
38+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
39+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
40+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
41+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
42+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release|Any CPU.Build.0 = Release|Any CPU
43+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
44+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
45+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
46+
{55ACB7E2-053D-43BB-88E8-0E102FBD62F0}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
47+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
50+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
51+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
52+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
53+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release|Any CPU.Build.0 = Release|Any CPU
55+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
56+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
57+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
58+
{ED714FA5-6F89-401B-9E7F-CADF1373C553}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
59+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
61+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
62+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
63+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-netfx|Any CPU.ActiveCfg = Debug-netfx|Any CPU
64+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Debug-netfx|Any CPU.Build.0 = Debug-netfx|Any CPU
65+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
66+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
68+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
69+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-netfx|Any CPU.ActiveCfg = Release-netfx|Any CPU
70+
{AAC3E4E6-C146-44BB-8873-A1E61D563F2A}.Release-netfx|Any CPU.Build.0 = Release-netfx|Any CPU
71+
EndGlobalSection
72+
GlobalSection(SolutionProperties) = preSolution
73+
HideSolutionNode = FALSE
74+
EndGlobalSection
75+
GlobalSection(ExtensibilityGlobals) = postSolution
76+
SolutionGuid = {8C1BC26C-B87E-47CD-928E-00EFE4353B40}
77+
EndGlobalSection
78+
EndGlobal

‎build.proj

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24+
<Project Include="Microsoft.ML.AutoML.sln" />
2425
<Project Include="Microsoft.ML.sln" />
2526
</ItemGroup>
2627

‎docs/samples/Microsoft.ML.Samples/AutoML/BinaryClassificationExperiment.cs

-23
This file was deleted.

‎docs/samples/Microsoft.ML.Samples/AutoML/BinaryClassificationExperimentWithExperimentSettings.cs

-27
This file was deleted.

‎docs/samples/Microsoft.ML.Samples/AutoML/MulticlassClassificationExperiment.cs

-28
This file was deleted.

‎docs/samples/Microsoft.ML.Samples/AutoML/MulticlassClassificationExperimentWithExperimentSettings.cs

-32
This file was deleted.

‎docs/samples/Microsoft.ML.Samples/AutoML/RegressionExperiment.cs

-39
This file was deleted.

‎docs/samples/Microsoft.ML.Samples/AutoML/RegressionExperimentWithExperimentSettings.cs

-43
This file was deleted.

‎src/Microsoft.ML.Auto/API/AutoCatalog.cs

-42
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ internal AutoCatalog(MLContext context)
3131
/// but <paramref name="maxExperimentTimeInSeconds"/> was the number of seconds in 6 hours,
3232
/// the experiment will run for 4 + 5 = 9 hours (not 6 hours).
3333
/// </remarks>
34-
/// <example>
35-
/// <format type="text/markdown">
36-
/// <![CDATA[
37-
/// [!code-csharp[RegressionExperiment](~/../docs/samples/docs/samples/Microsoft.ML.Samples/AutoML/RegressionExperiment.cs)]
38-
/// ]]>
39-
/// </format>
40-
/// </example>
4134
public RegressionExperiment CreateRegressionExperiment(uint maxExperimentTimeInSeconds)
4235
{
4336
return new RegressionExperiment(_context, new RegressionExperimentSettings()
@@ -51,13 +44,6 @@ public RegressionExperiment CreateRegressionExperiment(uint maxExperimentTimeInS
5144
/// </summary>
5245
/// <param name="experimentSettings">Settings for the AutoML experiment.</param>
5346
/// <returns>A new AutoML regression experiment.</returns>
54-
/// <example>
55-
/// <format type="text/markdown">
56-
/// <![CDATA[
57-
/// [!code-csharp[RegressionExperimentWithExperimentSettings](~/../docs/samples/docs/samples/Microsoft.ML.Samples/AutoML/RegressionExperimentWithExperimentSettings.cs)]
58-
/// ]]>
59-
/// </format>
60-
/// </example>
6147
public RegressionExperiment CreateRegressionExperiment(RegressionExperimentSettings experimentSettings)
6248
{
6349
return new RegressionExperiment(_context, experimentSettings);
@@ -76,13 +62,6 @@ public RegressionExperiment CreateRegressionExperiment(RegressionExperimentSetti
7662
/// but <paramref name="maxExperimentTimeInSeconds"/> was the number of seconds in 6 hours,
7763
/// the experiment will run for 4 + 5 = 9 hours (not 6 hours).
7864
/// </remarks>
79-
/// <example>
80-
/// <format type="text/markdown">
81-
/// <![CDATA[
82-
/// [!code-csharp[BinaryClassificationExperiment](~/../docs/samples/docs/samples/Microsoft.ML.Samples/AutoML/BinaryClassificationExperiment.cs)]
83-
/// ]]>
84-
/// </format>
85-
/// </example>
8665
public BinaryClassificationExperiment CreateBinaryClassificationExperiment(uint maxExperimentTimeInSeconds)
8766
{
8867
return new BinaryClassificationExperiment(_context, new BinaryExperimentSettings()
@@ -96,13 +75,6 @@ public BinaryClassificationExperiment CreateBinaryClassificationExperiment(uint
9675
/// </summary>
9776
/// <param name="experimentSettings">Settings for the AutoML experiment.</param>
9877
/// <returns>A new AutoML binary classification experiment.</returns>
99-
/// <example>
100-
/// <format type="text/markdown">
101-
/// <![CDATA[
102-
/// [!code-csharp[BinaryClassificationExperimentWithExperimentSettings](~/../docs/samples/docs/samples/Microsoft.ML.Samples/AutoML/BinaryClassificationExperimentWithExperimentSettings.cs)]
103-
/// ]]>
104-
/// </format>
105-
/// </example>
10678
public BinaryClassificationExperiment CreateBinaryClassificationExperiment(BinaryExperimentSettings experimentSettings)
10779
{
10880
return new BinaryClassificationExperiment(_context, experimentSettings);
@@ -121,13 +93,6 @@ public BinaryClassificationExperiment CreateBinaryClassificationExperiment(Binar
12193
/// but <paramref name="maxExperimentTimeInSeconds"/> was the number of seconds in 6 hours,
12294
/// the experiment will run for 4 + 5 = 9 hours (not 6 hours).
12395
/// </remarks>
124-
/// <example>
125-
/// <format type="text/markdown">
126-
/// <![CDATA[
127-
/// [!code-csharp[MulticlassClassificationExperiment](~/../docs/samples/docs/samples/Microsoft.ML.Samples/AutoML/MulticlassClassificationExperiment.cs)]
128-
/// ]]>
129-
/// </format>
130-
/// </example>
13196
public MulticlassClassificationExperiment CreateMulticlassClassificationExperiment(uint maxExperimentTimeInSeconds)
13297
{
13398
return new MulticlassClassificationExperiment(_context, new MulticlassExperimentSettings()
@@ -141,13 +106,6 @@ public MulticlassClassificationExperiment CreateMulticlassClassificationExperime
141106
/// </summary>
142107
/// <param name="experimentSettings">Settings for the AutoML experiment.</param>
143108
/// <returns>A new AutoML multiclass classification experiment.</returns>
144-
/// <example>
145-
/// <format type="text/markdown">
146-
/// <![CDATA[
147-
/// [!code-csharp[MulticlassClassificationExperimentWithExperimentSettings](~/../docs/samples/docs/samples/Microsoft.ML.Samples/AutoML/MulticlassClassificationExperimentWithExperimentSettings.cs)]
148-
/// ]]>
149-
/// </format>
150-
/// </example>
151109
public MulticlassClassificationExperiment CreateMulticlassClassificationExperiment(MulticlassExperimentSettings experimentSettings)
152110
{
153111
return new MulticlassClassificationExperiment(_context, experimentSettings);

‎src/Microsoft.ML.Auto/AutoMlUtils.cs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using System;
66
using System.Threading;
7-
using Microsoft.ML.Data;
87

98
namespace Microsoft.ML.Auto
109
{

0 commit comments

Comments
 (0)