Skip to content

Commit a3b6522

Browse files
authored
Towards #2326 - removing some namespaces (#2442)
* removing the Microsoft.ML.Learners and the Microsoft.ML.Trainers.SymSGD namespaces. * removing the Microsoft.ML.Internal.Internallearn.ResultProcessor and the Microsoft.ML.Trainers.FastTree.Internal namespaces. * regenerating the catalog
1 parent 7d7ebb6 commit a3b6522

File tree

150 files changed

+159
-232
lines changed

Some content is hidden

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

150 files changed

+159
-232
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using System;
22
using System.Linq;
33
using Microsoft.Data.DataView;
4-
using Microsoft.ML.Learners;
4+
using Microsoft.ML.Data;
5+
using Microsoft.ML.Trainers;
56
using Microsoft.ML.SamplesUtils;
67
using Microsoft.ML.Trainers.HalLearners;
78

docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance/PfiBinaryClassificationExample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Linq;
3-
using Microsoft.ML.Learners;
3+
using Microsoft.ML.Trainers;
44

55
namespace Microsoft.ML.Samples.Dynamic.PermutationFeatureImportance
66
{

docs/samples/Microsoft.ML.Samples/Static/SDCARegression.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using Microsoft.ML.Data;
3-
using Microsoft.ML.Learners;
43
using Microsoft.ML.StaticPipe;
4+
using Microsoft.ML.Trainers;
55

66
namespace Microsoft.ML.Samples.Static
77
{

src/Microsoft.ML.Ensemble/EntryPoints/CreateEnsemble.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
using Microsoft.ML.CommandLine;
1212
using Microsoft.ML.Data;
1313
using Microsoft.ML.Ensemble;
14-
using Microsoft.ML.Ensemble.EntryPoints;
1514
using Microsoft.ML.Ensemble.OutputCombiners;
1615
using Microsoft.ML.EntryPoints;
1716
using Microsoft.ML.Internal.Utilities;
1817

1918
[assembly: LoadableClass(typeof(void), typeof(EnsembleCreator), null, typeof(SignatureEntryPointModule), "CreateEnsemble")]
2019

21-
namespace Microsoft.ML.EntryPoints
20+
namespace Microsoft.ML.Ensemble
2221
{
2322
/// <summary>
2423
/// A component to combine given models into an ensemble model.

src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Microsoft.ML.Ensemble.EntryPoints;
5+
using Microsoft.ML.Ensemble;
66
using Microsoft.ML.Ensemble.Selector;
77
using Microsoft.ML.Ensemble.Selector.DiversityMeasure;
88
using Microsoft.ML.EntryPoints;
@@ -11,7 +11,7 @@
1111
[assembly: EntryPointModule(typeof(RegressionDisagreementDiversityFactory))]
1212
[assembly: EntryPointModule(typeof(MultiDisagreementDiversityFactory))]
1313

14-
namespace Microsoft.ML.Ensemble.EntryPoints
14+
namespace Microsoft.ML.Ensemble
1515
{
1616
[TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
1717
internal sealed class DisagreementDiversityFactory : ISupportBinaryDiversityMeasureFactory

src/Microsoft.ML.Ensemble/EntryPoints/Ensemble.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML;
6-
using Microsoft.ML.Ensemble.EntryPoints;
6+
using Microsoft.ML.Ensemble;
77
using Microsoft.ML.EntryPoints;
88

99
[assembly: LoadableClass(typeof(void), typeof(Ensemble), null, typeof(SignatureEntryPointModule), "TrainEnsemble")]
1010

11-
namespace Microsoft.ML.Ensemble.EntryPoints
11+
namespace Microsoft.ML.Ensemble
1212
{
1313
internal static class Ensemble
1414
{

src/Microsoft.ML.Ensemble/EntryPoints/FeatureSelector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Microsoft.ML.Ensemble.EntryPoints;
5+
using Microsoft.ML.Ensemble;
66
using Microsoft.ML.Ensemble.Selector;
77
using Microsoft.ML.Ensemble.Selector.FeatureSelector;
88
using Microsoft.ML.EntryPoints;
99

1010
[assembly: EntryPointModule(typeof(AllFeatureSelectorFactory))]
1111
[assembly: EntryPointModule(typeof(RandomFeatureSelector))]
1212

13-
namespace Microsoft.ML.Ensemble.EntryPoints
13+
namespace Microsoft.ML.Ensemble
1414
{
1515
[TlcModule.Component(Name = AllFeatureSelector.LoadName, FriendlyName = AllFeatureSelector.UserName)]
1616
public sealed class AllFeatureSelectorFactory : ISupportFeatureSelectorFactory

src/Microsoft.ML.Ensemble/EntryPoints/OutputCombiner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Microsoft.ML.Ensemble.EntryPoints;
5+
using Microsoft.ML.Ensemble;
66
using Microsoft.ML.Ensemble.OutputCombiners;
77
using Microsoft.ML.EntryPoints;
88

@@ -18,7 +18,7 @@
1818
[assembly: EntryPointModule(typeof(VotingFactory))]
1919
[assembly: EntryPointModule(typeof(WeightedAverage))]
2020

21-
namespace Microsoft.ML.Ensemble.EntryPoints
21+
namespace Microsoft.ML.Ensemble
2222
{
2323
[TlcModule.Component(Name = Average.LoadName, FriendlyName = Average.UserName)]
2424
public sealed class AverageFactory : ISupportBinaryOutputCombinerFactory, ISupportRegressionOutputCombinerFactory

src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs

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

55
using Microsoft.Data.DataView;
66
using Microsoft.ML.Data;
7-
using Microsoft.ML.Ensemble.EntryPoints;
7+
using Microsoft.ML.Ensemble;
88
using Microsoft.ML.EntryPoints;
99
using Microsoft.ML.Internal.Calibration;
1010

1111
[assembly: EntryPointModule(typeof(PipelineEnsemble))]
1212

13-
namespace Microsoft.ML.Ensemble.EntryPoints
13+
namespace Microsoft.ML.Ensemble
1414
{
1515
internal static class PipelineEnsemble
1616
{

src/Microsoft.ML.Ensemble/EntryPoints/SubModelSelector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Microsoft.ML.Ensemble.EntryPoints;
5+
using Microsoft.ML.Ensemble;
66
using Microsoft.ML.Ensemble.Selector;
77
using Microsoft.ML.Ensemble.Selector.SubModelSelector;
88
using Microsoft.ML.EntryPoints;
@@ -16,7 +16,7 @@
1616
[assembly: EntryPointModule(typeof(BestPerformanceSelector))]
1717
[assembly: EntryPointModule(typeof(BestPerformanceSelectorMultiClass))]
1818

19-
namespace Microsoft.ML.Ensemble.EntryPoints
19+
namespace Microsoft.ML.Ensemble
2020
{
2121
[TlcModule.Component(Name = AllSelector.LoadName, FriendlyName = AllSelector.UserName)]
2222
public sealed class AllSelectorFactory : ISupportBinarySubModelSelectorFactory, ISupportRegressionSubModelSelectorFactory

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Collections.Generic;
88
using Microsoft.ML;
99
using Microsoft.ML.CommandLine;
10-
using Microsoft.ML.Ensemble.EntryPoints;
1110
using Microsoft.ML.Ensemble.Selector;
1211
using Microsoft.ML.Ensemble.Selector.DiversityMeasure;
1312
using Microsoft.ML.Ensemble.Selector.SubModelSelector;
@@ -19,8 +18,6 @@
1918

2019
namespace Microsoft.ML.Ensemble.Selector.SubModelSelector
2120
{
22-
using TScalarPredictor = IPredictorProducing<Single>;
23-
2421
internal sealed class BestDiverseSelectorBinary : BaseDiverseSelector<Single, DisagreementDiversityMeasure>, IBinarySubModelSelector
2522
{
2623
public const string UserName = "Best Diverse Selector";

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Microsoft.ML;
99
using Microsoft.ML.CommandLine;
1010
using Microsoft.ML.Data;
11-
using Microsoft.ML.Ensemble.EntryPoints;
1211
using Microsoft.ML.Ensemble.Selector;
1312
using Microsoft.ML.Ensemble.Selector.DiversityMeasure;
1413
using Microsoft.ML.Ensemble.Selector.SubModelSelector;
@@ -20,8 +19,6 @@
2019

2120
namespace Microsoft.ML.Ensemble.Selector.SubModelSelector
2221
{
23-
using TVectorPredictor = IPredictorProducing<VBuffer<Single>>;
24-
2522
internal sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector<VBuffer<Single>, IDiversityMeasure<VBuffer<Single>>>, IMulticlassSubModelSelector
2623
{
2724
public const string UserName = "Best Diverse Selector";

src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Collections.Generic;
88
using Microsoft.ML;
99
using Microsoft.ML.CommandLine;
10-
using Microsoft.ML.Ensemble.EntryPoints;
1110
using Microsoft.ML.Ensemble.Selector;
1211
using Microsoft.ML.Ensemble.Selector.DiversityMeasure;
1312
using Microsoft.ML.Ensemble.Selector.SubModelSelector;
@@ -19,8 +18,6 @@
1918

2019
namespace Microsoft.ML.Ensemble.Selector.SubModelSelector
2120
{
22-
using TScalarPredictor = IPredictorProducing<Single>;
23-
2421
internal sealed class BestDiverseSelectorRegression : BaseDiverseSelector<Single, RegressionDisagreementDiversityMeasure>, IRegressionSubModelSelector
2522
{
2623
public const string UserName = "Best Diverse Selector";

src/Microsoft.ML.Ensemble/Selector/SubsetSelector/BaseSubsetSelector.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Collections.Generic;
77
using Microsoft.ML.CommandLine;
88
using Microsoft.ML.Data;
9-
using Microsoft.ML.Ensemble.EntryPoints;
109
using Microsoft.ML.Transforms;
1110

1211
namespace Microsoft.ML.Ensemble.Selector.SubsetSelector

src/Microsoft.ML.Ensemble/Trainer/Binary/EnsembleTrainer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
using Microsoft.ML;
99
using Microsoft.ML.CommandLine;
1010
using Microsoft.ML.Ensemble;
11-
using Microsoft.ML.Ensemble.EntryPoints;
1211
using Microsoft.ML.Ensemble.OutputCombiners;
1312
using Microsoft.ML.Ensemble.Selector;
1413
using Microsoft.ML.Internal.Internallearn;
15-
using Microsoft.ML.Learners;
14+
using Microsoft.ML.Trainers;
1615
using Microsoft.ML.Trainers.Online;
1716
using Microsoft.ML.Training;
1817

src/Microsoft.ML.Ensemble/Trainer/Multiclass/MulticlassDataPartitionEnsembleTrainer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
using Microsoft.ML.CommandLine;
1010
using Microsoft.ML.Data;
1111
using Microsoft.ML.Ensemble;
12-
using Microsoft.ML.Ensemble.EntryPoints;
1312
using Microsoft.ML.Ensemble.OutputCombiners;
1413
using Microsoft.ML.Ensemble.Selector;
1514
using Microsoft.ML.Internal.Internallearn;
16-
using Microsoft.ML.Learners;
15+
using Microsoft.ML.Trainers;
1716
using Microsoft.ML.Training;
1817

1918
[assembly: LoadableClass(MulticlassDataPartitionEnsembleTrainer.Summary, typeof(MulticlassDataPartitionEnsembleTrainer),

src/Microsoft.ML.Ensemble/Trainer/Regression/RegressionEnsembleTrainer.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
using System.Linq;
88
using Microsoft.ML;
99
using Microsoft.ML.CommandLine;
10-
using Microsoft.ML.Data;
1110
using Microsoft.ML.Ensemble;
12-
using Microsoft.ML.Ensemble.EntryPoints;
1311
using Microsoft.ML.Ensemble.OutputCombiners;
1412
using Microsoft.ML.Ensemble.Selector;
1513
using Microsoft.ML.Internal.Internallearn;
16-
using Microsoft.ML.Learners;
14+
using Microsoft.ML.Trainers;
1715
using Microsoft.ML.Trainers.Online;
1816
using Microsoft.ML.Training;
1917

src/Microsoft.ML.FastTree/BinFile/BinFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.ML.Data;
88
using Microsoft.ML.Internal.Utilities;
99

10-
namespace Microsoft.ML.Trainers.FastTree.Internal
10+
namespace Microsoft.ML.Trainers.FastTree
1111
{
1212
/// <summary>
1313
/// A class that bins vectors of doubles into a specified number of equal mass bins.

src/Microsoft.ML.FastTree/BinFile/IniFileParserInterface.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Runtime.InteropServices;
88
using System.Text;
99

10-
namespace Microsoft.ML.Trainers.FastTree.Internal
10+
namespace Microsoft.ML.Trainers.FastTree
1111
{
1212
internal sealed class IniFileParserInterface
1313
{

src/Microsoft.ML.FastTree/BoostingFastTree.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Linq;
77
using Microsoft.ML.Core.Data;
88
using Microsoft.ML.Internal.Internallearn;
9-
using Microsoft.ML.Trainers.FastTree.Internal;
109
using Float = System.Single;
1110

1211
namespace Microsoft.ML.Trainers.FastTree

src/Microsoft.ML.FastTree/Dataset/Dataset.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Threading.Tasks;
99
using Microsoft.ML.Internal.Utilities;
1010

11-
namespace Microsoft.ML.Trainers.FastTree.Internal
11+
namespace Microsoft.ML.Trainers.FastTree
1212
{
1313
/// <summary>
1414
/// A dataset of features.

src/Microsoft.ML.FastTree/Dataset/DatasetUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using System.Linq;
77

8-
namespace Microsoft.ML.Trainers.FastTree.Internal
8+
namespace Microsoft.ML.Trainers.FastTree
99
{
1010
/// <summary>
1111
/// Loads training/validation/test sets from file

src/Microsoft.ML.FastTree/Dataset/DenseIntArray.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Runtime.InteropServices;
99
using System.Security;
1010

11-
namespace Microsoft.ML.Trainers.FastTree.Internal
11+
namespace Microsoft.ML.Trainers.FastTree
1212
{
1313
#if USE_SINGLE_PRECISION
1414
using FloatType = System.Single;

src/Microsoft.ML.FastTree/Dataset/Feature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System.Linq;
66

7-
namespace Microsoft.ML.Trainers.FastTree.Internal
7+
namespace Microsoft.ML.Trainers.FastTree
88
{
99

1010
/// <summary>

src/Microsoft.ML.FastTree/Dataset/FeatureFlock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using Microsoft.ML.Internal.CpuMath;
1616
using Microsoft.ML.Internal.Utilities;
1717

18-
namespace Microsoft.ML.Trainers.FastTree.Internal
18+
namespace Microsoft.ML.Trainers.FastTree
1919
{
2020
/// <summary>
2121
/// Holds statistics per bin value for a feature. These are yielded by <see cref="SufficientStatsBase.GetBinStats"/>

src/Microsoft.ML.FastTree/Dataset/FeatureHistogram.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System;
66
using System.Linq;
77

8-
namespace Microsoft.ML.Trainers.FastTree.Internal
8+
namespace Microsoft.ML.Trainers.FastTree
99
{
1010
#if USE_SINGLE_PRECISION
1111
using FloatType = System.Single;

src/Microsoft.ML.FastTree/Dataset/FileObjectStore.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace Microsoft.ML.Trainers.FastTree.Internal
5+
namespace Microsoft.ML.Trainers.FastTree
66
{
77
#if !NO_STORE
88
/// <summary>

src/Microsoft.ML.FastTree/Dataset/IntArray.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using System.Linq;
88

9-
namespace Microsoft.ML.Trainers.FastTree.Internal
9+
namespace Microsoft.ML.Trainers.FastTree
1010
{
1111
#if USE_SINGLE_PRECISION
1212
using FloatType = System.Single;

src/Microsoft.ML.FastTree/Dataset/NHotFeatureFlock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace Microsoft.ML.Trainers.FastTree.Internal
5+
namespace Microsoft.ML.Trainers.FastTree
66
{
77
/// <summary>
88
/// This is a feature flock that misuses a property of <see cref="DeltaSparseIntArray.Sumup"/>

src/Microsoft.ML.FastTree/Dataset/OneHotFeatureFlock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System.Linq;
66

7-
namespace Microsoft.ML.Trainers.FastTree.Internal
7+
namespace Microsoft.ML.Trainers.FastTree
88
{
99
/// <summary>
1010
/// A feature flock for a set of features where per example at most one of the features has a

src/Microsoft.ML.FastTree/Dataset/RepeatIntArray.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using System.Linq;
88

9-
namespace Microsoft.ML.Trainers.FastTree.Internal
9+
namespace Microsoft.ML.Trainers.FastTree
1010
{
1111
#if USE_SINGLE_PRECISION
1212
using FloatType = Single;

src/Microsoft.ML.FastTree/Dataset/SegmentIntArray.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Runtime.InteropServices;
88
using System.Security;
99

10-
namespace Microsoft.ML.Trainers.FastTree.Internal
10+
namespace Microsoft.ML.Trainers.FastTree
1111
{
1212
#if USE_SINGLE_PRECISION
1313
using FloatType = System.Single;

src/Microsoft.ML.FastTree/Dataset/SingletonFeatureFlock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Linq;
66
using Microsoft.ML.Internal.Utilities;
77

8-
namespace Microsoft.ML.Trainers.FastTree.Internal
8+
namespace Microsoft.ML.Trainers.FastTree
99
{
1010
/// <summary>
1111
/// The singleton feature flock is the simplest possible sort of flock, that is, a flock

src/Microsoft.ML.FastTree/Dataset/SparseIntArray.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Runtime.InteropServices;
88
using System.Security;
99

10-
namespace Microsoft.ML.Trainers.FastTree.Internal
10+
namespace Microsoft.ML.Trainers.FastTree
1111
{
1212
#if USE_SINGLE_PRECISION
1313
using FloatType = System.Single;

0 commit comments

Comments
 (0)