Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codemzs merged 4 commits into from
Mar 3, 2019
Merged

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components. #2800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58bfe65
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
codemzs Feb 28, 2019
fd5034c
PR feedback.
codemzs Feb 28, 2019
6296431
PR feedback.
codemzs Mar 3, 2019
31ffa97
merge conflict.
codemzs Mar 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Microsoft.ML.sln
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
ProjectSection(SolutionItems) = preProject
pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down
1 change: 0 additions & 1 deletion docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down
2 changes: 1 addition & 1 deletion ...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
{
public static class SymbolicStochasticGradientDescent
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
// In this example we will use the adult income dataset. The goal is to predict
// if a person's income is above $50K or not, based on demographic information about that person.
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/datasets/adult
Expand Down
4 changes: 2 additions & 2 deletions ...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
{
public static class SymbolicStochasticGradientDescentWithOptions
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
// In this example we will use the adult income dataset. The goal is to predict
// if a person's income is above $50K or not, based on demographic information about that person.
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/datasets/adult
Expand All@@ -20,7 +20,7 @@ public static void Example()
var split = mlContext.BinaryClassification.TrainTestSplit(data, testFraction: 0.1);
// Create data training pipeline
var pipeline = mlContext.BinaryClassification.Trainers.SymbolicStochasticGradientDescent(
new ML.Trainers.HalLearners.SymbolicStochasticGradientDescentClassificationTrainer.Options()
new ML.Trainers.SymbolicStochasticGradientDescentClassificationTrainer.Options()
{
LearningRate = 0.2f,
NumberOfIterations = 10,
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression
{
public static class OrdinaryLeastSquares
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
// In this examples we will use the housing price dataset. The goal is to predict median home value.
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/machine-learning-databases/housing/
public static void Example()
Expand Down
4 changes: 2 additions & 2 deletions ...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression
{
public static class OrdinaryLeastSquaresWithOptions
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
// In this examples we will use the housing price dataset. The goal is to predict median home value.
// For more details about this dataset, please see https://archive.ics.uci.edu/ml/machine-learning-databases/housing/
public static void Example()
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
public sealed class VectorWhiten
{

/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
public static void Example()
{
// Create a new ML context, for ML.NET operations. It can be used for exception tracking and logging,
Expand Down
2 changes: 1 addition & 1 deletion ...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ namespace Microsoft.ML.Samples.Dynamic
{
public sealed class VectorWhitenWithColumnOptions
{
/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.HalLearners/">Microsoft.ML.HalLearners</a>.
/// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.Mkl.Components/">Microsoft.ML.Mkl.Components</a>.
public static void Example()
{
// Create a new ML context, for ML.NET operations. It can be used for exception tracking and logging,
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down
5 changes: 0 additions & 5 deletions pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
<PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

<Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Console/Microsoft.ML.Console.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
<ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
<ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
<ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
<ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
<ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
<ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
<ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down
19 changes: 18 additions & 1 deletion src/Microsoft.ML.Core/Data/ModelLoading.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,23 @@ internal sealed partial class ModelLoadContext : IDisposable
public const string ModelStreamName = "Model.key";
internal const string NameBinary = "Model.bin";

/// <summary>
/// Returns the new assembly name to maintain backward compatibility.
/// </summary>
private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.
{
get
{
switch (LoaderAssemblyName)
{
case "Microsoft.ML.HalLearners":
return "Microsoft.ML.Mkl.Components";
default:
return LoaderAssemblyName;
}
}
}

/// <summary>
/// Return whether this context contains a directory and stream for a sub-model with
/// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
{
if (!string.IsNullOrEmpty(LoaderAssemblyName))

@TomFinleyTomFinleyMar 2, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)

It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.

{
var assembly = Assembly.Load(LoaderAssemblyName);
var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
catalog.RegisterAssembly(assembly);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ML.Core/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.CpuMath/AssemblyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Data/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

<ItemGroup>
<ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
<ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
<ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
<ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions ...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
/// <summary>
/// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
}
}

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

/// <include file='../Microsoft.ML.HalLearners/doc.xml' path='doc/members/member[@name="Whitening"]/*'/>
/// <include file='../Microsoft.ML.Mkl.Components/doc.xml' path='doc/members/member[@name="Whitening"]/*'/>
/// <param name="input">The column to which the transform will be applied.</param>
/// <param name="eps">Whitening constant, prevents division by zero.</param>
/// <param name="maxRows">Maximum number of rows used to train the transform.</param>
Expand Down
10 changes: 5 additions & 5 deletions ...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

public sealed class ComputeLRTrainingStdThroughHal : ComputeLRTrainingStd
public sealed class ComputeLRTrainingStdThroughMkl : ComputeLRTrainingStd
{
/// <summary>
/// Computes the standart deviation matrix of each of the non-zero training weights, needed to calculate further the standart deviation,
Expand All@@ -36,12 +36,12 @@ public override VBuffer<float> ComputeStd(double[] hessian, int[] weightIndices,
try
{
// First, find the Cholesky decomposition LL' of the Hessian.
Mkl.Pptrf(Mkl.Layout.RowMajor, Mkl.UpLo.Lo, numSelectedParams, hessian);
MklOls.Pptrf(MklOls.Layout.RowMajor, MklOls.UpLo.Lo, numSelectedParams, hessian);
// Note that hessian is already modified at this point. It is no longer the original Hessian,
// but instead represents the Cholesky decomposition L.
// Also note that the following routine is supposed to consume the Cholesky decomposition L instead
// of the original information matrix.
Mkl.Pptri(Mkl.Layout.RowMajor, Mkl.UpLo.Lo, numSelectedParams, hessian);
MklOls.Pptri(MklOls.Layout.RowMajor, MklOls.UpLo.Lo, numSelectedParams, hessian);
// At this point, hessian should contain the inverse of the original Hessian matrix.
// Swap hessian with invHessian to avoid confusion in the following context.
Utils.Swap(ref hessian, ref invHessian);
Expand Down
4 changes: 2 additions & 2 deletions ...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
<IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

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

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 4 commits into

from

Mar 3, 2019
 Merged


Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
#2800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
58bfe65

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.


codemzs Feb 28, 2019
fd5034c

PR feedback.


codemzs Feb 28, 2019
6296431

PR feedback.


codemzs Mar 3, 2019
31ffa97

merge conflict.


codemzs Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
	ProjectSection(SolutionItems) = preProject
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
	EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down

2 changes: 1 addition & 1 deletion
...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
 public sealed class VectorWhiten
 {

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

2 changes: 1 addition & 1 deletion
...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down

5 changes: 0 additions & 5 deletions
pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
 <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
 </ItemGroup>

 <ItemGroup> 
Expand Down

5 changes: 5 additions & 0 deletions
pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

 <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down

19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Core/Data/ModelLoading.cs

View file


Open in desktop

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

 /// <summary>
 /// Returns the new assembly name to maintain backward compatibility.
 /// </summary>
 private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.

 {
 get
 {
 switch (LoaderAssemblyName)
 {
 case "Microsoft.ML.HalLearners":
 return "Microsoft.ML.Mkl.Components";
 default:
 return LoaderAssemblyName;
 }
 }
 }

 /// <summary>
 /// Return whether this context contains a directory and stream for a sub-model with
 /// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
 {
 if (!string.IsNullOrEmpty(LoaderAssemblyName))
@TomFinleyTomFinleyMar 2, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)
It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.
 {
 var assembly = Assembly.Load(LoaderAssemblyName);
 var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
 catalog.RegisterAssembly(assembly);
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CpuMath/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <ItemGroup>
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
 </ItemGroup>

Expand Down

6 changes: 3 additions & 3 deletions
...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
 /// <summary>
 /// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
 }
 }

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

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

10 changes: 5 additions & 5 deletions
...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
 using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
 using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

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

4 changes: 2 additions & 2 deletions
...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
 <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 4 commits into

from

Mar 3, 2019
 Merged


Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
#2800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
58bfe65

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.


codemzs Feb 28, 2019
fd5034c

PR feedback.


codemzs Feb 28, 2019
6296431

PR feedback.


codemzs Mar 3, 2019
31ffa97

merge conflict.


codemzs Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
	ProjectSection(SolutionItems) = preProject
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
	EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down

2 changes: 1 addition & 1 deletion
...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
 public sealed class VectorWhiten
 {

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

2 changes: 1 addition & 1 deletion
...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down

5 changes: 0 additions & 5 deletions
pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
 <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
 </ItemGroup>

 <ItemGroup> 
Expand Down

5 changes: 5 additions & 0 deletions
pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

 <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down

19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Core/Data/ModelLoading.cs

View file


Open in desktop

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

 /// <summary>
 /// Returns the new assembly name to maintain backward compatibility.
 /// </summary>
 private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.

 {
 get
 {
 switch (LoaderAssemblyName)
 {
 case "Microsoft.ML.HalLearners":
 return "Microsoft.ML.Mkl.Components";
 default:
 return LoaderAssemblyName;
 }
 }
 }

 /// <summary>
 /// Return whether this context contains a directory and stream for a sub-model with
 /// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
 {
 if (!string.IsNullOrEmpty(LoaderAssemblyName))
@TomFinleyTomFinleyMar 2, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)
It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.
 {
 var assembly = Assembly.Load(LoaderAssemblyName);
 var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
 catalog.RegisterAssembly(assembly);
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CpuMath/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <ItemGroup>
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
 </ItemGroup>

Expand Down

6 changes: 3 additions & 3 deletions
...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
 /// <summary>
 /// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
 }
 }

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

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

10 changes: 5 additions & 5 deletions
...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
 using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
 using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

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

4 changes: 2 additions & 2 deletions
...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
 <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 4 commits into

from

Mar 3, 2019
 Merged


Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
#2800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
58bfe65

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.


codemzs Feb 28, 2019
fd5034c

PR feedback.


codemzs Feb 28, 2019
6296431

PR feedback.


codemzs Mar 3, 2019
31ffa97

merge conflict.


codemzs Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
	ProjectSection(SolutionItems) = preProject
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
	EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down

2 changes: 1 addition & 1 deletion
...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
 public sealed class VectorWhiten
 {

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

2 changes: 1 addition & 1 deletion
...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down

5 changes: 0 additions & 5 deletions
pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
 <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
 </ItemGroup>

 <ItemGroup> 
Expand Down

5 changes: 5 additions & 0 deletions
pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

 <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down

19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Core/Data/ModelLoading.cs

View file


Open in desktop

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

 /// <summary>
 /// Returns the new assembly name to maintain backward compatibility.
 /// </summary>
 private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.

 {
 get
 {
 switch (LoaderAssemblyName)
 {
 case "Microsoft.ML.HalLearners":
 return "Microsoft.ML.Mkl.Components";
 default:
 return LoaderAssemblyName;
 }
 }
 }

 /// <summary>
 /// Return whether this context contains a directory and stream for a sub-model with
 /// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
 {
 if (!string.IsNullOrEmpty(LoaderAssemblyName))
@TomFinleyTomFinleyMar 2, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)
It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.
 {
 var assembly = Assembly.Load(LoaderAssemblyName);
 var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
 catalog.RegisterAssembly(assembly);
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CpuMath/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <ItemGroup>
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
 </ItemGroup>

Expand Down

6 changes: 3 additions & 3 deletions
...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
 /// <summary>
 /// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
 }
 }

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

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

10 changes: 5 additions & 5 deletions
...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
 using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
 using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

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

4 changes: 2 additions & 2 deletions
...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
 <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 4 commits into

from

Mar 3, 2019
 Merged


Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
#2800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
58bfe65

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.


codemzs Feb 28, 2019
fd5034c

PR feedback.


codemzs Feb 28, 2019
6296431

PR feedback.


codemzs Mar 3, 2019
31ffa97

merge conflict.


codemzs Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
	ProjectSection(SolutionItems) = preProject
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
	EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down

2 changes: 1 addition & 1 deletion
...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
 public sealed class VectorWhiten
 {

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

2 changes: 1 addition & 1 deletion
...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down

5 changes: 0 additions & 5 deletions
pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
 <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
 </ItemGroup>

 <ItemGroup> 
Expand Down

5 changes: 5 additions & 0 deletions
pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

 <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down

19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Core/Data/ModelLoading.cs

View file


Open in desktop

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

 /// <summary>
 /// Returns the new assembly name to maintain backward compatibility.
 /// </summary>
 private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.

 {
 get
 {
 switch (LoaderAssemblyName)
 {
 case "Microsoft.ML.HalLearners":
 return "Microsoft.ML.Mkl.Components";
 default:
 return LoaderAssemblyName;
 }
 }
 }

 /// <summary>
 /// Return whether this context contains a directory and stream for a sub-model with
 /// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
 {
 if (!string.IsNullOrEmpty(LoaderAssemblyName))
@TomFinleyTomFinleyMar 2, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)
It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.
 {
 var assembly = Assembly.Load(LoaderAssemblyName);
 var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
 catalog.RegisterAssembly(assembly);
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CpuMath/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <ItemGroup>
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
 </ItemGroup>

Expand Down

6 changes: 3 additions & 3 deletions
...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
 /// <summary>
 /// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
 }
 }

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

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

10 changes: 5 additions & 5 deletions
...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
 using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
 using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

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

4 changes: 2 additions & 2 deletions
...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
 <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 4 commits into

from

Mar 3, 2019
 Merged


Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
#2800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
58bfe65

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.


codemzs Feb 28, 2019
fd5034c

PR feedback.


codemzs Feb 28, 2019
6296431

PR feedback.


codemzs Mar 3, 2019
31ffa97

merge conflict.


codemzs Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
	ProjectSection(SolutionItems) = preProject
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
	EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down

2 changes: 1 addition & 1 deletion
...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
 public sealed class VectorWhiten
 {

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

2 changes: 1 addition & 1 deletion
...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down

5 changes: 0 additions & 5 deletions
pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
 <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
 </ItemGroup>

 <ItemGroup> 
Expand Down

5 changes: 5 additions & 0 deletions
pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

 <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down

19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Core/Data/ModelLoading.cs

View file


Open in desktop

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

 /// <summary>
 /// Returns the new assembly name to maintain backward compatibility.
 /// </summary>
 private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.

 {
 get
 {
 switch (LoaderAssemblyName)
 {
 case "Microsoft.ML.HalLearners":
 return "Microsoft.ML.Mkl.Components";
 default:
 return LoaderAssemblyName;
 }
 }
 }

 /// <summary>
 /// Return whether this context contains a directory and stream for a sub-model with
 /// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
 {
 if (!string.IsNullOrEmpty(LoaderAssemblyName))
@TomFinleyTomFinleyMar 2, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)
It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.
 {
 var assembly = Assembly.Load(LoaderAssemblyName);
 var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
 catalog.RegisterAssembly(assembly);
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CpuMath/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <ItemGroup>
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
 </ItemGroup>

Expand Down

6 changes: 3 additions & 3 deletions
...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
 /// <summary>
 /// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
 }
 }

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

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

10 changes: 5 additions & 5 deletions
...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
 using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
 using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

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

4 changes: 2 additions & 2 deletions
...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
 <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 4 commits into

from

Mar 3, 2019
 Merged


Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
#2800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
58bfe65

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.


codemzs Feb 28, 2019
fd5034c

PR feedback.


codemzs Feb 28, 2019
6296431

PR feedback.


codemzs Mar 3, 2019
31ffa97

merge conflict.


codemzs Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
	ProjectSection(SolutionItems) = preProject
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
	EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down

2 changes: 1 addition & 1 deletion
...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
 public sealed class VectorWhiten
 {

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

2 changes: 1 addition & 1 deletion
...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down

5 changes: 0 additions & 5 deletions
pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
 <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
 </ItemGroup>

 <ItemGroup> 
Expand Down

5 changes: 5 additions & 0 deletions
pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

 <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down

19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Core/Data/ModelLoading.cs

View file


Open in desktop

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

 /// <summary>
 /// Returns the new assembly name to maintain backward compatibility.
 /// </summary>
 private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.

 {
 get
 {
 switch (LoaderAssemblyName)
 {
 case "Microsoft.ML.HalLearners":
 return "Microsoft.ML.Mkl.Components";
 default:
 return LoaderAssemblyName;
 }
 }
 }

 /// <summary>
 /// Return whether this context contains a directory and stream for a sub-model with
 /// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
 {
 if (!string.IsNullOrEmpty(LoaderAssemblyName))
@TomFinleyTomFinleyMar 2, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)
It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.
 {
 var assembly = Assembly.Load(LoaderAssemblyName);
 var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
 catalog.RegisterAssembly(assembly);
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CpuMath/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <ItemGroup>
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
 </ItemGroup>

Expand Down

6 changes: 3 additions & 3 deletions
...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
 /// <summary>
 /// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
 }
 }

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

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

10 changes: 5 additions & 5 deletions
...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
 using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
 using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

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

4 changes: 2 additions & 2 deletions
...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
 <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>

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

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.#2800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

codemzs
merged 4 commits into

from

Mar 3, 2019
 Merged


Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.
#2800
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
58bfe65

Rename HalLearners assembly and nuget to Microsoft.ML.Mkl.Components.


codemzs Feb 28, 2019
fd5034c

PR feedback.


codemzs Feb 28, 2019
6296431

PR feedback.


codemzs Mar 3, 2019
31ffa97

merge conflict.


codemzs Mar 3, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
Microsoft.ML.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
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}"
Comment thread
codemzs marked this conversation as resolved.

EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
EndProject
Expand DownExpand Up@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
EndProject
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}"
EndProject
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}"
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}"
EndProject
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}"
EndProject
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}"
EndProject
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}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
	ProjectSection(SolutionItems) = preProject
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
 pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
 pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
	EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"
Expand Down

1 change: 0 additions & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PFIHelper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
using Microsoft.Data.DataView;
using Microsoft.ML.Trainers;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;

namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
{
Expand Down

2 changes: 1 addition & 1 deletion
...oft.ML.Samples/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescent.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...les/Dynamic/Trainers/BinaryClassification/SymbolicStochasticGradientDescentWithOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquares.cs

View file


Open in desktop

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

4 changes: 2 additions & 2 deletions
...mples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/OrdinaryLeastSquaresWithOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ namespace Microsoft.ML.Samples.Dynamic
 public sealed class VectorWhiten
 {

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

2 changes: 1 addition & 1 deletion
...mples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs

View file


Open in desktop

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

2 changes: 1 addition & 1 deletion
docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="..\..\..\src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj" />
 <ProjectReference Include="..\..\..\src\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
Expand Down

5 changes: 0 additions & 5 deletions
pkg/Microsoft.ML.HalLearners/Microsoft.ML.HalLearners.symbols.nupkgproj

View file


Open in desktop


This file was deleted.


4 changes: 2 additions & 2 deletions
...arners/Microsoft.ML.HalLearners.nupkgproj → ...nts/Microsoft.ML.Mkl.Components.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,12 +2,12 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <PackageDescription>ML.NET additional learners making use of hardware acceleration. They use Intel Mkl.</PackageDescription>
 <PackageDescription>ML.NET additional learners making use of Intel Mkl.</PackageDescription>
 </PropertyGroup>

 <ItemGroup>
 <ProjectReference Include="../Microsoft.ML/Microsoft.ML.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
<ProjectReference Include="../Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.nupkgproj" />
 </ItemGroup>

 <ItemGroup> 
Expand Down

5 changes: 5 additions & 0 deletions
pkg/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.symbols.nupkgproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

 <Import Project="Microsoft.ML.Mkl.Components.nupkgproj" />

</Project>

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Console/Microsoft.ML.Console.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj" />
 <ProjectReference Include="..\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj" />
 <ProjectReference Include="..\Microsoft.ML.KMeansClustering\Microsoft.ML.KMeansClustering.csproj" />
 <ProjectReference Include="..\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
Expand Down

19 changes: 18 additions & 1 deletion
src/Microsoft.ML.Core/Data/ModelLoading.cs

View file


Open in desktop

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

 /// <summary>
 /// Returns the new assembly name to maintain backward compatibility.
 /// </summary>
 private string ForwardedLoaderAssemblyName
Comment thread
codemzs marked this conversation as resolved.

 {
 get
 {
 switch (LoaderAssemblyName)
 {
 case "Microsoft.ML.HalLearners":
 return "Microsoft.ML.Mkl.Components";
 default:
 return LoaderAssemblyName;
 }
 }
 }

 /// <summary>
 /// Return whether this context contains a directory and stream for a sub-model with
 /// the indicated name. This does not attempt to load the sub-model.
Expand DownExpand Up@@ -259,7 +276,7 @@ private void EnsureLoaderAssemblyIsRegistered(ComponentCatalog catalog)
 {
 if (!string.IsNullOrEmpty(LoaderAssemblyName))
@TomFinleyTomFinleyMar 2, 2019

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LoaderAssemblyName [](start = 38, length = 18)
It may have been more sensible to do ForwardedLoaderAssemblyName here, but we can fix that later since the scenarios that would require that change can handle that change independently.
 {
 var assembly = Assembly.Load(LoaderAssemblyName);
 var assembly = Assembly.Load(ForwardedLoaderAssemblyName);
 catalog.RegisterAssembly(assembly);
 }
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/Microsoft.ML.Core/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand All@@ -42,7 +42,7 @@

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.CpuMath/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
[assembly: InternalsVisibleTo("Microsoft.ML.CpuMath.UnitTests.netcoreapp" + PublicKey.TestValue)]
[assembly: InternalsVisibleTo("Microsoft.ML.Data" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)]
[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
src/Microsoft.ML.Data/Properties/AssemblyInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Api" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Ensemble" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.HalLearners" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Mkl.Components" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.KMeansClustering" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.LightGBM" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
Expand Down

2 changes: 1 addition & 1 deletion
...icrosoft.ML.HalLearners.StaticPipe.csproj → ...osoft.ML.Mkl.Components.StaticPipe.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

 <ItemGroup>
 <ProjectReference Include="..\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
 <ProjectReference Include="..\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj" />
 <ProjectReference Include="..\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj" />
 <ProjectReference Include="..\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
 </ItemGroup>

Expand Down

6 changes: 3 additions & 3 deletions
...icPipe/VectorWhiteningStaticExtensions.cs → ...icPipe/VectorWhiteningStaticExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
using Microsoft.ML.StaticPipe;
using Microsoft.ML.Transforms;

namespace Microsoft.ML.HalLearners.StaticPipe
namespace Microsoft.ML.Mkl.Components.StaticPipe
{
 /// <summary>
 /// Extensions for statically typed Whitening estimator.
Expand DownExpand Up@@ -55,7 +55,7 @@ public override IEstimator<ITransformer> Reconcile(IHostEnvironment env,
 }
 }

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

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

10 changes: 5 additions & 5 deletions
...earners/ComputeLRTrainingStdThroughHal.cs → ...ponents/ComputeLRTrainingStdThroughHal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,13 +5,13 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Trainers.HalLearners;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Trainers
{
 using Mkl = OrdinaryLeastSquaresRegressionTrainer.Mkl;
 using MklOls = OrdinaryLeastSquaresRegressionTrainer.Mkl;

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

4 changes: 2 additions & 2 deletions
...lLearners/Microsoft.ML.HalLearners.csproj → ...onents/Microsoft.ML.Mkl.Components.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

 <PropertyGroup>
 <TargetFramework>netstandard2.0</TargetFramework>
 <IncludeInPackage>Microsoft.ML.HalLearners</IncludeInPackage>
 <IncludeInPackage>Microsoft.ML.Mkl.Components</IncludeInPackage>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 </PropertyGroup>

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

Expand Down
Loading