From 2301bb87650c4ab78684005f364b09a92a421e7a Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Mon, 25 Feb 2019 14:19:54 -0800 Subject: [PATCH 1/7] removing : Microsoft.ML.Trainers.Ensemble.DiversityMeasure Microsoft.ML.Trainers.Ensemble.FeatureSelector Microsoft.ML.Trainers.Ensemble.SubModelSelector --- src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs | 1 - src/Microsoft.ML.Ensemble/EntryPoints/FeatureSelector.cs | 1 - src/Microsoft.ML.Ensemble/EntryPoints/SubModelSelector.cs | 1 - .../DiversityMeasure/BaseDisagreementDiversityMeasure.cs | 2 +- .../Selector/DiversityMeasure/DisagreementDiversityMeasure.cs | 3 +-- .../Selector/DiversityMeasure/ModelDiversityMetric.cs | 2 +- .../DiversityMeasure/MultiDisagreementDiversityMeasure.cs | 3 +-- .../RegressionDisagreementDiversityMeasure.cs | 3 +-- .../Selector/FeatureSelector/AllFeatureSelector.cs | 3 +-- .../Selector/FeatureSelector/RandomFeatureSelector.cs | 3 +-- src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs | 1 - .../Selector/SubModelSelector/AllSelector.cs | 3 +-- .../Selector/SubModelSelector/AllSelectorMultiClass.cs | 3 +-- .../Selector/SubModelSelector/BaseBestPerformanceSelector.cs | 2 +- .../Selector/SubModelSelector/BaseDiverseSelector.cs | 3 +-- .../Selector/SubModelSelector/BaseSubModelSelector.cs | 2 +- .../Selector/SubModelSelector/BestDiverseSelectorBinary.cs | 4 +--- .../SubModelSelector/BestDiverseSelectorMultiClass.cs | 4 +--- .../SubModelSelector/BestDiverseSelectorRegression.cs | 4 +--- .../SubModelSelector/BestPerformanceRegressionSelector.cs | 3 +-- .../Selector/SubModelSelector/BestPerformanceSelector.cs | 3 +-- .../SubModelSelector/BestPerformanceSelectorMultiClass.cs | 3 +-- .../Selector/SubModelSelector/SubModelDataSelector.cs | 2 +- 23 files changed, 19 insertions(+), 40 deletions(-) diff --git a/src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs b/src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs index 075b3659ec..9b1bd10976 100644 --- a/src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs +++ b/src/Microsoft.ML.Ensemble/EntryPoints/DiversityMeasure.cs @@ -4,7 +4,6 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; [assembly: EntryPointModule(typeof(DisagreementDiversityFactory))] [assembly: EntryPointModule(typeof(RegressionDisagreementDiversityFactory))] diff --git a/src/Microsoft.ML.Ensemble/EntryPoints/FeatureSelector.cs b/src/Microsoft.ML.Ensemble/EntryPoints/FeatureSelector.cs index df65fc14c3..6200585b3b 100644 --- a/src/Microsoft.ML.Ensemble/EntryPoints/FeatureSelector.cs +++ b/src/Microsoft.ML.Ensemble/EntryPoints/FeatureSelector.cs @@ -4,7 +4,6 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.FeatureSelector; [assembly: EntryPointModule(typeof(AllFeatureSelectorFactory))] [assembly: EntryPointModule(typeof(RandomFeatureSelector))] diff --git a/src/Microsoft.ML.Ensemble/EntryPoints/SubModelSelector.cs b/src/Microsoft.ML.Ensemble/EntryPoints/SubModelSelector.cs index f7fea9d45e..4e947cd690 100644 --- a/src/Microsoft.ML.Ensemble/EntryPoints/SubModelSelector.cs +++ b/src/Microsoft.ML.Ensemble/EntryPoints/SubModelSelector.cs @@ -4,7 +4,6 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: EntryPointModule(typeof(AllSelectorFactory))] [assembly: EntryPointModule(typeof(AllSelectorMultiClassFactory))] diff --git a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/BaseDisagreementDiversityMeasure.cs b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/BaseDisagreementDiversityMeasure.cs index c2f40e0b1a..037ec34693 100644 --- a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/BaseDisagreementDiversityMeasure.cs +++ b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/BaseDisagreementDiversityMeasure.cs @@ -6,7 +6,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; -namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure +namespace Microsoft.ML.Trainers.Ensemble { internal abstract class BaseDisagreementDiversityMeasure : IDiversityMeasure { diff --git a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs index 4cb1cbd883..19a284e01c 100644 --- a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs +++ b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/DisagreementDiversityMeasure.cs @@ -5,12 +5,11 @@ using System; using Microsoft.ML; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; [assembly: LoadableClass(typeof(DisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure), DisagreementDiversityMeasure.UserName, DisagreementDiversityMeasure.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class DisagreementDiversityMeasure : BaseDisagreementDiversityMeasure, IBinaryDiversityMeasure { diff --git a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/ModelDiversityMetric.cs b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/ModelDiversityMetric.cs index 04c9e7f2d2..c5cce28026 100644 --- a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/ModelDiversityMetric.cs +++ b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/ModelDiversityMetric.cs @@ -4,7 +4,7 @@ using System; -namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class ModelDiversityMetric { diff --git a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs index ccdd4d6b0b..51dc757825 100644 --- a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs +++ b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/MultiDisagreementDiversityMeasure.cs @@ -7,12 +7,11 @@ using Microsoft.ML.Data; using Microsoft.ML.Numeric; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; [assembly: LoadableClass(typeof(MultiDisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure), DisagreementDiversityMeasure.UserName, MultiDisagreementDiversityMeasure.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class MultiDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure>, IMulticlassDiversityMeasure { diff --git a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs index c1b37411b6..cf70890d24 100644 --- a/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs +++ b/src/Microsoft.ML.Ensemble/Selector/DiversityMeasure/RegressionDisagreementDiversityMeasure.cs @@ -5,12 +5,11 @@ using System; using Microsoft.ML; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; [assembly: LoadableClass(typeof(RegressionDisagreementDiversityMeasure), null, typeof(SignatureEnsembleDiversityMeasure), DisagreementDiversityMeasure.UserName, RegressionDisagreementDiversityMeasure.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.DiversityMeasure +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class RegressionDisagreementDiversityMeasure : BaseDisagreementDiversityMeasure, IRegressionDiversityMeasure { diff --git a/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/AllFeatureSelector.cs b/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/AllFeatureSelector.cs index 52c0a4752b..3aba8970e4 100644 --- a/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/AllFeatureSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/AllFeatureSelector.cs @@ -6,12 +6,11 @@ using Microsoft.ML; using Microsoft.ML.Data; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.FeatureSelector; [assembly: LoadableClass(typeof(AllFeatureSelector), null, typeof(SignatureEnsembleFeatureSelector), AllFeatureSelector.UserName, AllFeatureSelector.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.FeatureSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class AllFeatureSelector : IFeatureSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/RandomFeatureSelector.cs b/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/RandomFeatureSelector.cs index a06b8c300f..0596cf0e50 100644 --- a/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/RandomFeatureSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/FeatureSelector/RandomFeatureSelector.cs @@ -9,12 +9,11 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.FeatureSelector; [assembly: LoadableClass(typeof(RandomFeatureSelector), typeof(RandomFeatureSelector.Arguments), typeof(SignatureEnsembleFeatureSelector), RandomFeatureSelector.UserName, RandomFeatureSelector.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.FeatureSelector +namespace Microsoft.ML.Trainers.Ensemble { internal class RandomFeatureSelector : IFeatureSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs b/src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs index 96642ccc8f..fcb627f81d 100644 --- a/src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs +++ b/src/Microsoft.ML.Ensemble/Selector/IDiversityMeasure.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; namespace Microsoft.ML.Trainers.Ensemble { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelector.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelector.cs index ce62ee9180..d22171b935 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelector.cs @@ -5,11 +5,10 @@ using System; using Microsoft.ML; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(AllSelector), null, typeof(SignatureEnsembleSubModelSelector), AllSelector.UserName, AllSelector.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class AllSelector : BaseSubModelSelector, IBinarySubModelSelector, IRegressionSubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelectorMultiClass.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelectorMultiClass.cs index 6905579c3b..1caee7c7d5 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelectorMultiClass.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/AllSelectorMultiClass.cs @@ -6,12 +6,11 @@ using Microsoft.ML; using Microsoft.ML.Data; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(AllSelectorMultiClass), null, typeof(SignatureEnsembleSubModelSelector), AllSelectorMultiClass.UserName, AllSelectorMultiClass.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class AllSelectorMultiClass : BaseSubModelSelector>, IMulticlassSubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseBestPerformanceSelector.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseBestPerformanceSelector.cs index a13ef47b35..5726d6a01d 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseBestPerformanceSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseBestPerformanceSelector.cs @@ -8,7 +8,7 @@ using System.Reflection; using Microsoft.ML.CommandLine; -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal abstract class BaseBestPerformanceSelector : SubModelDataSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs index e54d0fa85e..898912906f 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseDiverseSelector.cs @@ -7,9 +7,8 @@ using System.Collections.Generic; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal abstract class BaseDiverseSelector : SubModelDataSelector where TDiversityMetric : class, IDiversityMeasure diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseSubModelSelector.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseSubModelSelector.cs index c2e2a0a32b..3449d78255 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseSubModelSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BaseSubModelSelector.cs @@ -8,7 +8,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal abstract class BaseSubModelSelector : ISubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs index 869da7307e..a6a7a86684 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorBinary.cs @@ -10,13 +10,11 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(BestDiverseSelectorBinary), typeof(BestDiverseSelectorBinary.Arguments), typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorBinary.UserName, BestDiverseSelectorBinary.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class BestDiverseSelectorBinary : BaseDiverseSelector, IBinarySubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs index 9a39b4f5b3..48c2b60119 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorMultiClass.cs @@ -11,13 +11,11 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(BestDiverseSelectorMultiClass), typeof(BestDiverseSelectorMultiClass.Arguments), typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorMultiClass.UserName, BestDiverseSelectorMultiClass.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class BestDiverseSelectorMultiClass : BaseDiverseSelector, IDiversityMeasure>>, IMulticlassSubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs index 2022e7d057..aab2bc5c5d 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestDiverseSelectorRegression.cs @@ -10,13 +10,11 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.DiversityMeasure; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(BestDiverseSelectorRegression), typeof(BestDiverseSelectorRegression.Arguments), typeof(SignatureEnsembleSubModelSelector), BestDiverseSelectorRegression.UserName, BestDiverseSelectorRegression.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class BestDiverseSelectorRegression : BaseDiverseSelector, IRegressionSubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceRegressionSelector.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceRegressionSelector.cs index de6fe8874d..523c149d42 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceRegressionSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceRegressionSelector.cs @@ -9,12 +9,11 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(BestPerformanceRegressionSelector), typeof(BestPerformanceRegressionSelector.Arguments), typeof(SignatureEnsembleSubModelSelector), BestPerformanceRegressionSelector.UserName, BestPerformanceRegressionSelector.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class BestPerformanceRegressionSelector : BaseBestPerformanceSelector, IRegressionSubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelector.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelector.cs index f11b30556f..b13fffd49a 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelector.cs @@ -9,12 +9,11 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(BestPerformanceSelector), typeof(BestPerformanceSelector.Arguments), typeof(SignatureEnsembleSubModelSelector), BestPerformanceSelector.UserName, BestPerformanceSelector.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class BestPerformanceSelector : BaseBestPerformanceSelector, IBinarySubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelectorMultiClass.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelectorMultiClass.cs index 34ce8719db..aae6525cf4 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelectorMultiClass.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/BestPerformanceSelectorMultiClass.cs @@ -9,12 +9,11 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Ensemble.SubModelSelector; [assembly: LoadableClass(typeof(BestPerformanceSelectorMultiClass), typeof(BestPerformanceSelectorMultiClass.Arguments), typeof(SignatureEnsembleSubModelSelector), BestPerformanceSelectorMultiClass.UserName, BestPerformanceSelectorMultiClass.LoadName)] -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal sealed class BestPerformanceSelectorMultiClass : BaseBestPerformanceSelector>, IMulticlassSubModelSelector { diff --git a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/SubModelDataSelector.cs b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/SubModelDataSelector.cs index ff8dd74354..29d5bec6a4 100644 --- a/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/SubModelDataSelector.cs +++ b/src/Microsoft.ML.Ensemble/Selector/SubModelSelector/SubModelDataSelector.cs @@ -6,7 +6,7 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Internal.Internallearn; -namespace Microsoft.ML.Trainers.Ensemble.SubModelSelector +namespace Microsoft.ML.Trainers.Ensemble { internal abstract class SubModelDataSelector : BaseSubModelSelector { From 317ac60f5f2a91c5297f48a28fa9ae0848d8b185 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Mon, 25 Feb 2019 14:27:14 -0800 Subject: [PATCH 2/7] Microsoft.ML.EntryPoints.JsonUtils -> Microsoft.ML.EntryPoints and Microsoft.ML.FactorizationMachine -> Microsoft.ML.Trainers.FactorizationMachine --- src/Microsoft.ML.Data/EntryPoints/EntryPointNode.cs | 2 -- src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs | 2 +- .../JsonUtils/ExecuteGraphCommand.cs | 4 ++-- src/Microsoft.ML.EntryPoints/JsonUtils/GraphRunner.cs | 2 +- src/Microsoft.ML.EntryPoints/JsonUtils/JsonManifestUtils.cs | 2 +- .../FactorizationMachine/FactorizationMachineCatalog.cs | 3 +-- .../FactorizationMachine/FactorizationMachineInterface.cs | 2 +- .../FactorizationMachine/FactorizationMachineTrainer.cs | 5 ++--- .../FieldAwareFactorizationMachineModelParameters.cs | 4 ++-- .../FieldAwareFactorizationMachineUtils.cs | 2 +- src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs | 2 +- test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs | 1 - test/Microsoft.ML.StaticPipelineTesting/Training.cs | 2 +- test/Microsoft.ML.Tests/TextLoaderTests.cs | 1 - test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs | 2 +- 15 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/Microsoft.ML.Data/EntryPoints/EntryPointNode.cs b/src/Microsoft.ML.Data/EntryPoints/EntryPointNode.cs index 6b9a1bfa44..f294bb3452 100644 --- a/src/Microsoft.ML.Data/EntryPoints/EntryPointNode.cs +++ b/src/Microsoft.ML.Data/EntryPoints/EntryPointNode.cs @@ -8,8 +8,6 @@ using System.Linq; using System.Text.RegularExpressions; using Microsoft.Data.DataView; -using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints.JsonUtils; using Microsoft.ML.Internal.Utilities; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs b/src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs index 893e949283..ea3e4b7750 100644 --- a/src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs +++ b/src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs @@ -11,7 +11,7 @@ using Microsoft.ML.Internal.Utilities; using Newtonsoft.Json.Linq; -namespace Microsoft.ML.EntryPoints.JsonUtils +namespace Microsoft.ML.EntryPoints { /// /// The class that creates and wraps around an instance of an input object and gradually populates all fields, keeping track of missing diff --git a/src/Microsoft.ML.EntryPoints/JsonUtils/ExecuteGraphCommand.cs b/src/Microsoft.ML.EntryPoints/JsonUtils/ExecuteGraphCommand.cs index 0b026042f7..169db8e86e 100644 --- a/src/Microsoft.ML.EntryPoints/JsonUtils/ExecuteGraphCommand.cs +++ b/src/Microsoft.ML.EntryPoints/JsonUtils/ExecuteGraphCommand.cs @@ -10,7 +10,7 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; -using Microsoft.ML.EntryPoints.JsonUtils; +using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -18,7 +18,7 @@ [assembly: LoadableClass(typeof(ExecuteGraphCommand), typeof(ExecuteGraphCommand.Arguments), typeof(SignatureCommand), "", "ExecGraph")] -namespace Microsoft.ML.EntryPoints.JsonUtils +namespace Microsoft.ML.EntryPoints { internal sealed class ExecuteGraphCommand : ICommand { diff --git a/src/Microsoft.ML.EntryPoints/JsonUtils/GraphRunner.cs b/src/Microsoft.ML.EntryPoints/JsonUtils/GraphRunner.cs index 201cd6cc3f..1841a7f332 100644 --- a/src/Microsoft.ML.EntryPoints/JsonUtils/GraphRunner.cs +++ b/src/Microsoft.ML.EntryPoints/JsonUtils/GraphRunner.cs @@ -5,7 +5,7 @@ using System.Linq; using Newtonsoft.Json.Linq; -namespace Microsoft.ML.EntryPoints.JsonUtils +namespace Microsoft.ML.EntryPoints { /// /// This class runs a graph of entry points with the specified inputs, and produces the specified outputs. diff --git a/src/Microsoft.ML.EntryPoints/JsonUtils/JsonManifestUtils.cs b/src/Microsoft.ML.EntryPoints/JsonUtils/JsonManifestUtils.cs index 221dcd7883..4c32d23bfa 100644 --- a/src/Microsoft.ML.EntryPoints/JsonUtils/JsonManifestUtils.cs +++ b/src/Microsoft.ML.EntryPoints/JsonUtils/JsonManifestUtils.cs @@ -10,7 +10,7 @@ using Microsoft.ML.Internal.Utilities; using Newtonsoft.Json.Linq; -namespace Microsoft.ML.EntryPoints.JsonUtils +namespace Microsoft.ML.EntryPoints { /// /// Utilities to generate JSON manifests for entry points and other components. diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs index eb717898dd..f493f84cf5 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Microsoft.ML.Data; -using Microsoft.ML.FactorizationMachine; +using Microsoft.ML.Trainers.FactorizationMachine; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs index a850c90ff2..43c72e6b6b 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs @@ -6,7 +6,7 @@ using System.Security; using Microsoft.ML.Internal.CpuMath; -namespace Microsoft.ML.FactorizationMachine +namespace Microsoft.ML.Trainers.FactorizationMachine { internal static unsafe class FieldAwareFactorizationMachineInterface { diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs index 9d4040d94a..1f10456456 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs @@ -10,10 +10,9 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.FactorizationMachine; using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Trainers; +using Microsoft.ML.Trainers.FactorizationMachine; [assembly: LoadableClass(FieldAwareFactorizationMachineTrainer.Summary, typeof(FieldAwareFactorizationMachineTrainer), typeof(FieldAwareFactorizationMachineTrainer.Options), new[] { typeof(SignatureBinaryClassifierTrainer), typeof(SignatureTrainer) } @@ -22,7 +21,7 @@ [assembly: LoadableClass(typeof(void), typeof(FieldAwareFactorizationMachineTrainer), null, typeof(SignatureEntryPointModule), FieldAwareFactorizationMachineTrainer.LoadName)] -namespace Microsoft.ML.FactorizationMachine +namespace Microsoft.ML.Trainers.FactorizationMachine { /* Train a field-aware factorization machine using ADAGRAD (an advanced stochastic gradient method). See references below diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs index 78000c948d..e0cee3498a 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs @@ -8,18 +8,18 @@ using Microsoft.ML; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; -using Microsoft.ML.FactorizationMachine; using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; +using Microsoft.ML.Trainers.FactorizationMachine; [assembly: LoadableClass(typeof(FieldAwareFactorizationMachineModelParameters), null, typeof(SignatureLoadModel), "Field Aware Factorization Machine", FieldAwareFactorizationMachineModelParameters.LoaderSignature)] [assembly: LoadableClass(typeof(FieldAwareFactorizationMachinePredictionTransformer), typeof(FieldAwareFactorizationMachinePredictionTransformer), null, typeof(SignatureLoadModel), "", FieldAwareFactorizationMachinePredictionTransformer.LoaderSignature)] -namespace Microsoft.ML.FactorizationMachine +namespace Microsoft.ML.Trainers.FactorizationMachine { public sealed class FieldAwareFactorizationMachineModelParameters : ModelParametersBase, ISchemaBindableMapper { diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs index dcd12c2f33..ec1682ba0f 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs @@ -10,7 +10,7 @@ using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Utilities; -namespace Microsoft.ML.FactorizationMachine +namespace Microsoft.ML.Trainers.FactorizationMachine { internal sealed class FieldAwareFactorizationMachineUtils { diff --git a/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs b/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs index 160eb7ae0a..647e55e8ed 100644 --- a/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs +++ b/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Linq; using Microsoft.ML.Data; -using Microsoft.ML.FactorizationMachine; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.StaticPipe.Runtime; +using Microsoft.ML.Trainers.FactorizationMachine; namespace Microsoft.ML.StaticPipe { diff --git a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs index e549b3082b..4223030b3a 100644 --- a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs +++ b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs @@ -12,7 +12,6 @@ using Microsoft.ML.Data; using Microsoft.ML.Data.IO; using Microsoft.ML.EntryPoints; -using Microsoft.ML.EntryPoints.JsonUtils; using Microsoft.ML.ImageAnalytics; using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; diff --git a/test/Microsoft.ML.StaticPipelineTesting/Training.cs b/test/Microsoft.ML.StaticPipelineTesting/Training.cs index e629d631ef..22a9a1a8f1 100644 --- a/test/Microsoft.ML.StaticPipelineTesting/Training.cs +++ b/test/Microsoft.ML.StaticPipelineTesting/Training.cs @@ -7,7 +7,6 @@ using Microsoft.Data.DataView; using Microsoft.ML; using Microsoft.ML.Data; -using Microsoft.ML.FactorizationMachine; using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.LightGBM; @@ -16,6 +15,7 @@ using Microsoft.ML.StaticPipe; using Microsoft.ML.TestFramework.Attributes; using Microsoft.ML.Trainers; +using Microsoft.ML.Trainers.FactorizationMachine; using Microsoft.ML.Trainers.FastTree; using Microsoft.ML.Trainers.KMeans; using Microsoft.ML.Trainers.Recommender; diff --git a/test/Microsoft.ML.Tests/TextLoaderTests.cs b/test/Microsoft.ML.Tests/TextLoaderTests.cs index 85e2e8bcd5..c992fa579d 100644 --- a/test/Microsoft.ML.Tests/TextLoaderTests.cs +++ b/test/Microsoft.ML.Tests/TextLoaderTests.cs @@ -7,7 +7,6 @@ using System.IO; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints.JsonUtils; using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.TestFramework; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs b/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs index c93c4315cb..144e603c9b 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.FactorizationMachine; using Microsoft.ML.RunTests; using Microsoft.ML.SamplesUtils; +using Microsoft.ML.Trainers.FactorizationMachine; using Xunit; namespace Microsoft.ML.Tests.TrainerEstimators From 8c580ea4f99187389ffa256b891b356a2f209491 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Mon, 25 Feb 2019 14:39:44 -0800 Subject: [PATCH 3/7] Microsoft.ML.ImageAnalytics.EntryPoints -> Microsoft.ML.ImageAnalytics Microsoft.ML.Internal.Calibration -> Microsoft.Ml.Calibrator --- src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs | 2 +- src/Microsoft.ML.Data/Commands/TrainCommand.cs | 2 +- src/Microsoft.ML.Data/Commands/TrainTestCommand.cs | 2 +- src/Microsoft.ML.Data/Dirty/IniFileUtils.cs | 2 +- src/Microsoft.ML.Data/EntryPoints/InputBase.cs | 2 +- src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs | 1 - src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs | 1 - src/Microsoft.ML.Data/Prediction/Calibrator.cs | 3 +-- src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs | 1 - src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs | 2 +- src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs | 2 +- src/Microsoft.ML.Ensemble/PipelineEnsemble.cs | 2 +- src/Microsoft.ML.FastTree/FastTreeClassification.cs | 1 - src/Microsoft.ML.FastTree/GamClassification.cs | 1 - src/Microsoft.ML.FastTree/GamModelParameters.cs | 1 - src/Microsoft.ML.FastTree/RandomForestClassification.cs | 1 - .../TreeEnsemble/TreeEnsembleCombiner.cs | 2 +- src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs | 2 +- src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs | 1 - src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs | 2 +- src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs | 4 ++-- .../LightGbmStaticExtensions.cs | 4 +--- src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs | 1 - src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs | 2 +- .../Standard/LinearModelParameters.cs | 1 - .../Standard/LinearPredictorUtils.cs | 2 +- .../Standard/LogisticRegression/LogisticRegression.cs | 2 +- .../Standard/MultiClass/MetaMulticlassTrainer.cs | 2 +- src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs | 2 +- src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs | 2 +- .../Standard/Online/AveragedPerceptron.cs | 2 +- .../Standard/Online/LinearSvm.cs | 2 +- .../Standard/Online/OnlineLinear.cs | 2 -- src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs | 2 +- .../Standard/StochasticTrainerBase.cs | 3 +-- src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs | 1 - src/Microsoft.ML.StaticPipe/LbfgsStatic.cs | 4 +--- src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs | 2 +- src/Microsoft.ML.StaticPipe/SgdStatic.cs | 4 +--- src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs | 4 +--- .../KMeansAndLogisticRegressionBench.cs | 2 +- test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs | 2 +- test/Microsoft.ML.StaticPipelineTesting/Training.cs | 2 +- .../Scenarios/Api/Estimators/IntrospectiveTraining.cs | 2 +- test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs | 2 +- 45 files changed, 34 insertions(+), 57 deletions(-) diff --git a/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs b/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs index ea9d2571ad..377a269d19 100644 --- a/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs +++ b/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs @@ -9,10 +9,10 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Conversions; diff --git a/src/Microsoft.ML.Data/Commands/TrainCommand.cs b/src/Microsoft.ML.Data/Commands/TrainCommand.cs index 7b0353a382..950f6c3b7c 100644 --- a/src/Microsoft.ML.Data/Commands/TrainCommand.cs +++ b/src/Microsoft.ML.Data/Commands/TrainCommand.cs @@ -8,11 +8,11 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; using Microsoft.ML.Transforms.Normalizers; diff --git a/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs b/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs index b1343cb494..fb2045bcce 100644 --- a/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs +++ b/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs @@ -6,10 +6,10 @@ using System.IO; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs b/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs index f704aca7a0..79c72fb95d 100644 --- a/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs +++ b/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs @@ -4,7 +4,7 @@ using System.Text; using System.Text.RegularExpressions; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; namespace Microsoft.ML.Internal.Utilities { diff --git a/src/Microsoft.ML.Data/EntryPoints/InputBase.cs b/src/Microsoft.ML.Data/EntryPoints/InputBase.cs index 61f9246c0f..68cbfce146 100644 --- a/src/Microsoft.ML.Data/EntryPoints/InputBase.cs +++ b/src/Microsoft.ML.Data/EntryPoints/InputBase.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using Microsoft.Data.DataView; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; -using Microsoft.ML.Internal.Calibration; namespace Microsoft.ML.EntryPoints { diff --git a/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs b/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs index e6a44711ae..9dd23e3f23 100644 --- a/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs +++ b/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs @@ -9,7 +9,6 @@ using Microsoft.Data.DataView; using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs b/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs index 50f41990d6..718ebd0998 100644 --- a/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs +++ b/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs @@ -9,7 +9,6 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; [assembly: EntryPointModule(typeof(SummarizePredictor))] diff --git a/src/Microsoft.ML.Data/Prediction/Calibrator.cs b/src/Microsoft.ML.Data/Prediction/Calibrator.cs index dfabea33c5..2e00501138 100644 --- a/src/Microsoft.ML.Data/Prediction/Calibrator.cs +++ b/src/Microsoft.ML.Data/Prediction/Calibrator.cs @@ -14,7 +14,6 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; @@ -80,7 +79,7 @@ [assembly: EntryPointModule(typeof(PavCalibratorTrainerFactory))] [assembly: EntryPointModule(typeof(PlattCalibratorTrainerFactory))] -namespace Microsoft.ML.Internal.Calibration +namespace Microsoft.ML.Calibrator { /// /// Signature for the loaders of calibrators. diff --git a/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs b/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs index 8a6d55a7c1..8afe9c3c6e 100644 --- a/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs +++ b/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs @@ -8,7 +8,6 @@ using Microsoft.ML; using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Model; using Microsoft.ML.Trainers; diff --git a/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs b/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs index 26a4ac1cc8..8cab3003e7 100644 --- a/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs +++ b/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Model; using Microsoft.ML.Transforms; diff --git a/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs b/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs index 2bafa85a2f..b3f596fd30 100644 --- a/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs +++ b/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using Microsoft.Data.DataView; +using Microsoft.ML.Calibrator; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Trainers.Ensemble; [assembly: EntryPointModule(typeof(PipelineEnsemble))] diff --git a/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs b/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs index 0ee881eb9f..e0abfea103 100644 --- a/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs +++ b/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs @@ -9,9 +9,9 @@ using System.Text; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.FastTree/FastTreeClassification.cs b/src/Microsoft.ML.FastTree/FastTreeClassification.cs index cd33735d19..83715cbb6e 100644 --- a/src/Microsoft.ML.FastTree/FastTreeClassification.cs +++ b/src/Microsoft.ML.FastTree/FastTreeClassification.cs @@ -10,7 +10,6 @@ using Microsoft.ML.Calibrator; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Model; using Microsoft.ML.Trainers.FastTree; diff --git a/src/Microsoft.ML.FastTree/GamClassification.cs b/src/Microsoft.ML.FastTree/GamClassification.cs index 2e1cb527a1..e5152be7f1 100644 --- a/src/Microsoft.ML.FastTree/GamClassification.cs +++ b/src/Microsoft.ML.FastTree/GamClassification.cs @@ -9,7 +9,6 @@ using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Model; using Microsoft.ML.Trainers.FastTree; diff --git a/src/Microsoft.ML.FastTree/GamModelParameters.cs b/src/Microsoft.ML.FastTree/GamModelParameters.cs index 9f33802fa1..0f18fd8b05 100644 --- a/src/Microsoft.ML.FastTree/GamModelParameters.cs +++ b/src/Microsoft.ML.FastTree/GamModelParameters.cs @@ -13,7 +13,6 @@ using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.FastTree/RandomForestClassification.cs b/src/Microsoft.ML.FastTree/RandomForestClassification.cs index 894dc16239..82250ff48c 100644 --- a/src/Microsoft.ML.FastTree/RandomForestClassification.cs +++ b/src/Microsoft.ML.FastTree/RandomForestClassification.cs @@ -10,7 +10,6 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Model; using Microsoft.ML.Trainers.FastTree; diff --git a/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs b/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs index fee386fba0..1bb43ccfb8 100644 --- a/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs +++ b/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Trainers.FastTree; [assembly: LoadableClass(typeof(TreeEnsembleCombiner), null, typeof(SignatureModelCombiner), "Fast Tree Model Combiner", "FastTreeCombiner")] diff --git a/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs b/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs index 6d4a4614b3..00c70a4117 100644 --- a/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs +++ b/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs @@ -8,11 +8,11 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; using Microsoft.ML.Trainers.FastTree; diff --git a/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs b/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs index a9400739dd..aa61a9ac22 100644 --- a/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs +++ b/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs @@ -5,7 +5,6 @@ using System.Text; using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Utilities; namespace Microsoft.ML.Trainers.FastTree diff --git a/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs b/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs index 97829297a7..e76829efcb 100644 --- a/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs +++ b/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs @@ -8,11 +8,11 @@ using System.Security; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Trainers.HalLearners; diff --git a/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs b/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs index f5404445f4..16e6bbdfed 100644 --- a/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs +++ b/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs @@ -4,10 +4,10 @@ using Microsoft.ML; using Microsoft.ML.EntryPoints; -using Microsoft.ML.ImageAnalytics.EntryPoints; +using Microsoft.ML.ImageAnalytics; [assembly: LoadableClass(typeof(void), typeof(ImageAnalytics), null, typeof(SignatureEntryPointModule), "ImageAnalytics")] -namespace Microsoft.ML.ImageAnalytics.EntryPoints +namespace Microsoft.ML.ImageAnalytics { internal static class ImageAnalytics { diff --git a/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs b/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs index eea71d7bc5..2703070eca 100644 --- a/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs +++ b/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs @@ -3,9 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.StaticPipe; using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; diff --git a/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs b/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs index a778a00fd5..d19fb4442b 100644 --- a/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs +++ b/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs @@ -7,7 +7,6 @@ using Microsoft.ML.Calibrator; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.LightGBM; using Microsoft.ML.Model; using Microsoft.ML.Trainers; diff --git a/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs b/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs index 8fdce0951f..255aa44840 100644 --- a/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs +++ b/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs @@ -6,9 +6,9 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.LightGBM; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.FastTree; diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs b/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs index 8c346a20ed..3791836ff6 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs @@ -11,7 +11,6 @@ using Microsoft.ML; using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs b/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs index 4da0b7688c..36129d50c1 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs @@ -8,8 +8,8 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; +using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Utilities; using Float = System.Single; diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs index 33efe385df..1c884aa2c2 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs @@ -6,10 +6,10 @@ using System.Collections.Generic; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Numeric; diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs index 4c8cb4e39b..008dbb1376 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Data.DataView; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Online; diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs index fcfd663e2c..fa53c68c40 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs @@ -10,10 +10,10 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs index 95725e3f92..4ba9c40ae5 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs @@ -7,8 +7,8 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs index 0644cd07ad..370683500c 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs @@ -5,10 +5,10 @@ using System; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Numeric; using Microsoft.ML.Trainers.Online; diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs index 9a597aa295..4070ce1ad3 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs @@ -5,10 +5,10 @@ using System; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Numeric; diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs index c3c59b4793..fc8cd3914d 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs @@ -8,11 +8,9 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Numeric; -using Microsoft.ML.Trainers; namespace Microsoft.ML.Trainers.Online { diff --git a/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs b/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs index 4476416c9f..974c0db5e3 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs @@ -9,11 +9,11 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; +using Microsoft.ML.Calibrator; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; diff --git a/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs b/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs index 6edf803b2c..7724b5a19a 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs @@ -4,9 +4,8 @@ using System; using Microsoft.Data.DataView; +using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; -using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; namespace Microsoft.ML.Trainers diff --git a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs index bed46c174b..f2830a1dfb 100644 --- a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs +++ b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs @@ -4,7 +4,6 @@ using Microsoft.ML.Calibrator; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.Online; diff --git a/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs b/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs index 82d6df6fbd..8a55929794 100644 --- a/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs +++ b/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs @@ -3,9 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; diff --git a/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs index dd131ba384..4016940baa 100644 --- a/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; diff --git a/src/Microsoft.ML.StaticPipe/SgdStatic.cs b/src/Microsoft.ML.StaticPipe/SgdStatic.cs index f893320366..d4bc494798 100644 --- a/src/Microsoft.ML.StaticPipe/SgdStatic.cs +++ b/src/Microsoft.ML.StaticPipe/SgdStatic.cs @@ -3,9 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; diff --git a/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs b/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs index e5289e0d98..bbed45cc85 100644 --- a/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs +++ b/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs @@ -3,9 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers.FastTree; diff --git a/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs b/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs index 1dbc74c9d0..f89b958320 100644 --- a/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs +++ b/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs @@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.ML.Benchmarks.Harness; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; diff --git a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs index 4223030b3a..d9bbbecfac 100644 --- a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs +++ b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs @@ -13,7 +13,7 @@ using Microsoft.ML.Data.IO; using Microsoft.ML.EntryPoints; using Microsoft.ML.ImageAnalytics; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.LightGBM; diff --git a/test/Microsoft.ML.StaticPipelineTesting/Training.cs b/test/Microsoft.ML.StaticPipelineTesting/Training.cs index 22a9a1a8f1..cec8d24d88 100644 --- a/test/Microsoft.ML.StaticPipelineTesting/Training.cs +++ b/test/Microsoft.ML.StaticPipelineTesting/Training.cs @@ -7,7 +7,7 @@ using Microsoft.Data.DataView; using Microsoft.ML; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.LightGBM; using Microsoft.ML.LightGBM.StaticPipe; diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs index a8302eeaf9..6012abfa74 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.RunTests; using Microsoft.ML.SamplesUtils; using Microsoft.ML.Trainers; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs b/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs index b28234dd8b..0a15eae5b5 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs @@ -4,7 +4,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Internal.Calibration; +using Microsoft.ML.Calibrator; using Microsoft.ML.Trainers; using Xunit; From 12ab0369cc66e98c12a6d77ed6c75e05288b3e74 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Mon, 25 Feb 2019 15:45:10 -0800 Subject: [PATCH 4/7] Microsoft.ML.StaticPipe.Runtime -> Microsoft.ML.StaticPipe --- .../Trainers/BinaryClassification/AveragedPerceptron.cs | 4 +--- src/Microsoft.ML.Data/DataLoadSave/Binary/UnsafeTypeOps.cs | 1 - .../VectorWhiteningStaticExtensions.cs | 1 - .../LightGbmStaticExtensions.cs | 1 - .../DnnImageFeaturizerStaticExtensions.cs | 1 - .../OnnxStaticExtensions.cs | 1 - .../CategoricalHashStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/DataReader.cs | 1 - src/Microsoft.ML.StaticPipe/DataReaderEstimator.cs | 1 - src/Microsoft.ML.StaticPipe/DataView.cs | 1 - src/Microsoft.ML.StaticPipe/Estimator.cs | 1 - src/Microsoft.ML.StaticPipe/EvaluatorStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs | 1 - src/Microsoft.ML.StaticPipe/ImageTransformsStatic.cs | 1 - src/Microsoft.ML.StaticPipe/KMeansStatic.cs | 3 --- src/Microsoft.ML.StaticPipe/LbfgsStatic.cs | 1 - src/Microsoft.ML.StaticPipe/LdaStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/MatrixFactorizationStatic.cs | 1 - src/Microsoft.ML.StaticPipe/MultiClassNaiveBayesStatic.cs | 1 - src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs | 1 - src/Microsoft.ML.StaticPipe/PipelineColumn.cs | 1 - src/Microsoft.ML.StaticPipe/Reconciler.cs | 2 +- src/Microsoft.ML.StaticPipe/SchemaAssertionContext.cs | 2 +- src/Microsoft.ML.StaticPipe/SchemaBearing.cs | 1 - src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/SgdStatic.cs | 1 - src/Microsoft.ML.StaticPipe/StaticPipeExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/StaticPipeInternalUtils.cs | 2 +- src/Microsoft.ML.StaticPipe/StaticPipeUtils.cs | 2 +- src/Microsoft.ML.StaticPipe/StaticSchemaShape.cs | 2 +- src/Microsoft.ML.StaticPipe/TextLoaderStatic.cs | 1 - src/Microsoft.ML.StaticPipe/TextStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/TrainerEstimatorReconciler.cs | 2 +- src/Microsoft.ML.StaticPipe/TrainingStaticExtensions.cs | 1 - src/Microsoft.ML.StaticPipe/Transformer.cs | 1 - src/Microsoft.ML.StaticPipe/TransformsStatic.cs | 1 - src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs | 1 - src/Microsoft.ML.StaticPipe/WordEmbeddingsStaticExtensions.cs | 1 - .../TensorFlowStaticExtensions.cs | 1 - src/Microsoft.ML.TimeSeries.StaticPipe/TimeSeriesStatic.cs | 1 - test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs | 2 +- test/Microsoft.ML.StaticPipelineTesting/StaticPipeFakes.cs | 1 - 45 files changed, 8 insertions(+), 49 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptron.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptron.cs index 8da2982ecb..e9702a8e5a 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptron.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptron.cs @@ -1,6 +1,4 @@ -using Microsoft.ML; - -namespace Microsoft.ML.Samples.Dynamic.Trainers.BinaryClassification +namespace Microsoft.ML.Samples.Dynamic.Trainers.BinaryClassification { public static class AveragedPerceptron { diff --git a/src/Microsoft.ML.Data/DataLoadSave/Binary/UnsafeTypeOps.cs b/src/Microsoft.ML.Data/DataLoadSave/Binary/UnsafeTypeOps.cs index 09992e3c30..532719736a 100644 --- a/src/Microsoft.ML.Data/DataLoadSave/Binary/UnsafeTypeOps.cs +++ b/src/Microsoft.ML.Data/DataLoadSave/Binary/UnsafeTypeOps.cs @@ -7,7 +7,6 @@ using System.IO; using System.Runtime.InteropServices; using Microsoft.Data.DataView; -using Microsoft.ML.Data; namespace Microsoft.ML.Internal.Internallearn { diff --git a/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs b/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs index 70727ff4bb..1ae13704e0 100644 --- a/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs +++ b/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Microsoft.ML.StaticPipe; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Projections; namespace Microsoft.ML.HalLearners.StaticPipe diff --git a/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs b/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs index 2703070eca..a1c984c9d8 100644 --- a/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs +++ b/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs @@ -5,7 +5,6 @@ using System; using Microsoft.ML.Calibrator; using Microsoft.ML.StaticPipe; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; namespace Microsoft.ML.LightGBM.StaticPipe diff --git a/src/Microsoft.ML.OnnxTransformer.StaticPipe/DnnImageFeaturizerStaticExtensions.cs b/src/Microsoft.ML.OnnxTransformer.StaticPipe/DnnImageFeaturizerStaticExtensions.cs index 4120e17a76..e6ae20850e 100644 --- a/src/Microsoft.ML.OnnxTransformer.StaticPipe/DnnImageFeaturizerStaticExtensions.cs +++ b/src/Microsoft.ML.OnnxTransformer.StaticPipe/DnnImageFeaturizerStaticExtensions.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using Microsoft.ML.Data; using Microsoft.ML.StaticPipe; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.Transforms.StaticPipe { diff --git a/src/Microsoft.ML.OnnxTransformer.StaticPipe/OnnxStaticExtensions.cs b/src/Microsoft.ML.OnnxTransformer.StaticPipe/OnnxStaticExtensions.cs index 619aac63c3..319ed380a6 100644 --- a/src/Microsoft.ML.OnnxTransformer.StaticPipe/OnnxStaticExtensions.cs +++ b/src/Microsoft.ML.OnnxTransformer.StaticPipe/OnnxStaticExtensions.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Microsoft.ML.StaticPipe; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.Transforms.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs index 7b7b7c5c8a..c4e54be4f0 100644 --- a/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Categorical; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs index 11ccbbb6a5..2e12179687 100644 --- a/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Categorical; using Microsoft.ML.Transforms.Conversions; using static Microsoft.ML.StaticPipe.TermStaticExtensions; diff --git a/src/Microsoft.ML.StaticPipe/DataReader.cs b/src/Microsoft.ML.StaticPipe/DataReader.cs index c0d27da996..af55d456e6 100644 --- a/src/Microsoft.ML.StaticPipe/DataReader.cs +++ b/src/Microsoft.ML.StaticPipe/DataReader.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/DataReaderEstimator.cs b/src/Microsoft.ML.StaticPipe/DataReaderEstimator.cs index da7f941f1e..b0fed9e729 100644 --- a/src/Microsoft.ML.StaticPipe/DataReaderEstimator.cs +++ b/src/Microsoft.ML.StaticPipe/DataReaderEstimator.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/DataView.cs b/src/Microsoft.ML.StaticPipe/DataView.cs index dcba505a51..6e03a029ae 100644 --- a/src/Microsoft.ML.StaticPipe/DataView.cs +++ b/src/Microsoft.ML.StaticPipe/DataView.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/Estimator.cs b/src/Microsoft.ML.StaticPipe/Estimator.cs index 0fd8a3dda4..792722325f 100644 --- a/src/Microsoft.ML.StaticPipe/Estimator.cs +++ b/src/Microsoft.ML.StaticPipe/Estimator.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/EvaluatorStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/EvaluatorStaticExtensions.cs index b643d30f07..9feebaaf29 100644 --- a/src/Microsoft.ML.StaticPipe/EvaluatorStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/EvaluatorStaticExtensions.cs @@ -4,7 +4,6 @@ using System; using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs b/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs index 647e55e8ed..f0d80ddd9a 100644 --- a/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs +++ b/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers.FactorizationMachine; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/ImageTransformsStatic.cs b/src/Microsoft.ML.StaticPipe/ImageTransformsStatic.cs index 13c9a81dc3..5814aa1618 100644 --- a/src/Microsoft.ML.StaticPipe/ImageTransformsStatic.cs +++ b/src/Microsoft.ML.StaticPipe/ImageTransformsStatic.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Drawing; using Microsoft.ML.ImageAnalytics; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/KMeansStatic.cs b/src/Microsoft.ML.StaticPipe/KMeansStatic.cs index 32128a2c27..0b46f49385 100644 --- a/src/Microsoft.ML.StaticPipe/KMeansStatic.cs +++ b/src/Microsoft.ML.StaticPipe/KMeansStatic.cs @@ -3,9 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers.KMeans; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs b/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs index 8a55929794..e8655b8e19 100644 --- a/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs +++ b/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs @@ -4,7 +4,6 @@ using System; using Microsoft.ML.Calibrator; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/LdaStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/LdaStaticExtensions.cs index 7bd3033885..59219c74a4 100644 --- a/src/Microsoft.ML.StaticPipe/LdaStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/LdaStaticExtensions.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Text; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs index 816f9fe322..dc774b06e6 100644 --- a/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Projections; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/MatrixFactorizationStatic.cs b/src/Microsoft.ML.StaticPipe/MatrixFactorizationStatic.cs index 62caeb6f46..540d42e373 100644 --- a/src/Microsoft.ML.StaticPipe/MatrixFactorizationStatic.cs +++ b/src/Microsoft.ML.StaticPipe/MatrixFactorizationStatic.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.Recommender; diff --git a/src/Microsoft.ML.StaticPipe/MultiClassNaiveBayesStatic.cs b/src/Microsoft.ML.StaticPipe/MultiClassNaiveBayesStatic.cs index 4d687cab3c..8ee7675062 100644 --- a/src/Microsoft.ML.StaticPipe/MultiClassNaiveBayesStatic.cs +++ b/src/Microsoft.ML.StaticPipe/MultiClassNaiveBayesStatic.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs index 35f2785a45..b3b3ed20a0 100644 --- a/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs @@ -7,7 +7,6 @@ using System.Collections.Immutable; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Normalizers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs b/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs index a80d6013af..02e961f914 100644 --- a/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs +++ b/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.Online; diff --git a/src/Microsoft.ML.StaticPipe/PipelineColumn.cs b/src/Microsoft.ML.StaticPipe/PipelineColumn.cs index 45d06365f6..01dab46469 100644 --- a/src/Microsoft.ML.StaticPipe/PipelineColumn.cs +++ b/src/Microsoft.ML.StaticPipe/PipelineColumn.cs @@ -4,7 +4,6 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/Reconciler.cs b/src/Microsoft.ML.StaticPipe/Reconciler.cs index 32acdb5d03..b49621b27a 100644 --- a/src/Microsoft.ML.StaticPipe/Reconciler.cs +++ b/src/Microsoft.ML.StaticPipe/Reconciler.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.ML.Transforms; -namespace Microsoft.ML.StaticPipe.Runtime +namespace Microsoft.ML.StaticPipe { /// /// An object for instances to indicate to the analysis code for static pipelines that diff --git a/src/Microsoft.ML.StaticPipe/SchemaAssertionContext.cs b/src/Microsoft.ML.StaticPipe/SchemaAssertionContext.cs index 929ea0ec91..e57e22a0b6 100644 --- a/src/Microsoft.ML.StaticPipe/SchemaAssertionContext.cs +++ b/src/Microsoft.ML.StaticPipe/SchemaAssertionContext.cs @@ -5,7 +5,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -namespace Microsoft.ML.StaticPipe.Runtime +namespace Microsoft.ML.StaticPipe { /// /// An object for declaring a schema-shape. This is mostly commonly used in situations where a user is diff --git a/src/Microsoft.ML.StaticPipe/SchemaBearing.cs b/src/Microsoft.ML.StaticPipe/SchemaBearing.cs index ce382df6a8..1b91efbdd8 100644 --- a/src/Microsoft.ML.StaticPipe/SchemaBearing.cs +++ b/src/Microsoft.ML.StaticPipe/SchemaBearing.cs @@ -4,7 +4,6 @@ using System.Threading; using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs index 4016940baa..b143758e63 100644 --- a/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs @@ -4,7 +4,6 @@ using System; using Microsoft.ML.Calibrator; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/SgdStatic.cs b/src/Microsoft.ML.StaticPipe/SgdStatic.cs index d4bc494798..caa0168bde 100644 --- a/src/Microsoft.ML.StaticPipe/SgdStatic.cs +++ b/src/Microsoft.ML.StaticPipe/SgdStatic.cs @@ -4,7 +4,6 @@ using System; using Microsoft.ML.Calibrator; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/StaticPipeExtensions.cs b/src/Microsoft.ML.StaticPipe/StaticPipeExtensions.cs index 6ebf6014a4..f3c4583ec7 100644 --- a/src/Microsoft.ML.StaticPipe/StaticPipeExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/StaticPipeExtensions.cs @@ -4,7 +4,6 @@ using System; using Microsoft.Data.DataView; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/StaticPipeInternalUtils.cs b/src/Microsoft.ML.StaticPipe/StaticPipeInternalUtils.cs index 6a2e41a030..269f6adc36 100644 --- a/src/Microsoft.ML.StaticPipe/StaticPipeInternalUtils.cs +++ b/src/Microsoft.ML.StaticPipe/StaticPipeInternalUtils.cs @@ -9,7 +9,7 @@ using System.Runtime.CompilerServices; using Microsoft.ML.Internal.Utilities; -namespace Microsoft.ML.StaticPipe.Runtime +namespace Microsoft.ML.StaticPipe { /// /// Utility functions useful for the internal implementations of the key pipeline utilities. diff --git a/src/Microsoft.ML.StaticPipe/StaticPipeUtils.cs b/src/Microsoft.ML.StaticPipe/StaticPipeUtils.cs index 959275990c..a7b4063256 100644 --- a/src/Microsoft.ML.StaticPipe/StaticPipeUtils.cs +++ b/src/Microsoft.ML.StaticPipe/StaticPipeUtils.cs @@ -9,7 +9,7 @@ using Microsoft.ML; using Microsoft.ML.Transforms; -namespace Microsoft.ML.StaticPipe.Runtime +namespace Microsoft.ML.StaticPipe { /// /// Utility methods for components that want to expose themselves in the idioms of the statically-typed pipelines. diff --git a/src/Microsoft.ML.StaticPipe/StaticSchemaShape.cs b/src/Microsoft.ML.StaticPipe/StaticSchemaShape.cs index 5f5ffd660c..b05024be59 100644 --- a/src/Microsoft.ML.StaticPipe/StaticSchemaShape.cs +++ b/src/Microsoft.ML.StaticPipe/StaticSchemaShape.cs @@ -8,7 +8,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -namespace Microsoft.ML.StaticPipe.Runtime +namespace Microsoft.ML.StaticPipe { /// /// A schema shape with names corresponding to a type parameter in one of the typed variants diff --git a/src/Microsoft.ML.StaticPipe/TextLoaderStatic.cs b/src/Microsoft.ML.StaticPipe/TextLoaderStatic.cs index b27a1ddd58..0d587be772 100644 --- a/src/Microsoft.ML.StaticPipe/TextLoaderStatic.cs +++ b/src/Microsoft.ML.StaticPipe/TextLoaderStatic.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/TextStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/TextStaticExtensions.cs index 30abd133b1..1a04a24d5b 100644 --- a/src/Microsoft.ML.StaticPipe/TextStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/TextStaticExtensions.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Text; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/TrainerEstimatorReconciler.cs b/src/Microsoft.ML.StaticPipe/TrainerEstimatorReconciler.cs index 2dc647ebd7..5e230156b5 100644 --- a/src/Microsoft.ML.StaticPipe/TrainerEstimatorReconciler.cs +++ b/src/Microsoft.ML.StaticPipe/TrainerEstimatorReconciler.cs @@ -8,7 +8,7 @@ using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; -namespace Microsoft.ML.StaticPipe.Runtime +namespace Microsoft.ML.StaticPipe { /// /// General purpose reconciler for a typical case with trainers, where they accept some generally diff --git a/src/Microsoft.ML.StaticPipe/TrainingStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/TrainingStaticExtensions.cs index 5c13056c1a..577a4f22e4 100644 --- a/src/Microsoft.ML.StaticPipe/TrainingStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/TrainingStaticExtensions.cs @@ -5,7 +5,6 @@ using System; using System.Linq; using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/Transformer.cs b/src/Microsoft.ML.StaticPipe/Transformer.cs index e2429ea241..df9ee2ff89 100644 --- a/src/Microsoft.ML.StaticPipe/Transformer.cs +++ b/src/Microsoft.ML.StaticPipe/Transformer.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/TransformsStatic.cs b/src/Microsoft.ML.StaticPipe/TransformsStatic.cs index 69645722e7..ea26212742 100644 --- a/src/Microsoft.ML.StaticPipe/TransformsStatic.cs +++ b/src/Microsoft.ML.StaticPipe/TransformsStatic.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.Transforms.FeatureSelection; diff --git a/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs b/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs index bbed45cc85..02367b3f53 100644 --- a/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs +++ b/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs @@ -4,7 +4,6 @@ using System; using Microsoft.ML.Calibrator; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Trainers.FastTree; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/WordEmbeddingsStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/WordEmbeddingsStaticExtensions.cs index f1b59d30a7..a79c2de4d1 100644 --- a/src/Microsoft.ML.StaticPipe/WordEmbeddingsStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/WordEmbeddingsStaticExtensions.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.Text; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.TensorFlow.StaticPipe/TensorFlowStaticExtensions.cs b/src/Microsoft.ML.TensorFlow.StaticPipe/TensorFlowStaticExtensions.cs index fb5b9e10b9..b6e4bd9044 100644 --- a/src/Microsoft.ML.TensorFlow.StaticPipe/TensorFlowStaticExtensions.cs +++ b/src/Microsoft.ML.TensorFlow.StaticPipe/TensorFlowStaticExtensions.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Microsoft.ML.StaticPipe; -using Microsoft.ML.StaticPipe.Runtime; namespace Microsoft.ML.Transforms.StaticPipe { diff --git a/src/Microsoft.ML.TimeSeries.StaticPipe/TimeSeriesStatic.cs b/src/Microsoft.ML.TimeSeries.StaticPipe/TimeSeriesStatic.cs index 87b08837fe..9bb6114d90 100644 --- a/src/Microsoft.ML.TimeSeries.StaticPipe/TimeSeriesStatic.cs +++ b/src/Microsoft.ML.TimeSeries.StaticPipe/TimeSeriesStatic.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Microsoft.ML.StaticPipe.Runtime; using Microsoft.ML.Transforms.TimeSeries; namespace Microsoft.ML.StaticPipe diff --git a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs index d9bbbecfac..7e63cfe0ee 100644 --- a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs +++ b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs @@ -8,12 +8,12 @@ using System.Linq; using System.Text.RegularExpressions; using Microsoft.Data.DataView; +using Microsoft.ML.Calibrator; using Microsoft.ML.Core.Tests.UnitTests; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; using Microsoft.ML.EntryPoints; using Microsoft.ML.ImageAnalytics; -using Microsoft.ML.Calibrator; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.LightGBM; diff --git a/test/Microsoft.ML.StaticPipelineTesting/StaticPipeFakes.cs b/test/Microsoft.ML.StaticPipelineTesting/StaticPipeFakes.cs index 47b3bd52aa..58af21a082 100644 --- a/test/Microsoft.ML.StaticPipelineTesting/StaticPipeFakes.cs +++ b/test/Microsoft.ML.StaticPipelineTesting/StaticPipeFakes.cs @@ -8,7 +8,6 @@ using Microsoft.Data.DataView; using Microsoft.ML; using Microsoft.ML.StaticPipe; -using Microsoft.ML.StaticPipe.Runtime; // Holds some classes that superficially represent classes, at least sufficiently to give the idea of the // statically typed columnar estimator helper API. As more "real" examples of the static functions get From 0e365ded045a02bbc27c3656760c9e090fc1d919 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Tue, 26 Feb 2019 14:36:38 -0800 Subject: [PATCH 5/7] PR review comments + the following changes: Microsoft.ML.Calibrators namespace for calibrators Microsoft.ML.Data.Evaluators.Metrics -> Microsoft.ML.Data Microsoft.ML.FastTree --> Microsoft.ML.Trainers.FastTree ICanSaveModel, ModelSaveContext move from Microsoft.ML.Model to Microsoft.Ml --- src/Microsoft.ML.Core/Data/ModelLoadContext.cs | 3 ++- src/Microsoft.ML.Core/Data/ModelLoading.cs | 3 ++- src/Microsoft.ML.Core/Data/ModelSaveContext.cs | 3 ++- src/Microsoft.ML.Core/Data/ModelSaving.cs | 3 ++- src/Microsoft.ML.Core/Data/Repository.cs | 2 +- src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs | 2 +- src/Microsoft.ML.Data/Commands/TrainCommand.cs | 2 +- src/Microsoft.ML.Data/Commands/TrainTestCommand.cs | 2 +- src/Microsoft.ML.Data/Dirty/IniFileUtils.cs | 2 +- src/Microsoft.ML.Data/Dirty/PredictorInterfaces.cs | 2 +- src/Microsoft.ML.Data/EntryPoints/InputBase.cs | 2 +- src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs | 2 +- src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs | 2 +- .../Evaluators/AnomalyDetectionEvaluator.cs | 1 - .../Evaluators/Metrics/AnomalyDetectionMetrics.cs | 2 +- src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs | 2 +- src/Microsoft.ML.Data/Model/Pfa/ICanSavePfa.cs | 2 +- src/Microsoft.ML.Data/Prediction/Calibrator.cs | 4 ++-- src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs | 4 ++-- .../Prediction/IPredictionTransformer.cs | 2 +- src/Microsoft.ML.Data/TrainCatalog.cs | 1 - .../Transforms/TrainAndScoreTransformer.cs | 2 +- .../EntryPoints/PipelineEnsemble.cs | 2 +- src/Microsoft.ML.Ensemble/PipelineEnsemble.cs | 2 +- src/Microsoft.ML.FastTree/FastTree.cs | 9 +++------ src/Microsoft.ML.FastTree/FastTreeClassification.cs | 2 +- src/Microsoft.ML.FastTree/GamClassification.cs | 2 +- src/Microsoft.ML.FastTree/GamModelParameters.cs | 2 +- src/Microsoft.ML.FastTree/RandomForestClassification.cs | 2 +- src/Microsoft.ML.FastTree/RegressionTree.cs | 3 +-- src/Microsoft.ML.FastTree/TreeEnsemble.cs | 2 +- .../TreeEnsemble/TreeEnsembleCombiner.cs | 2 +- src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs | 6 +++--- src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs | 2 +- .../SymSgdClassificationTrainer.cs | 2 +- .../EntryPoints/ImageAnalytics.cs | 4 ++-- .../LightGbmStaticExtensions.cs | 2 +- src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs | 2 +- src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs | 2 +- .../Standard/LinearModelParameters.cs | 2 +- .../Standard/LinearPredictorUtils.cs | 2 +- .../Standard/LogisticRegression/LogisticRegression.cs | 2 +- .../Standard/MultiClass/MetaMulticlassTrainer.cs | 2 +- .../Standard/MultiClass/Ova.cs | 2 +- .../Standard/MultiClass/Pkpd.cs | 2 +- .../Standard/Online/AveragedPerceptron.cs | 2 +- .../Standard/Online/LinearSvm.cs | 2 +- src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs | 2 +- .../Standard/StochasticTrainerBase.cs | 2 +- .../StandardLearnersCatalog.cs | 2 +- src/Microsoft.ML.StaticPipe/LbfgsStatic.cs | 2 +- src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs | 2 +- src/Microsoft.ML.StaticPipe/SgdStatic.cs | 2 +- src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs | 2 +- 54 files changed, 63 insertions(+), 65 deletions(-) diff --git a/src/Microsoft.ML.Core/Data/ModelLoadContext.cs b/src/Microsoft.ML.Core/Data/ModelLoadContext.cs index 14a67234d9..3051be4185 100644 --- a/src/Microsoft.ML.Core/Data/ModelLoadContext.cs +++ b/src/Microsoft.ML.Core/Data/ModelLoadContext.cs @@ -6,8 +6,9 @@ using System.IO; using System.Text; using Microsoft.ML.Internal.Utilities; +using Microsoft.ML.Model; -namespace Microsoft.ML.Model +namespace Microsoft.ML { /// /// This is a convenience context object for loading models from a repository, for diff --git a/src/Microsoft.ML.Core/Data/ModelLoading.cs b/src/Microsoft.ML.Core/Data/ModelLoading.cs index eb72082d0b..380293d607 100644 --- a/src/Microsoft.ML.Core/Data/ModelLoading.cs +++ b/src/Microsoft.ML.Core/Data/ModelLoading.cs @@ -7,8 +7,9 @@ using System.Reflection; using System.Text; using Microsoft.ML.Internal.Utilities; +using Microsoft.ML.Model; -namespace Microsoft.ML.Model +namespace Microsoft.ML { /// /// Signature for a repository based model loader. This is the dual of . diff --git a/src/Microsoft.ML.Core/Data/ModelSaveContext.cs b/src/Microsoft.ML.Core/Data/ModelSaveContext.cs index 225007349f..436fbfeaa9 100644 --- a/src/Microsoft.ML.Core/Data/ModelSaveContext.cs +++ b/src/Microsoft.ML.Core/Data/ModelSaveContext.cs @@ -6,8 +6,9 @@ using System.IO; using System.Text; using Microsoft.ML.Internal.Utilities; +using Microsoft.ML.Model; -namespace Microsoft.ML.Model +namespace Microsoft.ML { /// /// This is a convenience context object for saving models to a repository, for diff --git a/src/Microsoft.ML.Core/Data/ModelSaving.cs b/src/Microsoft.ML.Core/Data/ModelSaving.cs index 745f07234b..1b2c6ea29e 100644 --- a/src/Microsoft.ML.Core/Data/ModelSaving.cs +++ b/src/Microsoft.ML.Core/Data/ModelSaving.cs @@ -5,8 +5,9 @@ using System; using System.IO; using System.Text; +using Microsoft.ML.Model; -namespace Microsoft.ML.Model +namespace Microsoft.ML { public sealed partial class ModelSaveContext : IDisposable { diff --git a/src/Microsoft.ML.Core/Data/Repository.cs b/src/Microsoft.ML.Core/Data/Repository.cs index da04378a52..a53314fc83 100644 --- a/src/Microsoft.ML.Core/Data/Repository.cs +++ b/src/Microsoft.ML.Core/Data/Repository.cs @@ -8,7 +8,7 @@ using System.IO.Compression; using Microsoft.ML.Internal.Utilities; -namespace Microsoft.ML.Model +namespace Microsoft.ML { /// /// For saving a model into a repository. diff --git a/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs b/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs index 377a269d19..dfac443599 100644 --- a/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs +++ b/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; diff --git a/src/Microsoft.ML.Data/Commands/TrainCommand.cs b/src/Microsoft.ML.Data/Commands/TrainCommand.cs index 950f6c3b7c..002dc7dd02 100644 --- a/src/Microsoft.ML.Data/Commands/TrainCommand.cs +++ b/src/Microsoft.ML.Data/Commands/TrainCommand.cs @@ -8,7 +8,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; diff --git a/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs b/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs index fb2045bcce..98b2d6099c 100644 --- a/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs +++ b/src/Microsoft.ML.Data/Commands/TrainTestCommand.cs @@ -6,7 +6,7 @@ using System.IO; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; diff --git a/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs b/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs index 79c72fb95d..30932bc3df 100644 --- a/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs +++ b/src/Microsoft.ML.Data/Dirty/IniFileUtils.cs @@ -4,7 +4,7 @@ using System.Text; using System.Text.RegularExpressions; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; namespace Microsoft.ML.Internal.Utilities { diff --git a/src/Microsoft.ML.Data/Dirty/PredictorInterfaces.cs b/src/Microsoft.ML.Data/Dirty/PredictorInterfaces.cs index 1b956ed2d0..d19a99b716 100644 --- a/src/Microsoft.ML.Data/Dirty/PredictorInterfaces.cs +++ b/src/Microsoft.ML.Data/Dirty/PredictorInterfaces.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; namespace Microsoft.ML.Internal.Internallearn diff --git a/src/Microsoft.ML.Data/EntryPoints/InputBase.cs b/src/Microsoft.ML.Data/EntryPoints/InputBase.cs index 68cbfce146..00f61f119f 100644 --- a/src/Microsoft.ML.Data/EntryPoints/InputBase.cs +++ b/src/Microsoft.ML.Data/EntryPoints/InputBase.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; diff --git a/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs b/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs index 9dd23e3f23..97559e6d6e 100644 --- a/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs +++ b/src/Microsoft.ML.Data/EntryPoints/PredictorModelImpl.cs @@ -7,7 +7,7 @@ using System.IO; using System.Linq; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Model; diff --git a/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs b/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs index 718ebd0998..dd6f2c34f3 100644 --- a/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs +++ b/src/Microsoft.ML.Data/EntryPoints/SummarizePredictor.cs @@ -5,7 +5,7 @@ using System.IO; using System.Text; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; diff --git a/src/Microsoft.ML.Data/Evaluators/AnomalyDetectionEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/AnomalyDetectionEvaluator.cs index 5fb8c8f76e..eaf0c9f24a 100644 --- a/src/Microsoft.ML.Data/Evaluators/AnomalyDetectionEvaluator.cs +++ b/src/Microsoft.ML.Data/Evaluators/AnomalyDetectionEvaluator.cs @@ -10,7 +10,6 @@ using Microsoft.ML; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; -using Microsoft.ML.Data.Evaluators.Metrics; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; diff --git a/src/Microsoft.ML.Data/Evaluators/Metrics/AnomalyDetectionMetrics.cs b/src/Microsoft.ML.Data/Evaluators/Metrics/AnomalyDetectionMetrics.cs index 1c897d35ed..060f18397d 100644 --- a/src/Microsoft.ML.Data/Evaluators/Metrics/AnomalyDetectionMetrics.cs +++ b/src/Microsoft.ML.Data/Evaluators/Metrics/AnomalyDetectionMetrics.cs @@ -5,7 +5,7 @@ using System; using Microsoft.Data.DataView; -namespace Microsoft.ML.Data.Evaluators.Metrics +namespace Microsoft.ML.Data { /// /// Evaluation results for anomaly detection. diff --git a/src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs b/src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs index 7b1167681c..2ae62dc479 100644 --- a/src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs +++ b/src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs @@ -2,7 +2,7 @@ // 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.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; namespace Microsoft.ML.Model.OnnxConverter diff --git a/src/Microsoft.ML.Data/Model/Pfa/ICanSavePfa.cs b/src/Microsoft.ML.Data/Model/Pfa/ICanSavePfa.cs index cc07e75a3c..41abfe45fc 100644 --- a/src/Microsoft.ML.Data/Model/Pfa/ICanSavePfa.cs +++ b/src/Microsoft.ML.Data/Model/Pfa/ICanSavePfa.cs @@ -2,7 +2,7 @@ // 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.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Newtonsoft.Json.Linq; diff --git a/src/Microsoft.ML.Data/Prediction/Calibrator.cs b/src/Microsoft.ML.Data/Prediction/Calibrator.cs index 2e00501138..028b38531a 100644 --- a/src/Microsoft.ML.Data/Prediction/Calibrator.cs +++ b/src/Microsoft.ML.Data/Prediction/Calibrator.cs @@ -10,7 +10,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; @@ -79,7 +79,7 @@ [assembly: EntryPointModule(typeof(PavCalibratorTrainerFactory))] [assembly: EntryPointModule(typeof(PlattCalibratorTrainerFactory))] -namespace Microsoft.ML.Calibrator +namespace Microsoft.ML.Calibrators { /// /// Signature for the loaders of calibrators. diff --git a/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs b/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs index 8afe9c3c6e..b109f38591 100644 --- a/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs +++ b/src/Microsoft.ML.Data/Prediction/CalibratorCatalog.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Model; using Microsoft.ML.Trainers; @@ -20,7 +20,7 @@ [assembly: LoadableClass(typeof(CalibratorTransformer), typeof(PavCalibratorTransformer), null, typeof(SignatureLoadModel), "", PavCalibratorTransformer.LoadName)] -namespace Microsoft.ML.Calibrator +namespace Microsoft.ML.Calibrators { /// diff --git a/src/Microsoft.ML.Data/Prediction/IPredictionTransformer.cs b/src/Microsoft.ML.Data/Prediction/IPredictionTransformer.cs index e0283eeb5f..e7c74cc38e 100644 --- a/src/Microsoft.ML.Data/Prediction/IPredictionTransformer.cs +++ b/src/Microsoft.ML.Data/Prediction/IPredictionTransformer.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Data/TrainCatalog.cs b/src/Microsoft.ML.Data/TrainCatalog.cs index 1f4e7b526a..243c71eff0 100644 --- a/src/Microsoft.ML.Data/TrainCatalog.cs +++ b/src/Microsoft.ML.Data/TrainCatalog.cs @@ -6,7 +6,6 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Data.Evaluators.Metrics; using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Conversions; diff --git a/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs b/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs index 8cab3003e7..d5730b27d3 100644 --- a/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs +++ b/src/Microsoft.ML.Data/Transforms/TrainAndScoreTransformer.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; diff --git a/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs b/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs index b3f596fd30..fe65254366 100644 --- a/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs +++ b/src/Microsoft.ML.Ensemble/EntryPoints/PipelineEnsemble.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Trainers.Ensemble; diff --git a/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs b/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs index e0abfea103..7a945cb4fa 100644 --- a/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs +++ b/src/Microsoft.ML.Ensemble/PipelineEnsemble.cs @@ -9,7 +9,7 @@ using System.Text; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; diff --git a/src/Microsoft.ML.FastTree/FastTree.cs b/src/Microsoft.ML.FastTree/FastTree.cs index 824ab7022e..71bd32f825 100644 --- a/src/Microsoft.ML.FastTree/FastTree.cs +++ b/src/Microsoft.ML.FastTree/FastTree.cs @@ -11,18 +11,15 @@ using System.Linq; using System.Text; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; -using Microsoft.ML.EntryPoints; -using Microsoft.ML.FastTree; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; -using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.TreePredictor; @@ -3384,7 +3381,7 @@ public abstract class TreeEnsembleModelParametersBasedOnRegressionTree : TreeEns { /// /// An ensemble of trees exposed to users. It is a wrapper on the - /// in . + /// in . /// public RegressionTreeEnsemble TrainedTreeEnsemble { get; } @@ -3424,7 +3421,7 @@ public abstract class TreeEnsembleModelParametersBasedOnQuantileRegressionTree : { /// /// An ensemble of trees exposed to users. It is a wrapper on the - /// in . + /// in . /// public QuantileRegressionTreeEnsemble TrainedTreeEnsemble { get; } diff --git a/src/Microsoft.ML.FastTree/FastTreeClassification.cs b/src/Microsoft.ML.FastTree/FastTreeClassification.cs index 83715cbb6e..3fb48c1489 100644 --- a/src/Microsoft.ML.FastTree/FastTreeClassification.cs +++ b/src/Microsoft.ML.FastTree/FastTreeClassification.cs @@ -7,7 +7,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; diff --git a/src/Microsoft.ML.FastTree/GamClassification.cs b/src/Microsoft.ML.FastTree/GamClassification.cs index e5152be7f1..6d2b110a97 100644 --- a/src/Microsoft.ML.FastTree/GamClassification.cs +++ b/src/Microsoft.ML.FastTree/GamClassification.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Internal.Internallearn; diff --git a/src/Microsoft.ML.FastTree/GamModelParameters.cs b/src/Microsoft.ML.FastTree/GamModelParameters.cs index 0f18fd8b05..1e2731c37c 100644 --- a/src/Microsoft.ML.FastTree/GamModelParameters.cs +++ b/src/Microsoft.ML.FastTree/GamModelParameters.cs @@ -9,7 +9,7 @@ using System.Threading; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Command; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; diff --git a/src/Microsoft.ML.FastTree/RandomForestClassification.cs b/src/Microsoft.ML.FastTree/RandomForestClassification.cs index 82250ff48c..77a45ade92 100644 --- a/src/Microsoft.ML.FastTree/RandomForestClassification.cs +++ b/src/Microsoft.ML.FastTree/RandomForestClassification.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; diff --git a/src/Microsoft.ML.FastTree/RegressionTree.cs b/src/Microsoft.ML.FastTree/RegressionTree.cs index 96a0784602..9fdb0ff36e 100644 --- a/src/Microsoft.ML.FastTree/RegressionTree.cs +++ b/src/Microsoft.ML.FastTree/RegressionTree.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.ML.Trainers.FastTree; -namespace Microsoft.ML.FastTree +namespace Microsoft.ML.Trainers.FastTree { /// /// A container base class for exposing 's and diff --git a/src/Microsoft.ML.FastTree/TreeEnsemble.cs b/src/Microsoft.ML.FastTree/TreeEnsemble.cs index 58df4c01aa..f9607ef68d 100644 --- a/src/Microsoft.ML.FastTree/TreeEnsemble.cs +++ b/src/Microsoft.ML.FastTree/TreeEnsemble.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.ML.FastTree +namespace Microsoft.ML.Trainers.FastTree { /// /// A list of 's derived class. To compute the output value of a diff --git a/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs b/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs index 1bb43ccfb8..8643058684 100644 --- a/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs +++ b/src/Microsoft.ML.FastTree/TreeEnsemble/TreeEnsembleCombiner.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Trainers.FastTree; diff --git a/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs b/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs index 00c70a4117..f58de700c9 100644 --- a/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs +++ b/src/Microsoft.ML.FastTree/TreeEnsembleFeaturizer.cs @@ -8,7 +8,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; @@ -654,8 +654,8 @@ public static IDataTransform CreateForEntryPoint(IHostEnvironment env, Arguments ch.Assert(predictor == predictor2); // Make sure that the given predictor has the correct number of input features. - if (predictor is CalibratedModelParametersBase, Calibrator.ICalibrator>) - predictor = ((CalibratedModelParametersBase, Calibrator.ICalibrator>)predictor).SubModel; + if (predictor is CalibratedModelParametersBase, Calibrators.ICalibrator>) + predictor = ((CalibratedModelParametersBase, Calibrators.ICalibrator>)predictor).SubModel; // Predictor should be a TreeEnsembleModelParameters, which implements IValueMapper, so this should // be non-null. var vm = predictor as IValueMapper; diff --git a/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs b/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs index aa61a9ac22..0d0d895637 100644 --- a/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs +++ b/src/Microsoft.ML.FastTree/Utils/FastTreeIniFileUtils.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Text; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; diff --git a/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs b/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs index e76829efcb..590119daf4 100644 --- a/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs +++ b/src/Microsoft.ML.HalLearners/SymSgdClassificationTrainer.cs @@ -8,7 +8,7 @@ using System.Security; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; diff --git a/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs b/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs index 16e6bbdfed..9302e8df26 100644 --- a/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs +++ b/src/Microsoft.ML.ImageAnalytics/EntryPoints/ImageAnalytics.cs @@ -6,10 +6,10 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.ImageAnalytics; -[assembly: LoadableClass(typeof(void), typeof(ImageAnalytics), null, typeof(SignatureEntryPointModule), "ImageAnalytics")] +[assembly: LoadableClass(typeof(void), typeof(ImageAnalyticsEntryPoints), null, typeof(SignatureEntryPointModule), "ImageAnalytics")] namespace Microsoft.ML.ImageAnalytics { - internal static class ImageAnalytics + internal static class ImageAnalyticsEntryPoints { [TlcModule.EntryPoint(Name = "Transforms.ImageLoader", Desc = ImageLoadingTransformer.Summary, UserName = ImageLoadingTransformer.UserName, ShortName = ImageLoadingTransformer.LoaderSignature)] diff --git a/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs b/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs index a1c984c9d8..f8bdaebfb9 100644 --- a/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs +++ b/src/Microsoft.ML.LightGBM.StaticPipe/LightGbmStaticExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.StaticPipe; using Microsoft.ML.Trainers; diff --git a/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs b/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs index d19fb4442b..cc4c9f68cc 100644 --- a/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs +++ b/src/Microsoft.ML.LightGBM/LightGbmBinaryTrainer.cs @@ -4,7 +4,7 @@ using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.LightGBM; diff --git a/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs b/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs index 255aa44840..c64388b11f 100644 --- a/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs +++ b/src/Microsoft.ML.LightGBM/LightGbmMulticlassTrainer.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.LightGBM; diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs b/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs index 3791836ff6..366bea0b11 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs @@ -9,7 +9,7 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs b/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs index 36129d50c1..454522b086 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; using Float = System.Single; diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs index 1c884aa2c2..a383afe1eb 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs index 008dbb1376..0afc17a8d0 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs index fa53c68c40..bb5fb0c90c 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Ova.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs index 4ba9c40ae5..63b5947f37 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/Pkpd.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs index 370683500c..eb16bdcabb 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs @@ -5,7 +5,7 @@ using System; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs index 4070ce1ad3..fd9022f7dd 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs @@ -5,7 +5,7 @@ using System; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; diff --git a/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs b/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs index 974c0db5e3..87ed1edf3c 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; diff --git a/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs b/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs index 7724b5a19a..acab62317c 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Transforms; diff --git a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs index f2830a1dfb..906fe9529b 100644 --- a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs +++ b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs @@ -2,7 +2,7 @@ // 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.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.Online; diff --git a/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs b/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs index e8655b8e19..1c5eec3191 100644 --- a/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs +++ b/src/Microsoft.ML.StaticPipe/LbfgsStatic.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs index b143758e63..2261c24e63 100644 --- a/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/SdcaStaticExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/SgdStatic.cs b/src/Microsoft.ML.StaticPipe/SgdStatic.cs index caa0168bde..d71d55db9d 100644 --- a/src/Microsoft.ML.StaticPipe/SgdStatic.cs +++ b/src/Microsoft.ML.StaticPipe/SgdStatic.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs b/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs index 02367b3f53..f6c6132d80 100644 --- a/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs +++ b/src/Microsoft.ML.StaticPipe/TreeTrainersStatic.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Trainers.FastTree; namespace Microsoft.ML.StaticPipe From e1236d8e995c1d207d9543f3249b7a1f9348f0d1 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Tue, 26 Feb 2019 14:53:54 -0800 Subject: [PATCH 6/7] the target of my replace all was the source folder, and building through cmd doesn't build the test folder. Extending the changes of the prior commit to the test folder --- docs/samples/Microsoft.ML.Samples/Dynamic/Calibrator.cs | 2 +- .../KMeansAndLogisticRegressionBench.cs | 2 +- test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs | 2 +- test/Microsoft.ML.Functional.Tests/Common.cs | 1 - test/Microsoft.ML.StaticPipelineTesting/Training.cs | 2 +- .../Scenarios/Api/Estimators/IntrospectiveTraining.cs | 3 +-- .../TrainerEstimators/CalibratorEstimators.cs | 2 +- test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs | 2 +- .../TrainerEstimators/MetalinearEstimators.cs | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Calibrator.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Calibrator.cs index 44ddbd671c..30f95df416 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Calibrator.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Calibrator.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; namespace Microsoft.ML.Samples.Dynamic diff --git a/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs b/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs index f89b958320..76bd5bd9ad 100644 --- a/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs +++ b/test/Microsoft.ML.Benchmarks/KMeansAndLogisticRegressionBench.cs @@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.ML.Benchmarks.Harness; using Microsoft.ML.Data; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; diff --git a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs index 7e63cfe0ee..75a0130c88 100644 --- a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs +++ b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Text.RegularExpressions; using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Core.Tests.UnitTests; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; diff --git a/test/Microsoft.ML.Functional.Tests/Common.cs b/test/Microsoft.ML.Functional.Tests/Common.cs index b0fbc38396..ec33fa2352 100644 --- a/test/Microsoft.ML.Functional.Tests/Common.cs +++ b/test/Microsoft.ML.Functional.Tests/Common.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Data.Evaluators.Metrics; using Microsoft.ML.Functional.Tests.Datasets; using Xunit; diff --git a/test/Microsoft.ML.StaticPipelineTesting/Training.cs b/test/Microsoft.ML.StaticPipelineTesting/Training.cs index cec8d24d88..9d4508b75e 100644 --- a/test/Microsoft.ML.StaticPipelineTesting/Training.cs +++ b/test/Microsoft.ML.StaticPipelineTesting/Training.cs @@ -7,7 +7,7 @@ using Microsoft.Data.DataView; using Microsoft.ML; using Microsoft.ML.Data; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.LightGBM; using Microsoft.ML.LightGBM.StaticPipe; diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs index 6012abfa74..a445e22341 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/IntrospectiveTraining.cs @@ -2,10 +2,9 @@ // 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.Calibrators; using Microsoft.ML.Data; -using Microsoft.ML.Calibrator; using Microsoft.ML.RunTests; -using Microsoft.ML.SamplesUtils; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.FastTree; using Xunit; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/CalibratorEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/CalibratorEstimators.cs index 421f5e03fd..7978651a94 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/CalibratorEstimators.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/CalibratorEstimators.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.Data.DataView; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Trainers; using Xunit; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs b/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs index 0a15eae5b5..2ba1e4dda7 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/LbfgsTests.cs @@ -4,7 +4,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Trainers; using Xunit; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs index 0f23807334..506da31ccf 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs @@ -2,7 +2,7 @@ // 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.Calibrator; +using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.RunTests; using Microsoft.ML.Trainers; From f8a7d8779f760a5a5cf23a960d8f13881fa3a274 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Tue, 26 Feb 2019 15:31:21 -0800 Subject: [PATCH 7/7] Ivan's suggestion to move VersionInfo and ModelHeader to Microsoft.ML and regenerating the catalog. --- src/Microsoft.ML.Core/Data/IEstimator.cs | 1 - src/Microsoft.ML.Core/Data/ModelHeader.cs | 2 +- .../Data/ModelLoadContext.cs | 1 - src/Microsoft.ML.Core/Data/ModelLoading.cs | 1 - .../Data/ModelSaveContext.cs | 1 - src/Microsoft.ML.Core/Data/ModelSaving.cs | 1 - .../Common/EntryPoints/core_ep-list.tsv | 20 +++++++++---------- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/Microsoft.ML.Core/Data/IEstimator.cs b/src/Microsoft.ML.Core/Data/IEstimator.cs index 75c4e60ac1..0262fd740f 100644 --- a/src/Microsoft.ML.Core/Data/IEstimator.cs +++ b/src/Microsoft.ML.Core/Data/IEstimator.cs @@ -7,7 +7,6 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Model; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Core/Data/ModelHeader.cs b/src/Microsoft.ML.Core/Data/ModelHeader.cs index 74e7567e71..daabe7b21a 100644 --- a/src/Microsoft.ML.Core/Data/ModelHeader.cs +++ b/src/Microsoft.ML.Core/Data/ModelHeader.cs @@ -8,7 +8,7 @@ using System.Text; using Microsoft.ML.Internal.Utilities; -namespace Microsoft.ML.Model +namespace Microsoft.ML { [BestFriend] [StructLayout(LayoutKind.Explicit, Size = Size)] diff --git a/src/Microsoft.ML.Core/Data/ModelLoadContext.cs b/src/Microsoft.ML.Core/Data/ModelLoadContext.cs index 3051be4185..ff0d9addd2 100644 --- a/src/Microsoft.ML.Core/Data/ModelLoadContext.cs +++ b/src/Microsoft.ML.Core/Data/ModelLoadContext.cs @@ -6,7 +6,6 @@ using System.IO; using System.Text; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Core/Data/ModelLoading.cs b/src/Microsoft.ML.Core/Data/ModelLoading.cs index 380293d607..a1571598e4 100644 --- a/src/Microsoft.ML.Core/Data/ModelLoading.cs +++ b/src/Microsoft.ML.Core/Data/ModelLoading.cs @@ -7,7 +7,6 @@ using System.Reflection; using System.Text; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Core/Data/ModelSaveContext.cs b/src/Microsoft.ML.Core/Data/ModelSaveContext.cs index 436fbfeaa9..efc3c94fa7 100644 --- a/src/Microsoft.ML.Core/Data/ModelSaveContext.cs +++ b/src/Microsoft.ML.Core/Data/ModelSaveContext.cs @@ -6,7 +6,6 @@ using System.IO; using System.Text; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Core/Data/ModelSaving.cs b/src/Microsoft.ML.Core/Data/ModelSaving.cs index 1b2c6ea29e..1de0f37640 100644 --- a/src/Microsoft.ML.Core/Data/ModelSaving.cs +++ b/src/Microsoft.ML.Core/Data/ModelSaving.cs @@ -5,7 +5,6 @@ using System; using System.IO; using System.Text; -using Microsoft.ML.Model; namespace Microsoft.ML { diff --git a/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv b/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv index 172d030b01..c4d63ccb72 100644 --- a/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv +++ b/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv @@ -15,15 +15,15 @@ Models.CrossValidator Cross validation for general learning Microsoft.ML.EntryPo Models.CrossValidatorDatasetSplitter Split the dataset into the specified number of cross-validation folds (train and test sets) Microsoft.ML.EntryPoints.CVSplit Split Microsoft.ML.EntryPoints.CVSplit+Input Microsoft.ML.EntryPoints.CVSplit+Output Models.DatasetTransformer Applies a TransformModel to a dataset. Microsoft.ML.EntryPoints.ModelOperations Apply Microsoft.ML.EntryPoints.ModelOperations+ApplyTransformModelInput Microsoft.ML.EntryPoints.ModelOperations+ApplyTransformModelOutput Models.EnsembleSummary Summarize a pipeline ensemble predictor. Microsoft.ML.Trainers.Ensemble.PipelineEnsemble Summarize Microsoft.ML.EntryPoints.SummarizePredictor+Input Microsoft.ML.Trainers.Ensemble.PipelineEnsemble+SummaryOutput -Models.FixedPlattCalibrator Apply a Platt calibrator with a fixed slope and offset to an input model Microsoft.ML.Internal.Calibration.Calibrate FixedPlatt Microsoft.ML.Internal.Calibration.Calibrate+FixedPlattInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput +Models.FixedPlattCalibrator Apply a Platt calibrator with a fixed slope and offset to an input model Microsoft.ML.Calibrators.Calibrate FixedPlatt Microsoft.ML.Calibrators.Calibrate+FixedPlattInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput Models.MultiClassPipelineEnsemble Combine multiclass classifiers into an ensemble Microsoft.ML.Trainers.Ensemble.EnsembleCreator CreateMultiClassPipelineEnsemble Microsoft.ML.Trainers.Ensemble.EnsembleCreator+PipelineClassifierInput Microsoft.ML.EntryPoints.CommonOutputs+MulticlassClassificationOutput Models.MultiOutputRegressionEvaluator Evaluates a multi output regression scored dataset. Microsoft.ML.Data.Evaluate MultiOutputRegression Microsoft.ML.Data.MultiOutputRegressionMamlEvaluator+Arguments Microsoft.ML.EntryPoints.CommonOutputs+CommonEvaluateOutput -Models.NaiveCalibrator Apply a Naive calibrator to an input model Microsoft.ML.Internal.Calibration.Calibrate Naive Microsoft.ML.Internal.Calibration.Calibrate+NoArgumentsInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput +Models.NaiveCalibrator Apply a Naive calibrator to an input model Microsoft.ML.Calibrators.Calibrate Naive Microsoft.ML.Calibrators.Calibrate+NoArgumentsInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput Models.OneVersusAll One-vs-All macro (OVA) Microsoft.ML.EntryPoints.OneVersusAllMacro OneVersusAll Microsoft.ML.EntryPoints.OneVersusAllMacro+Arguments Microsoft.ML.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.EntryPoints.OneVersusAllMacro+Output] Models.OnnxConverter Converts the model to ONNX format. Microsoft.ML.Model.OnnxConverter.SaveOnnxCommand Apply Microsoft.ML.Model.OnnxConverter.SaveOnnxCommand+Arguments Microsoft.ML.Model.OnnxConverter.SaveOnnxCommand+Output Models.OvaModelCombiner Combines a sequence of PredictorModels into a single model Microsoft.ML.EntryPoints.ModelOperations CombineOvaModels Microsoft.ML.EntryPoints.ModelOperations+CombineOvaPredictorModelsInput Microsoft.ML.EntryPoints.ModelOperations+PredictorModelOutput -Models.PAVCalibrator Apply a PAV calibrator to an input model Microsoft.ML.Internal.Calibration.Calibrate Pav Microsoft.ML.Internal.Calibration.Calibrate+NoArgumentsInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput -Models.PlattCalibrator Apply a Platt calibrator to an input model Microsoft.ML.Internal.Calibration.Calibrate Platt Microsoft.ML.Internal.Calibration.Calibrate+NoArgumentsInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput +Models.PAVCalibrator Apply a PAV calibrator to an input model Microsoft.ML.Calibrators.Calibrate Pav Microsoft.ML.Calibrators.Calibrate+NoArgumentsInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput +Models.PlattCalibrator Apply a Platt calibrator to an input model Microsoft.ML.Calibrators.Calibrate Platt Microsoft.ML.Calibrators.Calibrate+NoArgumentsInput Microsoft.ML.EntryPoints.CommonOutputs+CalibratorOutput Models.QuantileRegressionEvaluator Evaluates a quantile regression scored dataset. Microsoft.ML.Data.Evaluate QuantileRegression Microsoft.ML.Data.QuantileRegressionMamlEvaluator+Arguments Microsoft.ML.EntryPoints.CommonOutputs+CommonEvaluateOutput Models.RankingEvaluator Evaluates a ranking scored dataset. Microsoft.ML.Data.Evaluate Ranking Microsoft.ML.Data.RankingMamlEvaluator+Arguments Microsoft.ML.EntryPoints.CommonOutputs+CommonEvaluateOutput Models.RegressionEnsemble Combine regression models into an ensemble Microsoft.ML.Trainers.Ensemble.EnsembleCreator CreateRegressionEnsemble Microsoft.ML.Trainers.Ensemble.EnsembleCreator+RegressionInput Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput @@ -49,7 +49,7 @@ Trainers.FastTreeBinaryClassifier Uses a logit-boost boosted tree learner to per Trainers.FastTreeRanker Trains gradient boosted decision trees to the LambdaRank quasi-gradient. Microsoft.ML.Trainers.FastTree.FastTree TrainRanking Microsoft.ML.Trainers.FastTree.FastTreeRankingTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+RankingOutput Trainers.FastTreeRegressor Trains gradient boosted decision trees to fit target values using least-squares. Microsoft.ML.Trainers.FastTree.FastTree TrainRegression Microsoft.ML.Trainers.FastTree.FastTreeRegressionTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput Trainers.FastTreeTweedieRegressor Trains gradient boosted decision trees to fit target values using a Tweedie loss function. This learner is a generalization of Poisson, compound Poisson, and gamma regression. Microsoft.ML.Trainers.FastTree.FastTree TrainTweedieRegression Microsoft.ML.Trainers.FastTree.FastTreeTweedieTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput -Trainers.FieldAwareFactorizationMachineBinaryClassifier Train a field-aware factorization machine for binary classification Microsoft.ML.FactorizationMachine.FieldAwareFactorizationMachineTrainer TrainBinary Microsoft.ML.FactorizationMachine.FieldAwareFactorizationMachineTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput +Trainers.FieldAwareFactorizationMachineBinaryClassifier Train a field-aware factorization machine for binary classification Microsoft.ML.Trainers.FactorizationMachine.FieldAwareFactorizationMachineTrainer TrainBinary Microsoft.ML.Trainers.FactorizationMachine.FieldAwareFactorizationMachineTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.GeneralizedAdditiveModelBinaryClassifier Trains a gradient boosted stump per feature, on all features simultaneously, to fit target values using least-squares. It mantains no interactions between features. Microsoft.ML.Trainers.FastTree.Gam TrainBinary Microsoft.ML.Trainers.FastTree.BinaryClassificationGamTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.GeneralizedAdditiveModelRegressor Trains a gradient boosted stump per feature, on all features simultaneously, to fit target values using least-squares. It mantains no interactions between features. Microsoft.ML.Trainers.FastTree.Gam TrainRegression Microsoft.ML.Trainers.FastTree.RegressionGamTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput Trainers.KMeansPlusPlusClusterer K-means is a popular clustering algorithm. With K-means, the data is clustered into a specified number of clusters in order to minimize the within-cluster sum of squares. K-means++ improves upon K-means by using a better method for choosing the initial cluster centers. Microsoft.ML.Trainers.KMeans.KMeansPlusPlusTrainer TrainKMeans Microsoft.ML.Trainers.KMeans.KMeansPlusPlusTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+ClusteringOutput @@ -92,10 +92,10 @@ Transforms.FeatureSelectorByCount Selects the slots for which the count of non-d Transforms.FeatureSelectorByMutualInformation Selects the top k slots across all specified columns ordered by their mutual information with the label column. Microsoft.ML.Transforms.SelectFeatures MutualInformationSelect Microsoft.ML.Transforms.FeatureSelection.MutualInformationFeatureSelectingEstimator+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.GlobalContrastNormalizer Performs a global contrast normalization on input values: Y = (s * X - M) / D, where s is a scale, M is mean and D is either L2 norm or standard deviation. Microsoft.ML.Transforms.Projections.LpNormalization GcNormalize Microsoft.ML.Transforms.Projections.LpNormalizingTransformer+GcnOptions Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.HashConverter Converts column values into hashes. This transform accepts both numeric and text inputs, both single and vector-valued columns. Microsoft.ML.Transforms.Conversions.HashJoin Apply Microsoft.ML.Transforms.Conversions.HashJoiningTransform+Arguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.ImageGrayscale Convert image into grayscale. Microsoft.ML.ImageAnalytics.EntryPoints.ImageAnalytics ImageGrayscale Microsoft.ML.ImageAnalytics.ImageGrayscalingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.ImageLoader Load images from files. Microsoft.ML.ImageAnalytics.EntryPoints.ImageAnalytics ImageLoader Microsoft.ML.ImageAnalytics.ImageLoadingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.ImagePixelExtractor Extract color plane(s) from an image. Options include scaling, offset and conversion to floating point. Microsoft.ML.ImageAnalytics.EntryPoints.ImageAnalytics ImagePixelExtractor Microsoft.ML.ImageAnalytics.ImagePixelExtractingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.ImageResizer Scales an image to specified dimensions using one of the three scale types: isotropic with padding, isotropic with cropping or anisotropic. In case of isotropic padding, transparent color is used to pad resulting image. Microsoft.ML.ImageAnalytics.EntryPoints.ImageAnalytics ImageResizer Microsoft.ML.ImageAnalytics.ImageResizingTransformer+Arguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.ImageGrayscale Convert image into grayscale. Microsoft.ML.ImageAnalytics.ImageAnalyticsEntryPoints ImageGrayscale Microsoft.ML.ImageAnalytics.ImageGrayscalingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.ImageLoader Load images from files. Microsoft.ML.ImageAnalytics.ImageAnalyticsEntryPoints ImageLoader Microsoft.ML.ImageAnalytics.ImageLoadingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.ImagePixelExtractor Extract color plane(s) from an image. Options include scaling, offset and conversion to floating point. Microsoft.ML.ImageAnalytics.ImageAnalyticsEntryPoints ImagePixelExtractor Microsoft.ML.ImageAnalytics.ImagePixelExtractingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.ImageResizer Scales an image to specified dimensions using one of the three scale types: isotropic with padding, isotropic with cropping or anisotropic. In case of isotropic padding, transparent color is used to pad resulting image. Microsoft.ML.ImageAnalytics.ImageAnalyticsEntryPoints ImageResizer Microsoft.ML.ImageAnalytics.ImageResizingTransformer+Arguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.KeyToTextConverter KeyToValueTransform utilizes KeyValues metadata to map key indices to the corresponding values in the KeyValues metadata. Microsoft.ML.Transforms.Categorical.Categorical KeyToText Microsoft.ML.Transforms.Conversions.KeyToValueMappingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.LabelColumnKeyBooleanConverter Transforms the label to either key or bool (if needed) to make it suitable for classification. Microsoft.ML.EntryPoints.FeatureCombiner PrepareClassificationLabel Microsoft.ML.EntryPoints.FeatureCombiner+ClassificationLabelInput Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.LabelIndicator Label remapper used by OVA Microsoft.ML.Transforms.LabelIndicatorTransform LabelIndicator Microsoft.ML.Transforms.LabelIndicatorTransform+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput @@ -132,6 +132,6 @@ Transforms.TextToKeyConverter Converts input values (words, numbers, etc.) to in Transforms.TrainTestDatasetSplitter Split the dataset into train and test sets Microsoft.ML.EntryPoints.TrainTestSplit Split Microsoft.ML.EntryPoints.TrainTestSplit+Input Microsoft.ML.EntryPoints.TrainTestSplit+Output Transforms.TreeLeafFeaturizer Trains a tree ensemble, or loads it from a file, then maps a numeric feature vector to three outputs: 1. A vector containing the individual tree outputs of the tree ensemble. 2. A vector indicating the leaves that the feature vector falls on in the tree ensemble. 3. A vector indicating the paths that the feature vector falls on in the tree ensemble. If a both a model file and a trainer are specified - will use the model file. If neither are specified, will train a default FastTree model. This can handle key labels by training a regression model towards their optionally permuted indices. Microsoft.ML.Data.TreeFeaturize Featurizer Microsoft.ML.Data.TreeEnsembleFeaturizerTransform+ArgumentsForEntryPoint Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.TwoHeterogeneousModelCombiner Combines a TransformModel and a PredictorModel into a single PredictorModel. Microsoft.ML.EntryPoints.ModelOperations CombineTwoModels Microsoft.ML.EntryPoints.ModelOperations+SimplePredictorModelInput Microsoft.ML.EntryPoints.ModelOperations+PredictorModelOutput -Transforms.VectorToImage Converts vector array into image type. Microsoft.ML.ImageAnalytics.EntryPoints.ImageAnalytics VectorToImage Microsoft.ML.ImageAnalytics.VectorToImageConvertingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.VectorToImage Converts vector array into image type. Microsoft.ML.ImageAnalytics.ImageAnalyticsEntryPoints VectorToImage Microsoft.ML.ImageAnalytics.VectorToImageConvertingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.WordEmbeddings Word Embeddings transform is a text featurizer which converts vectors of text tokens into sentence vectors using a pre-trained model Microsoft.ML.Transforms.Text.TextAnalytics WordEmbeddings Microsoft.ML.Transforms.Text.WordEmbeddingsExtractingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.WordTokenizer The input to this transform is text, and the output is a vector of text containing the words (tokens) in the original text. The separator is space, but can be specified as any other character (or multiple characters) if needed. Microsoft.ML.Transforms.Text.TextAnalytics DelimitedTokenizeTransform Microsoft.ML.Transforms.Text.WordTokenizingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput