Skip to content

Commit beb1bb6

Browse files
committed
Resolve complier warnings by
1. Disable warning 612 reported in test file 2. Remove Microsoft.ML.PipelineInference project 3. Remove two commands used in pipeline inference. - InferRecipesCommand.cs - InferSchemaCommand.cs Note that we add [Obsolete] to everything in Microsoft.ML.Legacy but auto-generated APIs.
1 parent 04201f4 commit beb1bb6

38 files changed

+57
-1214
lines changed

Microsoft.ML.sln

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Core.Tests", "
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath", "src\Microsoft.ML.CpuMath\Microsoft.ML.CpuMath.csproj", "{46F2F967-C23F-4076-858D-33F7DA9BD2DA}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.PipelineInference", "src\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj", "{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}"
19-
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Data", "src\Microsoft.ML.Data\Microsoft.ML.Data.csproj", "{AD92D96B-0E96-4F22-8DCE-892E13B1F282}"
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Onnx", "src\Microsoft.ML.Onnx\Microsoft.ML.Onnx.csproj", "{65D0603E-B96C-4DFC-BDD1-705891B88C18}"
@@ -165,14 +163,6 @@ Global
165163
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Release|Any CPU.Build.0 = Release|Any CPU
166164
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
167165
{46F2F967-C23F-4076-858D-33F7DA9BD2DA}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
168-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug|Any CPU.Build.0 = Debug|Any CPU
170-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
171-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Debug-Intrinsics|Any CPU.Build.0 = Debug-Intrinsics|Any CPU
172-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release|Any CPU.ActiveCfg = Release|Any CPU
173-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release|Any CPU.Build.0 = Release|Any CPU
174-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release-Intrinsics|Any CPU.ActiveCfg = Release-Intrinsics|Any CPU
175-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44}.Release-Intrinsics|Any CPU.Build.0 = Release-Intrinsics|Any CPU
176166
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177167
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug|Any CPU.Build.0 = Debug|Any CPU
178168
{AD92D96B-0E96-4F22-8DCE-892E13B1F282}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug-Intrinsics|Any CPU
@@ -509,7 +499,6 @@ Global
509499
{A6CA6CC6-5D7C-4D7F-A0F5-35E14B383B0A} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
510500
{EC743D1D-7691-43B7-B9B0-5F2F7018A8F6} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
511501
{46F2F967-C23F-4076-858D-33F7DA9BD2DA} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
512-
{2D7391C9-8254-4B8F-BF26-FADAF8F02F44} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
513502
{AD92D96B-0E96-4F22-8DCE-892E13B1F282} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
514503
{65D0603E-B96C-4DFC-BDD1-705891B88C18} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
515504
{707BB22C-7E5F-497A-8C2F-74578F675705} = {09EADF06-BE25-4228-AB53-95AE3E15B530}

src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<ProjectReference Include="..\Microsoft.ML.OnnxTransform\Microsoft.ML.OnnxTransform.csproj" />
2222
<ProjectReference Include="..\Microsoft.ML.Onnx\Microsoft.ML.Onnx.csproj" />
2323
<ProjectReference Include="..\Microsoft.ML.PCA\Microsoft.ML.PCA.csproj" />
24-
<ProjectReference Include="..\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj" />
2524
<ProjectReference Include="..\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
2625
<ProjectReference Include="..\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj" />
2726
<ProjectReference Include="..\Microsoft.ML.StandardLearners\Microsoft.ML.StandardLearners.csproj" />

test/Microsoft.ML.Benchmarks/LegacyPredictionEngineBench.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace Microsoft.ML.Benchmarks
1212
{
13+
#pragma warning disable 612
1314
public class LegacyPredictionEngineBench
1415
{
1516
private IrisData _irisExample;
@@ -104,4 +105,5 @@ public void MakeBreastCancerPredictions()
104105
}
105106
}
106107
}
108+
#pragma warning restore 612
107109
}

test/Microsoft.ML.Benchmarks/StochasticDualCoordinateAscentClassifierBench.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
namespace Microsoft.ML.Benchmarks
2020
{
21+
#pragma warning disable 612
2122
public class StochasticDualCoordinateAscentClassifierBench : WithExtraMetrics
2223
{
2324
private readonly string _dataPath = Program.GetInvariantCultureDataPath("iris.txt");
@@ -190,4 +191,5 @@ public class IrisPrediction
190191
[ColumnName("Score")]
191192
public float[] PredictedLabels;
192193
}
194+
#pragma warning restore 612
193195
}

test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<ProjectReference Include="..\..\src\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
1515
<ProjectReference Include="..\..\src\Microsoft.ML.Onnx\Microsoft.ML.Onnx.csproj" />
1616
<ProjectReference Include="..\..\src\Microsoft.ML.PCA\Microsoft.ML.PCA.csproj" />
17-
<ProjectReference Include="..\..\src\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj" />
1817
<ProjectReference Include="..\..\src\Microsoft.ML.StandardLearners\Microsoft.ML.StandardLearners.csproj" />
1918
<ProjectReference Include="..\..\src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
2019
<ProjectReference Include="..\..\src\Microsoft.ML.TimeSeries\Microsoft.ML.TimeSeries.csproj" />

