Skip to content

updating namespaces #2914

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
merged 11 commits into from
Mar 13, 2019
Merged

updating namespaces #2914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bf7fa28
Microsoft.ML.LightGBM -> changes to Microsoft.ML.Trainers.LightGBM
sfilipi Mar 11, 2019
629c39c
ImageAnalytics -> Transforms.Images
sfilipi Mar 11, 2019
00ac2ef
LightGBM -> LightGbm for namespace, assembly and package.
sfilipi Mar 12, 2019
3d181b9
renaming the LightGBM project, and packages.
sfilipi Mar 12, 2019
739913b
moving the few public types outside of ML.Model
sfilipi Mar 12, 2019
cfcc7d8
updating the casing on LightGbm project and assembly references
sfilipi Mar 12, 2019
a11f63a
Regenerate the catalog, and rename the csproj in LightGBM to fix the …
sfilipi Mar 12, 2019
28debb3
fixing the casing on the package urls and the csproj file.
sfilipi Mar 13, 2019
14a7d5b
merging from master
sfilipi Mar 13, 2019
8a05426
regenerating the catalog
sfilipi Mar 13, 2019
30d1e73
nit
sfilipi Mar 13, 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 number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netstandard2.0", "netstanda
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper.Tests", "test\Microsoft.ML.Sweeper.Tests\Microsoft.ML.Sweeper.Tests.csproj", "{3DEB504D-7A07-48CE-91A2-8047461CB3D4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.LightGBM", "src\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj", "{001F3B4E-FBE4-4001-AFD2-A6A989CD1C25}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.LightGbm", "src\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.csproj", "{001F3B4E-FBE4-4001-AFD2-A6A989CD1C25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Ensemble", "src\Microsoft.ML.Ensemble\Microsoft.ML.Ensemble.csproj", "{DCF46B79-1FDB-4DBA-A263-D3D64E3AAA27}"
EndProject
Expand Down Expand Up @@ -146,7 +146,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Components
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}"
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
Expand All @@ -162,10 +162,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics
pkg\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.symbols.nupkgproj = pkg\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.symbols.nupkgproj
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.LightGBM", "Microsoft.ML.LightGBM", "{DE95FE65-9FF7-4233-93DF-7A8F2805624A}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.LightGbm", "Microsoft.ML.LightGbm", "{DE95FE65-9FF7-4233-93DF-7A8F2805624A}"
ProjectSection(SolutionItems) = preProject
pkg\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.nupkgproj = pkg\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.nupkgproj
pkg\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.symbols.nupkgproj = pkg\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.symbols.nupkgproj
pkg\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.nupkgproj = pkg\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.nupkgproj
pkg\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.symbols.nupkgproj = pkg\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.symbols.nupkgproj
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Redist", "Microsoft.ML.Mkl.Redist", "{4CF8095E-B4A3-4326-A550-43098E447288}"
Expand Down
1 change: 1 addition & 0 deletions docs/samples/Microsoft.ML.Samples/Dynamic/FeatureContributionCalculationTransform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.Trainers;

namespace Microsoft.ML.Samples.Dynamic
{
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/LightGbm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
public class LightGbm
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</a>.
public static void Example()
{
// Creating the ML.Net IHostEnvironment object, needed for the pipeline.
Expand Down
6 changes: 3 additions & 3 deletions ...samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/LightGbmWithOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.ML.LightGBM;
using static Microsoft.ML.LightGBM.Options;
using Microsoft.ML.Trainers.LightGbm;
using static Microsoft.ML.Trainers.LightGbm.Options;

namespace Microsoft.ML.Samples.Dynamic.Trainers.BinaryClassification
{
class LightGbmWithOptions
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</a>.
public static void Example()
{
// Creating the ML.Net IHostEnvironment object, needed for the pipeline
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/MulticlassClassification/LightGbm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Microsoft.ML.Samples.Dynamic.Trainers.MulticlassClassification
{
public static class LightGbm
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</a>.
public static void Example()
{
// Create a general context for ML.NET operations. It can be used for exception tracking and logging,
Expand Down
6 changes: 3 additions & 3 deletions ...les/Microsoft.ML.Samples/Dynamic/Trainers/MulticlassClassification/LightGbmWithOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using System.Linq;
using Microsoft.ML.Data;
using Microsoft.ML.LightGBM;
using Microsoft.ML.SamplesUtils;
using static Microsoft.ML.LightGBM.Options;
using Microsoft.ML.Trainers.LightGbm;
using static Microsoft.ML.Trainers.LightGbm.Options;

namespace Microsoft.ML.Samples.Dynamic.Trainers.MulticlassClassification
{
public static class LightGbmWithOptions
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</a>.
public static void Example()
{
// Create a general 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/Dynamic/Trainers/Ranking/LightGbm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
public class LightGbm
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</a>.
public static void Example()
{
// Creating the ML.Net IHostEnvironment object, needed for the pipeline.
Expand Down
6 changes: 3 additions & 3 deletions docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Ranking/LightGbmWithOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Microsoft.ML.LightGBM;
using static Microsoft.ML.LightGBM.Options;
using Microsoft.ML.Trainers.LightGbm;
using static Microsoft.ML.Trainers.LightGbm.Options;

namespace Microsoft.ML.Samples.Dynamic.Trainers.Ranking
{
public class LightGbmWithOptions
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</a>.
public static void Example()
{
// Creating the ML.Net IHostEnvironment object, needed for the pipeline.
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LightGbm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression
{
class LightGbm
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</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
6 changes: 3 additions & 3 deletions docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LightGbmWithOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using System;
using System.Linq;
using Microsoft.ML.Data;
using Microsoft.ML.LightGBM;
using static Microsoft.ML.LightGBM.Options;
using Microsoft.ML.Trainers.LightGbm;
using static Microsoft.ML.Trainers.LightGbm.Options;

namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression
{
class LightGbmWithOptions
{
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGBM/">Microsoft.ML.LightGBM</a>.
// This example requires installation of additional nuget package <a href="https://www.nuget.org/packages/Microsoft.ML.LightGbm/">Microsoft.ML.LightGbm</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
4 changes: 2 additions & 2 deletions docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Microsoft.ML.LightGbm.StaticPipe\Microsoft.ML.LightGbm.StaticPipe.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.LightGbm\Microsoft.ML.LightGbm.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" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.SamplesUtils\Microsoft.ML.SamplesUtils.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.FastTree\Microsoft.ML.FastTree.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.LightGBM\Microsoft.ML.LightGBM.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.Recommender\Microsoft.ML.Recommender.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.StaticPipe\Microsoft.ML.StaticPipe.csproj" />
<ProjectReference Include="..\..\..\src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Static/LightGBMBinaryClassification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using Microsoft.ML.LightGBM.StaticPipe;
using Microsoft.ML.Trainers.LightGbm.StaticPipe;
using Microsoft.ML.StaticPipe;

namespace Microsoft.ML.Samples.Static
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/Microsoft.ML.Samples/Static/LightGBMMulticlassWithInMemoryData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using Microsoft.ML.Data;
using Microsoft.ML.LightGBM.StaticPipe;
using Microsoft.ML.Trainers.LightGbm.StaticPipe;
using Microsoft.ML.SamplesUtils;
using Microsoft.ML.StaticPipe;

Expand Down
4 changes: 2 additions & 2 deletions docs/samples/Microsoft.ML.Samples/Static/LightGBMRegression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Microsoft.ML.Data;
using Microsoft.ML.LightGBM;
using Microsoft.ML.LightGBM.StaticPipe;
using Microsoft.ML.Trainers.LightGbm;
using Microsoft.ML.Trainers.LightGbm.StaticPipe;
using Microsoft.ML.StaticPipe;

namespace Microsoft.ML.Samples.Static
Expand Down
5 changes: 0 additions & 5 deletions pkg/Microsoft.ML.LightGBM/Microsoft.ML.LightGBM.symbols.nupkgproj
View file
Open in desktop

This file was deleted.

0 ....LightGBM/Microsoft.ML.LightGBM.nupkgproj → ....LightGbm/Microsoft.ML.LightGbm.nupkgproj
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions pkg/Microsoft.ML.LightGbm/Microsoft.ML.LightGbm.symbols.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

<Import Project="Microsoft.ML.LightGbm.nupkgproj" />

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Console/Microsoft.ML.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<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.LightGbm\Microsoft.ML.LightGbm.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" />
<ProjectReference Include="..\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
<ProjectReference Include="..\Microsoft.ML.OnnxTransformer\Microsoft.ML.OnnxTransformer.csproj" />
<ProjectReference Include="..\Microsoft.ML.OnnxConverter\Microsoft.ML.OnnxConverter.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ML.Core/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + 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.LightGbm" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Parquet" + PublicKey.Value)]
Expand All @@ -44,7 +44,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow.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.LightGbm.StaticPipe" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries.StaticPipe" + PublicKey.Value)]

[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Internal.MetaLinearLearner" + InternalPublicKey.Value)]
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Data/Dirty/ModelParametersBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using Microsoft.ML.Runtime;

namespace Microsoft.ML.Model
namespace Microsoft.ML.Trainers
{
/// <summary>
/// A base class for predictors producing <typeparamref name="TOutput"/>.
Expand Down
35 changes: 0 additions & 35 deletions src/Microsoft.ML.Data/Dirty/PredictorInterfaces.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,41 +167,6 @@ internal interface IPredictorWithFeatureWeights<out TResult> : IHaveFeatureWeigh
{
}

/// <summary>
/// Interface for mapping input values to corresponding feature contributions.
/// This interface is commonly implemented by predictors.
/// </summary>
[BestFriend]
internal interface IFeatureContributionMapper : IPredictor
{
/// <summary>
/// Get a delegate for mapping Contributions to Features.
/// Result will contain vector with topN positive contributions(if available) and
/// bottomN negative contributions (if available).
/// For example linear predictor will have both negative and positive contributions.
/// For trees we will not have negative contributions, so bottom param will be ignored.
/// If normalization is requested that resulting values will be normalized to [-1, 1].
/// </summary>
ValueMapper<TSrc, VBuffer<float>> GetFeatureContributionMapper<TSrc, TDst>(int top, int bottom, bool normalize);
}

/// <summary>
/// Allows support for feature contribution calculation by model parameters.
/// </summary>
public interface ICalculateFeatureContribution
{
FeatureContributionCalculator FeatureContributionCalculator { get; }
}

/// <summary>
/// Support for feature contribution calculation.
/// </summary>
public sealed class FeatureContributionCalculator
{
internal IFeatureContributionMapper ContributionMapper { get; }
internal FeatureContributionCalculator(IFeatureContributionMapper contributionMapper) => ContributionMapper = contributionMapper;
}

/// <summary>
/// Interface for predictors that can return a string array containing the label names from the label column they were trained on.
/// If the training label is a key with text key value metadata, it should return this metadata. The order of the labels should be consistent
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML.Data/Prediction/Calibrator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using Microsoft.ML.Model.OnnxConverter;
using Microsoft.ML.Model.Pfa;
using Microsoft.ML.Runtime;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;
using Newtonsoft.Json.Linq;

Expand Down
43 changes: 43 additions & 0 deletions src/Microsoft.ML.Data/Prediction/ICalculateFeatureContribution.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;

namespace Microsoft.ML.Trainers
{
/// <summary>
/// Interface for mapping input values to corresponding feature contributions.
/// This interface is commonly implemented by predictors.
/// </summary>
[BestFriend]
internal interface IFeatureContributionMapper : IPredictor
{
/// <summary>
/// Get a delegate for mapping Contributions to Features.
/// Result will contain vector with topN positive contributions(if available) and
/// bottomN negative contributions (if available).
/// For example linear predictor will have both negative and positive contributions.
/// For trees we will not have negative contributions, so bottom param will be ignored.
/// If normalization is requested that resulting values will be normalized to [-1, 1].
/// </summary>
ValueMapper<TSrc, VBuffer<float>> GetFeatureContributionMapper<TSrc, TDst>(int top, int bottom, bool normalize);
}

/// <summary>
/// Allows support for feature contribution calculation by model parameters.
/// </summary>
public interface ICalculateFeatureContribution
{
FeatureContributionCalculator FeatureContributionCalculator { get; }
}

/// <summary>
/// Support for feature contribution calculation.
/// </summary>
public sealed class FeatureContributionCalculator
Copy link
Member

Choose a reason for hiding this comment

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

I'm not seeing how this class is used anywhere in the code.

Can it be deleted?

It appears the way this is working is that we have a public API that takes in a ICalculateFeatureContribution (the public interface above) object, and then we internally cast that same object to IFeatureContributionMapper (the internal interface above that). I don't see where we are using this public class anywhere in our code.

cc @TomFinley @rogancarr

Copy link
Member Author

Choose a reason for hiding this comment

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

tried to remove it, and just use the IFeatureContributionMapper, but it will need the GetFeatureContributionMapper, and the ValueMapper to be public too. The ValueMapper is internal atm.

In reply to: 265147046 [](ancestors = 265147046)

Copy link
Member

@eerhardt eerhardt Mar 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I was able to remove it, and make the solution build successfully:

eerhardt@cd1ac9f

(Obviously this is outside of the scope of this current PR - which is just moving namespaces. Maybe we should open an issue for this design, as I think it kind of "smells".)

Copy link
Member Author

Choose a reason for hiding this comment

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

oh ic, you've removed it completely. I was merging it with the IFeatureContributionMapper. I'll create an issue.

{
internal IFeatureContributionMapper ContributionMapper { get; }
internal FeatureContributionCalculator(IFeatureContributionMapper contributionMapper) => ContributionMapper = contributionMapper;
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Data/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.FastTree" + 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.LightGbm" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxConverter" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.OnnxTransformer" + PublicKey.Value)]
[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Parquet" + PublicKey.Value)]
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML.Data/Scorers/FeatureContributionCalculation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Microsoft.ML.Model;
using Microsoft.ML.Numeric;
using Microsoft.ML.Runtime;
using Microsoft.ML.Trainers;

[assembly: LoadableClass(typeof(IDataScorerTransform), typeof(FeatureContributionScorer), typeof(FeatureContributionScorer.Arguments),
typeof(SignatureDataScorer), "Feature Contribution Scorer", "fcc", "wtf", "fct", "FeatureContributionCalculationScorer", AnnotationUtils.Const.ScoreColumnKind.FeatureContribution)]
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Data/Transforms/ExplainabilityCatalog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.

using Microsoft.ML.Data;
using Microsoft.ML.Model;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;

namespace Microsoft.ML
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.ML.Data/Transforms/FeatureContributionCalculationTransformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Microsoft.ML.Internal.Utilities;
using Microsoft.ML.Model;
using Microsoft.ML.Runtime;
using Microsoft.ML.Trainers;
using Microsoft.ML.Transforms;

[assembly: LoadableClass(FeatureContributionCalculatingTransformer.Summary, typeof(FeatureContributionCalculatingTransformer), null, typeof(SignatureLoadModel),
Expand Down
Loading