diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln index a174f74768..e4c59721bf 100644 --- a/Microsoft.ML.sln +++ b/Microsoft.ML.sln @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Data", "src\Mi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.OnnxConverter", "src\Microsoft.ML.OnnxConverter\Microsoft.ML.OnnxConverter.csproj", "{65D0603E-B96C-4DFC-BDD1-705891B88C18}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StandardLearners", "src\Microsoft.ML.StandardLearners\Microsoft.ML.StandardLearners.csproj", "{707BB22C-7E5F-497A-8C2F-74578F675705}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StandardTrainers", "src\Microsoft.ML.StandardTrainers\Microsoft.ML.StandardTrainers.csproj", "{707BB22C-7E5F-497A-8C2F-74578F675705}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Transforms", "src\Microsoft.ML.Transforms\Microsoft.ML.Transforms.csproj", "{2911A286-ECA4-4730-97A9-DA1FEE2DED97}" EndProject diff --git a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj index aefcc2cdb8..b70e47f349 100644 --- a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj +++ b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Microsoft.ML.Console/Microsoft.ML.Console.csproj b/src/Microsoft.ML.Console/Microsoft.ML.Console.csproj index a3b41c1265..4eaead0f20 100644 --- a/src/Microsoft.ML.Console/Microsoft.ML.Console.csproj +++ b/src/Microsoft.ML.Console/Microsoft.ML.Console.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Microsoft.ML.Core/Data/ModelLoading.cs b/src/Microsoft.ML.Core/Data/ModelLoading.cs index 0302598bf6..2fb7bd99ee 100644 --- a/src/Microsoft.ML.Core/Data/ModelLoading.cs +++ b/src/Microsoft.ML.Core/Data/ModelLoading.cs @@ -29,13 +29,20 @@ private string ForwardedLoaderAssemblyName { get { - switch (LoaderAssemblyName) + string[] nameDetails = LoaderAssemblyName.Split(','); + switch (nameDetails[0]) { case "Microsoft.ML.HalLearners": - return "Microsoft.ML.Mkl.Components"; + nameDetails[0] = "Microsoft.ML.Mkl.Components"; + break; + case "Microsoft.ML.StandardLearners": + nameDetails[0] = "Microsoft.ML.StandardTrainers"; + break; default: return LoaderAssemblyName; } + + return string.Join(",", nameDetails); } } diff --git a/src/Microsoft.ML.Core/Properties/AssemblyInfo.cs b/src/Microsoft.ML.Core/Properties/AssemblyInfo.cs index 9ddb49d4a5..dc53864270 100644 --- a/src/Microsoft.ML.Core/Properties/AssemblyInfo.cs +++ b/src/Microsoft.ML.Core/Properties/AssemblyInfo.cs @@ -34,7 +34,7 @@ [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Recommender" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.ImageAnalytics" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Scoring" + PublicKey.Value)] -[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StandardLearners" + PublicKey.Value)] +[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StandardTrainers" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Sweeper" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries" + PublicKey.Value)] diff --git a/src/Microsoft.ML.CpuMath/AssemblyInfo.cs b/src/Microsoft.ML.CpuMath/AssemblyInfo.cs index 136148d27e..ae5d9a5b82 100644 --- a/src/Microsoft.ML.CpuMath/AssemblyInfo.cs +++ b/src/Microsoft.ML.CpuMath/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: InternalsVisibleTo("Microsoft.ML.Mkl.Components" + PublicKey.Value)] [assembly: InternalsVisibleTo("Microsoft.ML.KMeansClustering" + PublicKey.Value)] [assembly: InternalsVisibleTo("Microsoft.ML.PCA" + PublicKey.Value)] -[assembly: InternalsVisibleTo("Microsoft.ML.StandardLearners" + PublicKey.Value)] +[assembly: InternalsVisibleTo("Microsoft.ML.StandardTrainers" + PublicKey.Value)] [assembly: InternalsVisibleTo("Microsoft.ML.Sweeper" + PublicKey.Value)] [assembly: InternalsVisibleTo("Microsoft.ML.TimeSeries" + PublicKey.Value)] [assembly: InternalsVisibleTo("Microsoft.ML.Transforms" + PublicKey.Value)] diff --git a/src/Microsoft.ML.Data/Properties/AssemblyInfo.cs b/src/Microsoft.ML.Data/Properties/AssemblyInfo.cs index 6c3738add7..2dc962e2ee 100644 --- a/src/Microsoft.ML.Data/Properties/AssemblyInfo.cs +++ b/src/Microsoft.ML.Data/Properties/AssemblyInfo.cs @@ -34,7 +34,7 @@ [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Recommender" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.ImageAnalytics" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Scoring" + PublicKey.Value)] -[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StandardLearners" + PublicKey.Value)] +[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.StandardTrainers" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Sweeper" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TensorFlow" + PublicKey.Value)] [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries" + PublicKey.Value)] diff --git a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj index ddd4557788..cb69ad7a63 100644 --- a/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj +++ b/src/Microsoft.ML.Ensemble/Microsoft.ML.Ensemble.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj index 52f8cf594e..2dd542e4c5 100644 --- a/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj +++ b/src/Microsoft.ML.EntryPoints/Microsoft.ML.EntryPoints.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.ML.LightGBM/Microsoft.ML.LightGBM.csproj b/src/Microsoft.ML.LightGBM/Microsoft.ML.LightGBM.csproj index f3e9e8f495..dd297e138a 100644 --- a/src/Microsoft.ML.LightGBM/Microsoft.ML.LightGBM.csproj +++ b/src/Microsoft.ML.LightGBM/Microsoft.ML.LightGBM.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj index 1aa100c9ad..907b75e11f 100644 --- a/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj +++ b/src/Microsoft.ML.Mkl.Components/Microsoft.ML.Mkl.Components.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Microsoft.ML.StandardLearners/AssemblyInfo.cs b/src/Microsoft.ML.StandardTrainers/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/AssemblyInfo.cs rename to src/Microsoft.ML.StandardTrainers/AssemblyInfo.cs diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs b/src/Microsoft.ML.StandardTrainers/FactorizationMachine/FactorizationMachineCatalog.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs rename to src/Microsoft.ML.StandardTrainers/FactorizationMachine/FactorizationMachineCatalog.cs diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs b/src/Microsoft.ML.StandardTrainers/FactorizationMachine/FactorizationMachineInterface.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs rename to src/Microsoft.ML.StandardTrainers/FactorizationMachine/FactorizationMachineInterface.cs diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs b/src/Microsoft.ML.StandardTrainers/FactorizationMachine/FactorizationMachineTrainer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs rename to src/Microsoft.ML.StandardTrainers/FactorizationMachine/FactorizationMachineTrainer.cs diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs b/src/Microsoft.ML.StandardTrainers/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs rename to src/Microsoft.ML.StandardTrainers/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs b/src/Microsoft.ML.StandardTrainers/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs rename to src/Microsoft.ML.StandardTrainers/FactorizationMachine/FieldAwareFactorizationMachineUtils.cs diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/doc.xml b/src/Microsoft.ML.StandardTrainers/FactorizationMachine/doc.xml similarity index 100% rename from src/Microsoft.ML.StandardLearners/FactorizationMachine/doc.xml rename to src/Microsoft.ML.StandardTrainers/FactorizationMachine/doc.xml diff --git a/src/Microsoft.ML.StandardLearners/Microsoft.ML.StandardLearners.csproj b/src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj similarity index 100% rename from src/Microsoft.ML.StandardLearners/Microsoft.ML.StandardLearners.csproj rename to src/Microsoft.ML.StandardTrainers/Microsoft.ML.StandardTrainers.csproj diff --git a/src/Microsoft.ML.StandardLearners/Optimizer/DifferentiableFunction.cs b/src/Microsoft.ML.StandardTrainers/Optimizer/DifferentiableFunction.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Optimizer/DifferentiableFunction.cs rename to src/Microsoft.ML.StandardTrainers/Optimizer/DifferentiableFunction.cs diff --git a/src/Microsoft.ML.StandardLearners/Optimizer/L1Optimizer.cs b/src/Microsoft.ML.StandardTrainers/Optimizer/L1Optimizer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Optimizer/L1Optimizer.cs rename to src/Microsoft.ML.StandardTrainers/Optimizer/L1Optimizer.cs diff --git a/src/Microsoft.ML.StandardLearners/Optimizer/LineSearch.cs b/src/Microsoft.ML.StandardTrainers/Optimizer/LineSearch.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Optimizer/LineSearch.cs rename to src/Microsoft.ML.StandardTrainers/Optimizer/LineSearch.cs diff --git a/src/Microsoft.ML.StandardLearners/Optimizer/OptimizationMonitor.cs b/src/Microsoft.ML.StandardTrainers/Optimizer/OptimizationMonitor.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Optimizer/OptimizationMonitor.cs rename to src/Microsoft.ML.StandardTrainers/Optimizer/OptimizationMonitor.cs diff --git a/src/Microsoft.ML.StandardLearners/Optimizer/Optimizer.cs b/src/Microsoft.ML.StandardTrainers/Optimizer/Optimizer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Optimizer/Optimizer.cs rename to src/Microsoft.ML.StandardTrainers/Optimizer/Optimizer.cs diff --git a/src/Microsoft.ML.StandardLearners/Optimizer/SgdOptimizer.cs b/src/Microsoft.ML.StandardTrainers/Optimizer/SgdOptimizer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Optimizer/SgdOptimizer.cs rename to src/Microsoft.ML.StandardTrainers/Optimizer/SgdOptimizer.cs diff --git a/src/Microsoft.ML.StandardLearners/Properties/AssemblyInfo.cs b/src/Microsoft.ML.StandardTrainers/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Properties/AssemblyInfo.cs rename to src/Microsoft.ML.StandardTrainers/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs b/src/Microsoft.ML.StandardTrainers/Standard/LinearModelParameters.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs rename to src/Microsoft.ML.StandardTrainers/Standard/LinearModelParameters.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs b/src/Microsoft.ML.StandardTrainers/Standard/LinearPredictorUtils.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/LinearPredictorUtils.cs rename to src/Microsoft.ML.StandardTrainers/Standard/LinearPredictorUtils.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LbfgsPredictorBase.cs b/src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/LbfgsPredictorBase.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LbfgsPredictorBase.cs rename to src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/LbfgsPredictorBase.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs b/src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/LogisticRegression.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs rename to src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/LogisticRegression.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/MulticlassLogisticRegression.cs b/src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/MulticlassLogisticRegression.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/MulticlassLogisticRegression.cs rename to src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/MulticlassLogisticRegression.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/doc.xml b/src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/doc.xml similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/doc.xml rename to src/Microsoft.ML.StandardTrainers/Standard/LogisticRegression/doc.xml diff --git a/src/Microsoft.ML.StandardLearners/Standard/ModelStatistics.cs b/src/Microsoft.ML.StandardTrainers/Standard/ModelStatistics.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/ModelStatistics.cs rename to src/Microsoft.ML.StandardTrainers/Standard/ModelStatistics.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs b/src/Microsoft.ML.StandardTrainers/Standard/MultiClass/MetaMulticlassTrainer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs rename to src/Microsoft.ML.StandardTrainers/Standard/MultiClass/MetaMulticlassTrainer.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MultiClassNaiveBayesTrainer.cs b/src/Microsoft.ML.StandardTrainers/Standard/MultiClass/MultiClassNaiveBayesTrainer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/MultiClass/MultiClassNaiveBayesTrainer.cs rename to src/Microsoft.ML.StandardTrainers/Standard/MultiClass/MultiClassNaiveBayesTrainer.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/OneVersusAllTrainer.cs b/src/Microsoft.ML.StandardTrainers/Standard/MultiClass/OneVersusAllTrainer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/MultiClass/OneVersusAllTrainer.cs rename to src/Microsoft.ML.StandardTrainers/Standard/MultiClass/OneVersusAllTrainer.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/PairwiseCouplingTrainer.cs b/src/Microsoft.ML.StandardTrainers/Standard/MultiClass/PairwiseCouplingTrainer.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/MultiClass/PairwiseCouplingTrainer.cs rename to src/Microsoft.ML.StandardTrainers/Standard/MultiClass/PairwiseCouplingTrainer.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/doc.xml b/src/Microsoft.ML.StandardTrainers/Standard/MultiClass/doc.xml similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/MultiClass/doc.xml rename to src/Microsoft.ML.StandardTrainers/Standard/MultiClass/doc.xml diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedLinear.cs b/src/Microsoft.ML.StandardTrainers/Standard/Online/AveragedLinear.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/Online/AveragedLinear.cs rename to src/Microsoft.ML.StandardTrainers/Standard/Online/AveragedLinear.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs b/src/Microsoft.ML.StandardTrainers/Standard/Online/AveragedPerceptron.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs rename to src/Microsoft.ML.StandardTrainers/Standard/Online/AveragedPerceptron.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs b/src/Microsoft.ML.StandardTrainers/Standard/Online/LinearSvm.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs rename to src/Microsoft.ML.StandardTrainers/Standard/Online/LinearSvm.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineGradientDescent.cs b/src/Microsoft.ML.StandardTrainers/Standard/Online/OnlineGradientDescent.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/Online/OnlineGradientDescent.cs rename to src/Microsoft.ML.StandardTrainers/Standard/Online/OnlineGradientDescent.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs b/src/Microsoft.ML.StandardTrainers/Standard/Online/OnlineLinear.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs rename to src/Microsoft.ML.StandardTrainers/Standard/Online/OnlineLinear.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/doc.xml b/src/Microsoft.ML.StandardTrainers/Standard/Online/doc.xml similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/Online/doc.xml rename to src/Microsoft.ML.StandardTrainers/Standard/Online/doc.xml diff --git a/src/Microsoft.ML.StandardLearners/Standard/PoissonRegression/PoissonRegression.cs b/src/Microsoft.ML.StandardTrainers/Standard/PoissonRegression/PoissonRegression.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/PoissonRegression/PoissonRegression.cs rename to src/Microsoft.ML.StandardTrainers/Standard/PoissonRegression/PoissonRegression.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/PoissonRegression/doc.xml b/src/Microsoft.ML.StandardTrainers/Standard/PoissonRegression/doc.xml similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/PoissonRegression/doc.xml rename to src/Microsoft.ML.StandardTrainers/Standard/PoissonRegression/doc.xml diff --git a/src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs b/src/Microsoft.ML.StandardTrainers/Standard/SdcaBinary.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/SdcaBinary.cs rename to src/Microsoft.ML.StandardTrainers/Standard/SdcaBinary.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/SdcaMultiClass.cs b/src/Microsoft.ML.StandardTrainers/Standard/SdcaMultiClass.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/SdcaMultiClass.cs rename to src/Microsoft.ML.StandardTrainers/Standard/SdcaMultiClass.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/SdcaRegression.cs b/src/Microsoft.ML.StandardTrainers/Standard/SdcaRegression.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/SdcaRegression.cs rename to src/Microsoft.ML.StandardTrainers/Standard/SdcaRegression.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/Simple/SimpleTrainers.cs b/src/Microsoft.ML.StandardTrainers/Standard/Simple/SimpleTrainers.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/Simple/SimpleTrainers.cs rename to src/Microsoft.ML.StandardTrainers/Standard/Simple/SimpleTrainers.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs b/src/Microsoft.ML.StandardTrainers/Standard/StochasticTrainerBase.cs similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/StochasticTrainerBase.cs rename to src/Microsoft.ML.StandardTrainers/Standard/StochasticTrainerBase.cs diff --git a/src/Microsoft.ML.StandardLearners/Standard/doc.xml b/src/Microsoft.ML.StandardTrainers/Standard/doc.xml similarity index 100% rename from src/Microsoft.ML.StandardLearners/Standard/doc.xml rename to src/Microsoft.ML.StandardTrainers/Standard/doc.xml diff --git a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs b/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs similarity index 99% rename from src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs rename to src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs index 2e64b87302..e0d8900a31 100644 --- a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs +++ b/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs @@ -14,7 +14,7 @@ namespace Microsoft.ML /// /// TrainerEstimator extension methods. /// - public static class StandardLearnersCatalog + public static class StandardTrainersCatalog { /// /// Predict a target using a linear classification model trained with . diff --git a/src/Microsoft.ML.StaticPipe/Microsoft.ML.StaticPipe.csproj b/src/Microsoft.ML.StaticPipe/Microsoft.ML.StaticPipe.csproj index c97abb5357..7669ba03ec 100644 --- a/src/Microsoft.ML.StaticPipe/Microsoft.ML.StaticPipe.csproj +++ b/src/Microsoft.ML.StaticPipe/Microsoft.ML.StaticPipe.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.ML.Transforms/LearnerFeatureSelection.cs b/src/Microsoft.ML.Transforms/LearnerFeatureSelection.cs index 1bcea554d6..432a3e07ae 100644 --- a/src/Microsoft.ML.Transforms/LearnerFeatureSelection.cs +++ b/src/Microsoft.ML.Transforms/LearnerFeatureSelection.cs @@ -41,7 +41,7 @@ public sealed class Options [Argument(ArgumentType.Multiple, HelpText = "Filter", ShortName = "f", SortOrder = 1, SignatureType = typeof(SignatureFeatureScorerTrainer))] public IComponentFactory>> Filter = ComponentFactoryUtils.CreateFromFunction(env => - // ML.Transforms doesn't have a direct reference to ML.StandardLearners, so use ComponentCatalog to create the Filter + // ML.Transforms doesn't have a direct reference to ML.StandardTrainers, so use ComponentCatalog to create the Filter ComponentCatalog.CreateInstance>>(env, typeof(SignatureFeatureScorerTrainer), "SDCA", options: null)); [Argument(ArgumentType.LastOccurenceWins, HelpText = "Column to use for features", ShortName = "feat,col", SortOrder = 3, Purpose = SpecialPurpose.ColumnName)] diff --git a/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj b/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj index 81516c3eb8..1de7ce7ac6 100644 --- a/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj +++ b/test/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj @@ -17,7 +17,7 @@ - + diff --git a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj index 927cbc77ee..04483bd4a0 100644 --- a/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj +++ b/test/Microsoft.ML.Core.Tests/Microsoft.ML.Core.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/test/Microsoft.ML.FSharp.Tests/SmokeTests.fs b/test/Microsoft.ML.FSharp.Tests/SmokeTests.fs index bf5d85fcb7..103971663b 100644 --- a/test/Microsoft.ML.FSharp.Tests/SmokeTests.fs +++ b/test/Microsoft.ML.FSharp.Tests/SmokeTests.fs @@ -33,7 +33,7 @@ #r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/Microsoft.ML.Api.dll" #r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/Microsoft.ML.Sweeper.dll" #r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/Microsoft.ML.dll" -#r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/Microsoft.ML.StandardLearners.dll" +#r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/Microsoft.ML.StandardTrainers.dll" #r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/Microsoft.ML.PipelineInference.dll" #r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/xunit.core.dll" #r @"../../bin/AnyCPU.Debug/Microsoft.ML.FSharp.Tests/net461/xunit.assert.dll" diff --git a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj index 6d5b61350d..c5a7ebc9b6 100644 --- a/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj +++ b/test/Microsoft.ML.Functional.Tests/Microsoft.ML.Functional.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj index 1717f87de8..b26974c1fe 100644 --- a/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj +++ b/test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Microsoft.ML.StaticPipelineTesting/Microsoft.ML.StaticPipelineTesting.csproj b/test/Microsoft.ML.StaticPipelineTesting/Microsoft.ML.StaticPipelineTesting.csproj index ae2a57565c..53e4ec776e 100644 --- a/test/Microsoft.ML.StaticPipelineTesting/Microsoft.ML.StaticPipelineTesting.csproj +++ b/test/Microsoft.ML.StaticPipelineTesting/Microsoft.ML.StaticPipelineTesting.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs b/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs index a8af2ec4c6..60292566b7 100644 --- a/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs +++ b/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs @@ -18,7 +18,7 @@ public static TEnvironment AddStandardComponents(this TEnvironment where TEnvironment : IHostEnvironment { env.ComponentCatalog.RegisterAssembly(typeof(TextLoader).Assembly); // ML.Data - env.ComponentCatalog.RegisterAssembly(typeof(LinearModelParameters).Assembly); // ML.StandardLearners + env.ComponentCatalog.RegisterAssembly(typeof(LinearModelParameters).Assembly); // ML.StandardTrainers env.ComponentCatalog.RegisterAssembly(typeof(OneHotEncodingTransformer).Assembly); // ML.Transforms env.ComponentCatalog.RegisterAssembly(typeof(FastTreeBinaryModelParameters).Assembly); // ML.FastTree env.ComponentCatalog.RegisterAssembly(typeof(EnsembleModelParameters).Assembly); // ML.Ensemble diff --git a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj index d24892a1a8..1f13552b00 100644 --- a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj +++ b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj index 383e0aef24..9ca4fa0df0 100644 --- a/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj +++ b/test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj @@ -19,7 +19,7 @@ - +