Skip to content

Commit f269adc

Browse files
authored
Towards 2326: Microsoft.ML.Ensemble and Microsoft.ML.TimeSeries namespace rationalization (#2491)
* moving Microsoft.ML.TimeSeriesProcessing, and Microsoft.ML.TimeSeries to Microsoft.ML.Transforms.TimeSeries * Microsoft.ML.Ensemble to Microsoft.ML.Trainers.Ensemble
1 parent 8444a5a commit f269adc

File tree

103 files changed

+224
-253
lines changed

Some content is hidden

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

103 files changed

+224
-253
lines changed

docs/samples/Microsoft.ML.Samples/Dynamic/IidChangePointDetectorTransform.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
using System;
66
using System.Collections.Generic;
77
using System.IO;
8-
using System.Linq;
98
using Microsoft.ML.Core.Data;
109
using Microsoft.ML.Data;
11-
using Microsoft.ML.TimeSeries;
12-
using Microsoft.ML.TimeSeriesProcessing;
10+
using Microsoft.ML.Transforms.TimeSeries;
1311

1412
namespace Microsoft.ML.Samples.Dynamic
1513
{

docs/samples/Microsoft.ML.Samples/Dynamic/IidSpikeDetectorTransform.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using System.Linq;
54
using Microsoft.ML.Core.Data;
65
using Microsoft.ML.Data;
7-
using Microsoft.ML.TimeSeries;
8-
using Microsoft.ML.TimeSeriesProcessing;
6+
using Microsoft.ML.Transforms.TimeSeries;
97

108
namespace Microsoft.ML.Samples.Dynamic
119
{

docs/samples/Microsoft.ML.Samples/Dynamic/SsaChangePointDetectorTransform.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using System.Linq;
54
using Microsoft.ML.Core.Data;
65
using Microsoft.ML.Data;
7-
using Microsoft.ML.TimeSeries;
8-
using Microsoft.ML.TimeSeriesProcessing;
6+
using Microsoft.ML.Transforms.TimeSeries;
97

108
namespace Microsoft.ML.Samples.Dynamic
119
{

docs/samples/Microsoft.ML.Samples/Dynamic/SsaSpikeDetectorTransform.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using System.Linq;
54
using Microsoft.ML.Core.Data;
65
using Microsoft.ML.Data;
7-
using Microsoft.ML.TimeSeries;
8-
using Microsoft.ML.TimeSeriesProcessing;
6+
using Microsoft.ML.Transforms.TimeSeries;
97

108
namespace Microsoft.ML.Samples.Dynamic
119
{

src/Microsoft.ML.Ensemble/Batch.cs

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

55
using Microsoft.ML.Data;
66

7-
namespace Microsoft.ML.Ensemble
7+
namespace Microsoft.ML.Trainers.Ensemble
88
{
99
internal sealed class Batch
1010
{

src/Microsoft.ML.Ensemble/EnsembleUtils.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.Ensemble
10+
namespace Microsoft.ML.Trainers.Ensemble
1111
{
1212
internal static class EnsembleUtils
1313
{

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
using Microsoft.ML;
1111
using Microsoft.ML.CommandLine;
1212
using Microsoft.ML.Data;
13-
using Microsoft.ML.Ensemble;
14-
using Microsoft.ML.Ensemble.OutputCombiners;
1513
using Microsoft.ML.EntryPoints;
1614
using Microsoft.ML.Internal.Utilities;
15+
using Microsoft.ML.Trainers.Ensemble;
1716

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

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

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +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;
6-
using Microsoft.ML.Ensemble.Selector;
7-
using Microsoft.ML.Ensemble.Selector.DiversityMeasure;
85
using Microsoft.ML.EntryPoints;
6+
using Microsoft.ML.Trainers.Ensemble;
7+
using Microsoft.ML.Trainers.Ensemble.DiversityMeasure;
98

109
[assembly: EntryPointModule(typeof(DisagreementDiversityFactory))]
1110
[assembly: EntryPointModule(typeof(RegressionDisagreementDiversityFactory))]
1211
[assembly: EntryPointModule(typeof(MultiDisagreementDiversityFactory))]
1312

14-
namespace Microsoft.ML.Ensemble
13+
namespace Microsoft.ML.Trainers.Ensemble
1514
{
1615
[TlcModule.Component(Name = DisagreementDiversityMeasure.LoadName, FriendlyName = DisagreementDiversityMeasure.UserName)]
1716
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;
76
using Microsoft.ML.EntryPoints;
7+
using Microsoft.ML.Trainers.Ensemble;
88

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

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

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
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;
6-
using Microsoft.ML.Ensemble.Selector;
7-
using Microsoft.ML.Ensemble.Selector.FeatureSelector;
85
using Microsoft.ML.EntryPoints;
6+
using Microsoft.ML.Trainers.Ensemble;
7+
using Microsoft.ML.Trainers.Ensemble.FeatureSelector;
98

109
[assembly: EntryPointModule(typeof(AllFeatureSelectorFactory))]
1110
[assembly: EntryPointModule(typeof(RandomFeatureSelector))]
1211

13-
namespace Microsoft.ML.Ensemble
12+
namespace Microsoft.ML.Trainers.Ensemble
1413
{
1514
[TlcModule.Component(Name = AllFeatureSelector.LoadName, FriendlyName = AllFeatureSelector.UserName)]
1615
public sealed class AllFeatureSelectorFactory : ISupportFeatureSelectorFactory

0 commit comments

Comments
 (0)