Skip to content

Commit c77b78a

Browse files
srsaggamdaholste
authored andcommitted
upgrade to mlnet 0.11 (dotnet#263)
1 parent 1a5161d commit c77b78a

File tree

13 files changed

+37
-44
lines changed

13 files changed

+37
-44
lines changed

src/Microsoft.ML.Auto/EstimatorExtensions/EstimatorExtensions.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using Microsoft.ML.Data;
66
using Microsoft.ML.Transforms;
7-
using Microsoft.ML.Transforms.Categorical;
8-
using Microsoft.ML.Transforms.Conversions;
97

108
namespace Microsoft.ML.Auto
119
{
@@ -39,7 +37,7 @@ public IEstimator<ITransformer> CreateInstance(MLContext context, PipelineNode p
3937

4038
public static SuggestedTransform CreateSuggestedTransform(MLContext context, string inColumn, string outColumn)
4139
{
42-
var pipelineNode = new PipelineNode(EstimatorName.ColumnCopying.ToString(),
40+
var pipelineNode = new PipelineNode(EstimatorName.ColumnCopying.ToString(),
4341
PipelineNodeType.Transform, inColumn, outColumn);
4442
var estimator = CreateInstance(context, inColumn, outColumn);
4543
return new SuggestedTransform(pipelineNode, estimator);
@@ -192,7 +190,7 @@ public IEstimator<ITransformer> CreateInstance(MLContext context, PipelineNode p
192190

193191
public static SuggestedTransform CreateSuggestedTransform(MLContext context, string inColumn, string outColumn)
194192
{
195-
var pipelineNode = new PipelineNode(EstimatorName.TextFeaturizing.ToString(),
193+
var pipelineNode = new PipelineNode(EstimatorName.TextFeaturizing.ToString(),
196194
PipelineNodeType.Transform, inColumn, outColumn);
197195
var estimator = CreateInstance(context, inColumn, outColumn);
198196
return new SuggestedTransform(pipelineNode, estimator);
@@ -213,7 +211,7 @@ public IEstimator<ITransformer> CreateInstance(MLContext context, PipelineNode p
213211

214212
public static SuggestedTransform CreateSuggestedTransform(MLContext context, string[] inColumns, string[] outColumns)
215213
{
216-
var pipelineNode = new PipelineNode(EstimatorName.TypeConverting.ToString(),
214+
var pipelineNode = new PipelineNode(EstimatorName.TypeConverting.ToString(),
217215
PipelineNodeType.Transform, inColumns, outColumns);
218216
var estimator = CreateInstance(context, inColumns, outColumns);
219217
return new SuggestedTransform(pipelineNode, estimator);
@@ -239,7 +237,7 @@ public IEstimator<ITransformer> CreateInstance(MLContext context, PipelineNode p
239237

240238
public static SuggestedTransform CreateSuggestedTransform(MLContext context, string inColumn, string outColumn)
241239
{
242-
var pipelineNode = new PipelineNode(EstimatorName.ValueToKeyMapping.ToString(),
240+
var pipelineNode = new PipelineNode(EstimatorName.ValueToKeyMapping.ToString(),
243241
PipelineNodeType.Transform, inColumn, outColumn);
244242
var estimator = CreateInstance(context, inColumn, outColumn);
245243
return new SuggestedTransform(pipelineNode, estimator);

src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<LangVersion>7.3</LangVersion>
55
<RootNamespace>Microsoft.ML.Auto</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.ML" Version="0.11.0-preview-27428-4" />
10-
<PackageReference Include="Microsoft.ML.HalLearners" Version="0.11.0-preview-27428-4" />
11-
<PackageReference Include="Microsoft.ML.LightGBM" Version="0.11.0-preview-27428-4" />
9+
<PackageReference Include="Microsoft.ML" Version="0.11.0" />
10+
<PackageReference Include="Microsoft.ML.HalLearners" Version="0.11.0" />
11+
<PackageReference Include="Microsoft.ML.LightGBM" Version="0.11.0" />
1212
</ItemGroup>
1313

1414
<PropertyGroup>

src/Microsoft.ML.Auto/TrainerExtensions/BinaryTrainerExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Microsoft.ML.Trainers;
88
using Microsoft.ML.Trainers.FastTree;
99
using Microsoft.ML.Trainers.HalLearners;
10-
using Microsoft.ML.Trainers.Online;
1110

1211
namespace Microsoft.ML.Auto
1312
{

src/Microsoft.ML.Auto/TrainerExtensions/RegressionTrainerExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Microsoft.ML.Trainers;
77
using Microsoft.ML.Trainers.FastTree;
88
using Microsoft.ML.Trainers.HalLearners;
9-
using Microsoft.ML.Trainers.Online;
109

1110
namespace Microsoft.ML.Auto
1211
{

src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.GeneratedProjectCodeTest.approved.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
<PropertyGroup>
99
<RestoreSources>
1010
https://api.nuget.org/v3/index.json;
11-
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
1211
</RestoreSources>
1312
</PropertyGroup>
1413
<ItemGroup>
1514
<Compile Include="Program.cs" />
1615
<Compile Include="ConsoleHelper.cs" />
1716
</ItemGroup>
1817
<ItemGroup>
19-
<PackageReference Include="Microsoft.ML" Version="0.11.0-preview-27428-4" />
20-
<PackageReference Include="Microsoft.ML.HalLearners" Version="0.11.0-preview-27428-4" />
21-
<PackageReference Include="Microsoft.ML.LightGBM" Version="0.11.0-preview-27428-4" />
18+
<PackageReference Include="Microsoft.ML" Version="0.11.0" />
19+
<PackageReference Include="Microsoft.ML.HalLearners" Version="0.11.0" />
20+
<PackageReference Include="Microsoft.ML.LightGBM" Version="0.11.0" />
2221
</ItemGroup>
2322
</Project>

src/mlnet.Test/CodeGenTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void TransformGeneratorUsingTest()
7878
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
7979
var actual = codeGenerator.GenerateTransformsAndUsings();
8080
string expectedTransform = "Categorical.OneHotEncoding(new []{new OneHotEncodingEstimator.ColumnOptions(\"Label\",\"Label\")})";
81-
var expectedUsings = "using Microsoft.ML.Transforms.Categorical;\r\n";
81+
var expectedUsings = "using Microsoft.ML.Transforms;\r\n";
8282
Assert.AreEqual(expectedTransform, actual[0].Item1);
8383
Assert.AreEqual(expectedUsings, actual[0].Item2);
8484
}

src/mlnet.Test/TrainerGeneratorTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public void OnlineGradientDescentRegressionAdvancedParameterTest()
309309
Pipeline pipeline = new Pipeline(new PipelineNode[] { node });
310310
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
311311
var actual = codeGenerator.GenerateTrainerAndUsings();
312-
var expectedUsings = "using Microsoft.ML.Trainers.Online;\r\n";
312+
var expectedUsings = "using Microsoft.ML.Trainers;\r\n";
313313
string expectedTrainerString = "OnlineGradientDescent(new OnlineGradientDescentTrainer.Options(){RecencyGainMulti=true,LabelColumn=\"Label\",FeatureColumn=\"Features\"})";
314314
Assert.AreEqual(expectedTrainerString, actual.Item1);
315315
Assert.AreEqual(expectedUsings, actual.Item2);
@@ -383,7 +383,7 @@ public void LinearSvmBinaryParameterTest()
383383
Pipeline pipeline = new Pipeline(new PipelineNode[] { node });
384384
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
385385
var actual = codeGenerator.GenerateTrainerAndUsings();
386-
var expectedUsings = "using Microsoft.ML.Trainers.Online;\r\n ";
386+
var expectedUsings = "using Microsoft.ML.Trainers;\r\n ";
387387
string expectedTrainerString = "LinearSupportVectorMachines(new LinearSvmTrainer.Options(){NoBias=true,LabelColumn=\"Label\",FeatureColumn=\"Features\"})";
388388
Assert.AreEqual(expectedTrainerString, actual.Item1);
389389
Assert.AreEqual(expectedUsings, actual.Item2);
@@ -421,7 +421,7 @@ public void FastTreeTweedieRegressionAdvancedParameterTest()
421421
Pipeline pipeline = new Pipeline(new PipelineNode[] { node });
422422
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
423423
var actual = codeGenerator.GenerateTrainerAndUsings();
424-
var expectedUsings = "using Microsoft.ML.Trainers.Online;\r\n";
424+
var expectedUsings = "using Microsoft.ML.Trainers;\r\n";
425425
string expectedTrainerString = "OnlineGradientDescent(new OnlineGradientDescentTrainer.Options(){Shrinkage=0.1f,LabelColumn=\"Label\",FeatureColumn=\"Features\"})";
426426
Assert.AreEqual(expectedTrainerString, actual.Item1);
427427
Assert.AreEqual(expectedUsings, actual.Item2);
@@ -610,7 +610,7 @@ public void AveragedPerceptronBinaryAdvancedParameterTest()
610610
Pipeline pipeline = new Pipeline(new PipelineNode[] { node });
611611
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
612612
var actual = codeGenerator.GenerateTrainerAndUsings();
613-
var expectedUsings = "using Microsoft.ML.Trainers.Online;\r\n ";
613+
var expectedUsings = "using Microsoft.ML.Trainers;\r\n ";
614614
string expectedTrainerString = "AveragedPerceptron(new AveragedPerceptronTrainer.Options(){Shuffle=true,LabelColumn=\"Label\",FeatureColumn=\"Features\"})";
615615
Assert.AreEqual(expectedTrainerString, actual.Item1);
616616
Assert.AreEqual(expectedUsings, actual.Item2);

src/mlnet.Test/TransformGeneratorTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void OneHotEncodingTest()
3434
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
3535
var actual = codeGenerator.GenerateTransformsAndUsings();
3636
string expectedTransform = "Categorical.OneHotEncoding(new []{new OneHotEncodingEstimator.ColumnOptions(\"categorical_column_1\",\"categorical_column_1\")})";
37-
var expectedUsings = "using Microsoft.ML.Transforms.Categorical;\r\n";
37+
var expectedUsings = "using Microsoft.ML.Transforms;\r\n";
3838
Assert.AreEqual(expectedTransform, actual[0].Item1);
3939
Assert.AreEqual(expectedUsings, actual[0].Item2);
4040
}
@@ -109,7 +109,7 @@ public void OneHotHashEncodingTest()
109109
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
110110
var actual = codeGenerator.GenerateTransformsAndUsings();
111111
string expectedTransform = "Categorical.OneHotHashEncoding(new []{new OneHotHashEncodingEstimator.ColumnOptions(\"Categorical_column_1\",\"Categorical_column_1\")})";
112-
var expectedUsings = "using Microsoft.ML.Transforms.Categorical;\r\n";
112+
var expectedUsings = "using Microsoft.ML.Transforms;\r\n";
113113
Assert.AreEqual(expectedTransform, actual[0].Item1);
114114
Assert.AreEqual(expectedUsings, actual[0].Item2);
115115
}
@@ -139,7 +139,7 @@ public void TypeConvertingTest()
139139
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
140140
var actual = codeGenerator.GenerateTransformsAndUsings();
141141
string expectedTransform = "Conversion.ConvertType(new []{new TypeConvertingEstimator.ColumnOptions(\"R4_column_1\",DataKind.Single,\"I4_column_1\")})";
142-
string expectedUsings = "using Microsoft.ML.Transforms.Conversions;\r\n";
142+
string expectedUsings = "using Microsoft.ML.Transforms;\r\n";
143143
Assert.AreEqual(expectedTransform, actual[0].Item1);
144144
Assert.AreEqual(expectedUsings, actual[0].Item2);
145145
}
@@ -154,7 +154,7 @@ public void ValueToKeyMappingTest()
154154
CodeGenerator codeGenerator = new CodeGenerator(pipeline, null, null);
155155
var actual = codeGenerator.GenerateTransformsAndUsings();
156156
string expectedTransform = "Conversion.MapValueToKey(\"Label\",\"Label\")";
157-
var expectedUsings = "using Microsoft.ML.Transforms.Conversions;\r\n";
157+
var expectedUsings = "using Microsoft.ML.Transforms;\r\n";
158158
Assert.AreEqual(expectedTransform, actual[0].Item1);
159159
Assert.AreEqual(expectedUsings, actual[0].Item2);
160160
}

src/mlnet/CodeGenerator/CSharp/TrainerGenerators.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ internal override IDictionary<string, string> NamedParameters
7070
}
7171
}
7272

73-
internal override string Usings => "using Microsoft.ML.Trainers.Online;\r\n ";
73+
internal override string Usings => "using Microsoft.ML.Trainers;\r\n ";
7474

7575
public AveragedPerceptron(PipelineNode node) : base(node)
7676
{
@@ -196,7 +196,7 @@ internal override IDictionary<string, string> NamedParameters
196196
}
197197
}
198198

199-
internal override string Usings => "using Microsoft.ML.Trainers.Online;\r\n ";
199+
internal override string Usings => "using Microsoft.ML.Trainers;\r\n ";
200200

201201
public LinearSvm(PipelineNode node) : base(node)
202202
{
@@ -266,7 +266,7 @@ internal override IDictionary<string, string> NamedParameters
266266
}
267267
}
268268

269-
internal override string Usings => "using Microsoft.ML.Trainers.Online;\r\n";
269+
internal override string Usings => "using Microsoft.ML.Trainers;\r\n";
270270

271271
public OnlineGradientDescentRegression(PipelineNode node) : base(node)
272272
{

src/mlnet/CodeGenerator/CSharp/TransformGenerators.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public OneHotEncoding(PipelineNode node) : base(node)
4242

4343
internal override string MethodName => "Categorical.OneHotEncoding";
4444

45-
internal override string Usings => "using Microsoft.ML.Transforms.Categorical;\r\n";
45+
internal override string Usings => "using Microsoft.ML.Transforms;\r\n";
4646

4747
private string ArgumentsName = "OneHotEncodingEstimator.ColumnOptions";
4848

@@ -210,7 +210,7 @@ public OneHotHashEncoding(PipelineNode node) : base(node)
210210

211211
internal override string MethodName => "Categorical.OneHotHashEncoding";
212212

213-
internal override string Usings => "using Microsoft.ML.Transforms.Categorical;\r\n";
213+
internal override string Usings => "using Microsoft.ML.Transforms;\r\n";
214214

215215
private string ArgumentsName = "OneHotHashEncodingEstimator.ColumnOptions";
216216

@@ -272,7 +272,7 @@ public TypeConverting(PipelineNode node) : base(node)
272272

273273
internal override string MethodName => "Conversion.ConvertType";
274274

275-
internal override string Usings => "using Microsoft.ML.Transforms.Conversions;\r\n";
275+
internal override string Usings => "using Microsoft.ML.Transforms;\r\n";
276276

277277
private string ArgumentsName = "TypeConvertingEstimator.ColumnOptions";
278278

@@ -311,7 +311,7 @@ public ValueToKeyMapping(PipelineNode node) : base(node)
311311

312312
internal override string MethodName => "Conversion.MapValueToKey";
313313

314-
internal override string Usings => "using Microsoft.ML.Transforms.Conversions;\r\n";
314+
internal override string Usings => "using Microsoft.ML.Transforms;\r\n";
315315

316316
public override string GenerateTransformer()
317317
{

0 commit comments

Comments
 (0)