test/Microsoft.ML.Core.Tests/UnitTests/TestCSharpApi.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
namespace Microsoft.ML.Runtime.RunTests
1717
{
18+
#pragma warning disable 612
1819
public class TestCSharpApi : BaseTestClass
1920
{
2021
public TestCSharpApi(ITestOutputHelper output) : base(output)
@@ -980,4 +981,5 @@ public void TestTensorFlowEntryPoint()
980981
Assert.Equal(10, (schema.GetColumnType(2) as VectorType)?.Size);
981982
}
982983
}
984+
#pragma warning restore 612
983985
}

test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
using Microsoft.ML.Runtime.Learners;
1818
using Microsoft.ML.Runtime.LightGBM;
1919
using Microsoft.ML.Runtime.Model.Onnx;
20-
using Microsoft.ML.Runtime.PipelineInference;
21-
using Microsoft.ML.Runtime.TextAnalytics;
2220
using Microsoft.ML.Runtime.TimeSeriesProcessing;
2321
using Microsoft.ML.Trainers;
2422
using Microsoft.ML.Trainers.FastTree;
@@ -41,6 +39,7 @@
4139

4240
namespace Microsoft.ML.Runtime.RunTests
4341
{
42+
#pragma warning disable 612
4443
public partial class TestEntryPoints : CoreBaseTestClass
4544
{
4645
public TestEntryPoints(ITestOutputHelper output) : base(output)
@@ -351,7 +350,6 @@ public void EntryPointCatalogCheckDuplicateParams()
351350
Env.ComponentCatalog.RegisterAssembly(typeof(TensorFlowTransform).Assembly);
352351
Env.ComponentCatalog.RegisterAssembly(typeof(ImageLoaderTransform).Assembly);
353352
Env.ComponentCatalog.RegisterAssembly(typeof(SymSgdClassificationTrainer).Assembly);
354-
Env.ComponentCatalog.RegisterAssembly(typeof(AutoInference).Assembly);
355353
Env.ComponentCatalog.RegisterAssembly(typeof(SaveOnnxCommand).Assembly);
356354
Env.ComponentCatalog.RegisterAssembly(typeof(TimeSeriesProcessing.TimeSeriesProcessing).Assembly);
357355

@@ -4042,4 +4040,5 @@ public void EntryPointSlidingWindow()
40424040
});
40434041
}
40444042
}
4043+
#pragma warning restore 612
40454044
}

test/Microsoft.ML.FSharp.Tests/Microsoft.ML.FSharp.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<ProjectReference Include="..\..\src\Microsoft.ML.Onnx\Microsoft.ML.Onnx.csproj" />
3838
<ProjectReference Include="..\..\src\Microsoft.ML.Parquet\Microsoft.ML.Parquet.csproj" />
3939
<ProjectReference Include="..\..\src\Microsoft.ML.PCA\Microsoft.ML.PCA.csproj" />
40-
<ProjectReference Include="..\..\src\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj" />
4140
<ProjectReference Include="..\..\src\Microsoft.ML.ResultProcessor\Microsoft.ML.ResultProcessor.csproj" />
4241
<ProjectReference Include="..\..\src\Microsoft.ML.StandardLearners\Microsoft.ML.StandardLearners.csproj" />
4342
<ProjectReference Include="..\..\src\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj" />
4443
<ProjectReference Include="..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
44+
<ProjectReference Include="..\..\src\Microsoft.ML.Legacy\Microsoft.ML.Legacy.csproj" />
4545
</ItemGroup>
4646
<ItemGroup>
4747
<NativeAssemblyReference Include="FastTreeNative" />

test/Microsoft.ML.OnnxTransformTest/Microsoft.ML.OnnxTransformTest.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<ProjectReference Include="..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
44
<ProjectReference Include="..\..\src\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
55
<ProjectReference Include="..\..\src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
6-
<ProjectReference Include="..\..\src\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj" />
76
<ProjectReference Include="..\..\src\Microsoft.ML.OnnxTransform\Microsoft.ML.OnnxTransform.csproj" />
87
<ProjectReference Include="..\Microsoft.ML.Predictor.Tests\Microsoft.ML.Predictor.Tests.csproj" />
98
<ProjectReference Include="..\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj" />

test/Microsoft.ML.Predictor.Tests/Commands/InferRecipesCommand.cs

Lines changed: 0 additions & 121 deletions
This file was deleted.

test/Microsoft.ML.Predictor.Tests/Commands/InferSchemaCommand.cs

Lines changed: 0 additions & 113 deletions
This file was deleted.

test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ProjectReference Include="..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
1212
<ProjectReference Include="..\..\src\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
1313
<ProjectReference Include="..\..\src\Microsoft.ML.PCA\Microsoft.ML.PCA.csproj" />
14-
<ProjectReference Include="..\..\src\Microsoft.ML.PipelineInference\Microsoft.ML.PipelineInference.csproj" />
1514
<ProjectReference Include="..\..\src\Microsoft.ML.StandardLearners\Microsoft.ML.StandardLearners.csproj" />
1615
<ProjectReference Include="..\..\src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj" />
1716
<ProjectReference Include="..\..\src\Microsoft.ML.Legacy\Microsoft.ML.Legacy.csproj" />
@@ -26,4 +25,8 @@
2625
<NativeAssemblyReference Include="MklImports" />
2726
</ItemGroup>
2827

28+
<ItemGroup>
29+
<Folder Include="Commands\" />
30+
</ItemGroup>
31+
2932
</Project>

0 commit comments

Comments
 (0)