Skip to content

Commit df2f3fb

Browse files
codemzscodemzs
authored
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components. (#2800)
* Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components. * PR feedback. * PR feedback. * merge conflict.
1 parent 254a316 commit df2f3fb

File tree

44 files changed

+85
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+85
-72
lines changed

‎Microsoft.ML.sln

+5-5
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
100100
EndProject
101101
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
102102
EndProject
103-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
103+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Components", "src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
104104
EndProject
105105
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
106106
EndProject
@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
142142
EndProject
143143
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow.StaticPipe", "src\Microsoft.ML.TensorFlow.StaticPipe\Microsoft.ML.TensorFlow.StaticPipe.csproj", "{F95F7AFB-03AF-4D20-BD75-1740B5FF71D3}"
144144
EndProject
145-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners.StaticPipe", "src\Microsoft.ML.HalLearners.StaticPipe\Microsoft.ML.HalLearners.StaticPipe.csproj", "{2F25EF6A-C754-45BE-AD9E-7DDF46A1B51A}"
145+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Components.StaticPipe", "src\Microsoft.ML.Mkl.Components.StaticPipe\Microsoft.ML.Mkl.Components.StaticPipe.csproj", "{2F25EF6A-C754-45BE-AD9E-7DDF46A1B51A}"
146146
EndProject
147147
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.OnnxTransformer.StaticPipe", "src\Microsoft.ML.OnnxTransformer.StaticPipe\Microsoft.ML.OnnxTransformer.StaticPipe.csproj", "{D1324668-9568-40F4-AA55-30A9A516C230}"
148148
EndProject
149149
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.LightGBM.StaticPipe", "src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj", "{22C51B08-ACAE-47B2-A312-462DC239A23B}"
150150
EndProject
151151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TimeSeries.StaticPipe", "src\Microsoft.ML.TimeSeries.StaticPipe\Microsoft.ML.TimeSeries.StaticPipe.csproj", "{06A147ED-15EA-4106-9105-9B745125B470}"
152152
EndProject
153-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
153+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
154154
ProjectSection(SolutionItems) = preProject
155-
pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
156-
pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
155+
pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
156+
pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
157157
EndProjectSection
158158
EndProject
159159
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"

‎docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.Data.DataView;
44
using Microsoft.ML.Trainers;
55
using Microsoft.ML.SamplesUtils;
6-
using Microsoft.ML.Trainers.HalLearners;
76

87
namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
98
{

‎docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public static class SymbolicStochasticGradientDescent
44
{
5-
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
5+
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
66
// In this example we will use the adult income dataset. The goal is to predict
77
// if a person's income is above $50K or not, based on demographic information about that person.
88
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/datasets/adult

‎docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public static class SymbolicStochasticGradientDescentWithOptions
44
{
5-
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
5+
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
66
// In this example we will use the adult income dataset. The goal is to predict
77
// if a person's income is above $50K or not, based on demographic information about that person.
88
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/datasets/adult
@@ -20,7 +20,7 @@ public static void Example()
2020
var split = mlContext.BinaryClassification.TrainTestSplit(data, testFraction: 0.1);
2121
// Create data training pipeline
2222
var pipeline = mlContext.BinaryClassification.Trainers.SymbolicStochasticGradientDescent(
23-
new ML.Trainers.HalLearners.SymbolicStochasticGradientDescentClassificationTrainer.Options()
23+
new ML.Trainers.SymbolicStochasticGradientDescentClassificationTrainer.Options()
2424
{
2525
LearningRate = 0.2f,
2626
NumberOfIterations = 10,

‎docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression
66
{
77
public static class OrdinaryLeastSquares
88
{
9-
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
9+
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
1010
// In this examples we will use the housing price dataset. The goal is to predict median home value.
1111
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/machine-learning-databases/housing/
1212
public static void Example()

‎docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System;
22
using Microsoft.ML.Data;
33
using Microsoft.ML.SamplesUtils;
4-
using Microsoft.ML.Trainers.HalLearners;
4+
using Microsoft.ML.Trainers;
55

66
namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression
77
{
88
public static class OrdinaryLeastSquaresWithOptions
99
{
10-
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
10+
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
1111
// In this examples we will use the housing price dataset. The goal is to predict median home value.
1212
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/machine-learning-databases/housing/
1313
public static void Example()

‎docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
88
public sealed class VectorWhiten
99
{
1010

11-
/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
11+
/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
1212
public static void Example()
1313
{
1414
// Create a new ML context, for ML.NET operations. It can be used for exception tracking and logging,

‎docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Microsoft.ML.Samples.Dynamic
77
{
88
public sealed class VectorWhitenWithColumnOptions
99
{
10-
/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
10+
/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
1111
public static void Example()
1212
{
1313
// Create a new ML context, for ML.NET operations. It can be used for exception tracking and logging,

‎docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
9+
<ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
1010
<ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
1111
<ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
1212
<ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />

‎pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

-5
This file was deleted.

‎pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.nupkgproj renamed to ‎pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.nupkgproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
5+
<PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
10-
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
10+
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project DefaultTargets="Pack">
2+
3+
<Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />
4+
5+
</Project>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
1414
<ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
1515
<ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
16-
<ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
16+
<ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
1717
<ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
1818
<ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
1919
<ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />

‎src/Microsoft.ML.Core/Data/ModelLoading.cs

+18-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,23 @@ internal sealed partial class ModelLoadContext : IDisposable
2121
public const string ModelStreamName = "Model.key";
2222
internal const string NameBinary = "Model.bin";
2323

24+
/// <summary>
25+
/// Returns the new assembly name to maintain backward compatibility.
26+
/// </summary>
27+
private string ForwardedLoaderAssemblyName
28+
{
29+
get
30+
{
31+
switch (LoaderAssemblyName)
32+
{
33+
case "Microsoft.ML.HalLearners":
34+
return "Microsoft.ML.Mkl.Components";
35+
default:
36+
return LoaderAssemblyName;
37+
}
38+
}
39+
}
40+
2441
/// <summary>
2542
/// Return whether this context contains a directory and stream for a sub-model with
2643
/// the indicated name. This does not attempt to load the sub-model.
@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
259276
{
260277
if (!string.IsNullOrEmpty(LoaderAssemblyName))
261278
{
262-
var assembly = Assembly.Load(LoaderAssemblyName);
279+
var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
263280
catalog.RegisterAssembly(assembly);
264281
}
265282
}

‎src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
2424
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
2525
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
26-
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
26+
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
2727
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
2828
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
2929
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
@@ -42,7 +42,7 @@
4242

4343
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
4444
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
45-
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
45+
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
4646
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
4747
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
4848
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]

‎src/Microsoft.ML.CpuMath/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
1010
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
1111
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
12-
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
12+
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
1313
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
1414
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
1515
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]

‎src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
2424
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
2525
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
26-
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
26+
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
2727
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
2828
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
2929
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]

‎src/Microsoft.ML.HalLearners.StaticPipe/Microsoft.ML.HalLearners.StaticPipe.csproj renamed to ‎src/Microsoft.ML.Mkl.Components.StaticPipe/Microsoft.ML.Mkl.Components.StaticPipe.csproj

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

77
<ItemGroup>
88
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
9-
<ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
9+
<ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
1010
<ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
1111
</ItemGroup>
1212

‎src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs renamed to ‎src/Microsoft.ML.Mkl.Components.StaticPipe/VectorWhiteningStaticExtensions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.ML.StaticPipe;
77
using Microsoft.ML.Transforms;
88

9-
namespace Microsoft.ML.HalLearners.StaticPipe
9+
namespace Microsoft.ML.Mkl.Components.StaticPipe
1010
{
1111
/// <summary>
1212
/// Extensions for statically typed Whitening estimator.
@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
5555
}
5656
}
5757

58-
/// <include file='../Microsoft.ML.HalLearners/doc.xml' path='doc/members/member[@name="Whitening"]/*'/>
58+
/// <include file='../Microsoft.ML.Mkl.Components/doc.xml' path='doc/members/member[@name="Whitening"]/*'/>
5959
/// <param name="input">The column to which the transform will be applied.</param>
6060
/// <param name="eps">Whitening constant, prevents division by zero when scaling the data by inverse of eigenvalues.</param>
6161
/// <param name="maxRows">Maximum number of rows used to train the transform.</param>
@@ -66,7 +66,7 @@ public static Vector<float> PcaWhitening(this Vector<float> input,
6666
int pcaNum = VectorWhiteningEstimator.Defaults.PcaNum)
6767
=> new OutPipelineColumn(input, WhiteningKind.Pca, eps, maxRows, pcaNum);
6868

69-
/// <include file='../Microsoft.ML.HalLearners/doc.xml' path='doc/members/member[@name="Whitening"]/*'/>
69+
/// <include file='../Microsoft.ML.Mkl.Components/doc.xml' path='doc/members/member[@name="Whitening"]/*'/>
7070
/// <param name="input">The column to which the transform will be applied.</param>
7171
/// <param name="eps">Whitening constant, prevents division by zero.</param>
7272
/// <param name="maxRows">Maximum number of rows used to train the transform.</param>

‎src/Microsoft.ML.HalLearners/ComputeLRTrainingStdThroughHal.cs renamed to ‎src/Microsoft.ML.Mkl.Components/ComputeLRTrainingStdThroughHal.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
using System;
66
using Microsoft.ML.Data;
77
using Microsoft.ML.Internal.Utilities;
8-
using Microsoft.ML.Trainers.HalLearners;
8+
using Microsoft.ML.Trainers;
99

1010
namespace Microsoft.ML.Trainers
1111
{
12-
using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
12+
using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;
1313

14-
public sealed class ComputeLRTrainingStdThroughHal : ComputeLRTrainingStd
14+
public sealed class ComputeLRTrainingStdThroughMkl : ComputeLRTrainingStd
1515
{
1616
/// <summary>
1717
/// Computes the standart deviation matrix of each of the non-zero training weights, needed to calculate further the standart deviation,
@@ -36,12 +36,12 @@ public override VBuffer<float> ComputeStd(double[] hessian, int[] weightIndices,
3636
try
3737
{
3838
// First, find the Cholesky decomposition LL' of the Hessian.
39-
Mkl.Pptrf(Mkl.Layout.RowMajor, Mkl.UpLo.Lo, numSelectedParams, hessian);
39+
MklOls.Pptrf(MklOls.Layout.RowMajor, MklOls.UpLo.Lo, numSelectedParams, hessian);
4040
// Note that hessian is already modified at this point. It is no longer the original Hessian,
4141
// but instead represents the Cholesky decomposition L.
4242
// Also note that the following routine is supposed to consume the Cholesky decomposition L instead
4343
// of the original information matrix.
44-
Mkl.Pptri(Mkl.Layout.RowMajor, Mkl.UpLo.Lo, numSelectedParams, hessian);
44+
MklOls.Pptri(MklOls.Layout.RowMajor, MklOls.UpLo.Lo, numSelectedParams, hessian);
4545
// At this point, hessian should contain the inverse of the original Hessian matrix.
4646
// Swap hessian with invHessian to avoid confusion in the following context.
4747
Utils.Swap(ref hessian, ref invHessian);

‎src/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.csproj renamed to ‎src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
5+
<IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
88

@@ -15,7 +15,7 @@
1515
<ItemGroup>
1616
<!-- The package reference is in there, so that the build can download the MlNetMklDeps package at build time.
1717
The binaries of this package, are extraceted, and repackaged in the Microsoft.ML.Mkl.Redist; that is the one that has a true
18-
dependancy on MlNetMklDeps. From the users prospective, the HalLearners package depends on Microsoft.ML.Mkl.Redist. -->
18+
dependancy on MlNetMklDeps. From the users prospective, the Microsoft.ML.Mkl.Components package depends on Microsoft.ML.Mkl.Redist. -->
1919
<PackageReference Include="MlNetMklDeps" Version="$(MlNetMklDepsPackageVersion)" />
2020
</ItemGroup>
2121

0 commit comments

Comments
 (0)