From 330b6acb2783a8b96a7b866c11b9947d4446c3f8 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Tue, 26 Feb 2019 23:08:57 -0800 Subject: [PATCH 1/4] folding: Microsoft.Ml.Transforms.Normalizers Microsoft.Ml.Transforms.Categoricals Microsoft.Ml.Transforms.Conversions Microsoft.Ml.Transforms.Projections into Microsoft.Ml.Transforms --- .../Microsoft.ML.Samples/Dynamic/KeyToValueValueToKey.cs | 2 +- docs/samples/Microsoft.ML.Samples/Dynamic/Normalizer.cs | 2 +- .../Microsoft.ML.Samples/Dynamic/ProjectionTransforms.cs | 2 +- .../Dynamic/Trainers/BinaryClassification/LightGbm.cs | 2 +- .../Dynamic/Transforms/Projection/VectorWhiten.cs | 2 +- .../Transforms/Projection/VectorWhitenWithColumnOptions.cs | 4 ++-- .../Dynamic/ValueMappingStringToArray.cs | 2 -- .../Dynamic/ValueMappingStringToKeyType.cs | 2 -- src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs | 1 - src/Microsoft.ML.Data/Commands/TrainCommand.cs | 2 +- src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs | 3 +-- src/Microsoft.ML.Data/Evaluators/EvaluatorUtils.cs | 1 - .../Evaluators/MultiClassClassifierEvaluator.cs | 2 -- src/Microsoft.ML.Data/TrainCatalog.cs | 1 - src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs | 2 +- .../Transforms/ConversionsExtensionsCatalog.cs | 2 +- src/Microsoft.ML.Data/Transforms/ExplainabilityCatalog.cs | 1 + .../Transforms/FeatureContributionCalculationTransformer.cs | 4 ++-- src/Microsoft.ML.Data/Transforms/Hashing.cs | 5 ++--- src/Microsoft.ML.Data/Transforms/InvertHashUtils.cs | 1 - src/Microsoft.ML.Data/Transforms/KeyToValue.cs | 5 ++--- src/Microsoft.ML.Data/Transforms/KeyToVector.cs | 5 ++--- src/Microsoft.ML.Data/Transforms/NormalizeColumn.cs | 5 ++--- src/Microsoft.ML.Data/Transforms/NormalizeColumnDbl.cs | 3 +-- src/Microsoft.ML.Data/Transforms/NormalizeColumnSng.cs | 3 +-- src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs | 3 +-- src/Microsoft.ML.Data/Transforms/Normalizer.cs | 5 ++--- src/Microsoft.ML.Data/Transforms/NormalizerCatalog.cs | 2 +- src/Microsoft.ML.Data/Transforms/OneToOneTransformerBase.cs | 1 - src/Microsoft.ML.Data/Transforms/PerGroupTransformBase.cs | 1 - .../Transforms/SlotsDroppingTransformer.cs | 5 ++--- src/Microsoft.ML.Data/Transforms/TransformBase.cs | 1 - src/Microsoft.ML.Data/Transforms/TypeConverting.cs | 5 ++--- src/Microsoft.ML.Data/Transforms/ValueMapping.cs | 5 ++--- .../Transforms/ValueToKeyMappingEstimator.cs | 2 +- .../Transforms/ValueToKeyMappingTransformer.cs | 5 ++--- .../Transforms/ValueToKeyMappingTransformerImpl.cs | 3 +-- src/Microsoft.ML.Data/Utilities/TypeParsingUtils.cs | 2 +- src/Microsoft.ML.EntryPoints/FeatureCombiner.cs | 2 +- src/Microsoft.ML.EntryPoints/TrainTestSplit.cs | 1 - src/Microsoft.ML.FastTree/FastTree.cs | 1 - src/Microsoft.ML.FastTree/GamModelParameters.cs | 1 + .../VectorWhiteningStaticExtensions.cs | 2 +- src/Microsoft.ML.HalLearners/HalLearnersCatalog.cs | 3 +-- src/Microsoft.ML.HalLearners/VectorWhitening.cs | 5 ++--- src/Microsoft.ML.PCA/PCACatalog.cs | 2 +- src/Microsoft.ML.PCA/PcaTransformer.cs | 4 ++-- .../Standard/LinearModelParameters.cs | 1 + .../CategoricalHashStaticExtensions.cs | 2 +- src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs | 3 +-- src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs | 2 +- src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs | 2 +- src/Microsoft.ML.StaticPipe/TermStaticExtensions.cs | 2 +- src/Microsoft.ML.StaticPipe/TermStaticExtensions.tt | 2 +- src/Microsoft.ML.StaticPipe/TransformsStatic.cs | 2 -- src/Microsoft.ML.Transforms/CategoricalCatalog.cs | 2 +- src/Microsoft.ML.Transforms/ConversionsCatalog.cs | 2 +- src/Microsoft.ML.Transforms/EntryPoints/TextAnalytics.cs | 1 - src/Microsoft.ML.Transforms/FourierDistributionSampler.cs | 5 ++--- src/Microsoft.ML.Transforms/GcnTransform.cs | 5 ++--- src/Microsoft.ML.Transforms/HashJoiningTransform.cs | 5 ++--- src/Microsoft.ML.Transforms/KeyToVectorMapping.cs | 5 ++--- .../MissingValueHandlingTransformer.cs | 1 - src/Microsoft.ML.Transforms/OneHotEncoding.cs | 5 ++--- src/Microsoft.ML.Transforms/OneHotHashEncoding.cs | 6 ++---- src/Microsoft.ML.Transforms/ProjectionCatalog.cs | 2 +- src/Microsoft.ML.Transforms/RandomFourierFeaturizing.cs | 4 ++-- .../Text/TextFeaturizingEstimator.cs | 2 -- src/Microsoft.ML.Transforms/Text/WordBagTransform.cs | 1 - .../Text/WordHashBagProducingTransform.cs | 1 - src/Microsoft.ML.Transforms/doc.xml | 6 +++--- test/Microsoft.ML.Benchmarks/HashBench.cs | 2 +- test/Microsoft.ML.Benchmarks/Numeric/Ranking.cs | 2 +- test/Microsoft.ML.Benchmarks/RffTransform.cs | 2 +- .../Text/MultiClassClassification.cs | 2 +- test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs | 5 ----- test/Microsoft.ML.StaticPipelineTesting/StaticPipeTests.cs | 1 - test/Microsoft.ML.TestFramework/DataPipe/TestDataPipe.cs | 2 -- test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs | 2 +- test/Microsoft.ML.Tests/CachingTests.cs | 4 ++-- test/Microsoft.ML.Tests/FeatureContributionTests.cs | 1 + test/Microsoft.ML.Tests/OnnxConversionTest.cs | 4 ++-- .../Scenarios/Api/CookbookSamples/CookbookSamples.cs | 1 - .../Api/CookbookSamples/CookbookSamplesDynamicApi.cs | 2 -- .../Scenarios/Api/Estimators/DecomposableTrainAndPredict.cs | 1 - .../Scenarios/Api/Estimators/Extensibility.cs | 1 - .../Scenarios/Api/Estimators/Metacomponents.cs | 1 - test/Microsoft.ML.Tests/Scenarios/TensorflowTests.cs | 1 - .../ScenariosWithDirectInstantiation/TensorflowTests.cs | 1 - test/Microsoft.ML.Tests/TermEstimatorTests.cs | 2 +- .../TrainerEstimators/MetalinearEstimators.cs | 1 - .../TrainerEstimators/TrainerEstimators.cs | 2 +- test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs | 2 +- .../Microsoft.ML.Tests/Transformers/CategoricalHashTests.cs | 2 -- test/Microsoft.ML.Tests/Transformers/CategoricalTests.cs | 2 -- test/Microsoft.ML.Tests/Transformers/ConvertTests.cs | 3 +-- .../Transformers/CopyColumnEstimatorTests.cs | 1 - test/Microsoft.ML.Tests/Transformers/HashTests.cs | 2 +- .../Transformers/KeyToBinaryVectorEstimatorTest.cs | 2 +- test/Microsoft.ML.Tests/Transformers/KeyToValueTests.cs | 1 - .../Transformers/KeyToVectorEstimatorTests.cs | 2 +- test/Microsoft.ML.Tests/Transformers/NAIndicatorTests.cs | 3 --- test/Microsoft.ML.Tests/Transformers/NormalizerTests.cs | 2 -- test/Microsoft.ML.Tests/Transformers/RffTests.cs | 1 - test/Microsoft.ML.Tests/Transformers/TextFeaturizerTests.cs | 1 - test/Microsoft.ML.Tests/Transformers/ValueMappingTests.cs | 3 +-- 106 files changed, 93 insertions(+), 168 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/KeyToValueValueToKey.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/KeyToValueValueToKey.cs index 28e5fc918e..84bd0017b7 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/KeyToValueValueToKey.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/KeyToValueValueToKey.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML.Samples.Dynamic { diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Normalizer.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Normalizer.cs index 7a97c318fb..91278f5d04 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Normalizer.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Normalizer.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Normalizers; +using Microsoft.ML.Transforms; namespace Microsoft.ML.Samples.Dynamic { diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/ProjectionTransforms.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/ProjectionTransforms.cs index 7bd5a41f36..a93c24a2eb 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/ProjectionTransforms.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/ProjectionTransforms.cs @@ -55,7 +55,7 @@ public static void Example() //0.165 0.117 -0.547 0.014 // A pipeline to project Features column into L-p normalized vector. - var lpNormalizePipeline = ml.Transforms.Projection.LpNormalize(nameof(SamplesUtils.DatasetUtils.SampleVectorOfNumbersData.Features), normKind: Transforms.Projections.LpNormalizingEstimatorBase.NormalizerKind.L1Norm); + var lpNormalizePipeline = ml.Transforms.Projection.LpNormalize(nameof(SamplesUtils.DatasetUtils.SampleVectorOfNumbersData.Features), normKind: Transforms.LpNormalizingEstimatorBase.NormalizerKind.L1Norm); // The transformed (projected) data. transformedData = lpNormalizePipeline.Fit(trainData).Transform(trainData); // Getting the data of the newly created column, so we can preview it. diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/LightGbm.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/LightGbm.cs index a6834d0082..1d9e485b31 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/LightGbm.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/LightGbm.cs @@ -1,4 +1,4 @@ -using Microsoft.ML.Transforms.Categorical; +using Microsoft.ML.Transforms; namespace Microsoft.ML.Samples.Dynamic.Trainers.BinaryClassification { diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs index 538af5d6eb..2600aeee5b 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhiten.cs @@ -41,7 +41,7 @@ public static void Example() // A pipeline to project Features column into white noise vector. var whiteningPipeline = ml.Transforms.Projection.VectorWhiten(nameof(SamplesUtils.DatasetUtils.SampleVectorOfNumbersData.Features), - kind: Transforms.Projections.WhiteningKind.Zca); + kind: Transforms.WhiteningKind.Zca); // The transformed (projected) data. var transformedData = whiteningPipeline.Fit(trainData).Transform(trainData); // Getting the data of the newly created column, so we can preview it. diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs index 9b4de2274d..e29f3e5d07 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Projection/VectorWhitenWithColumnOptions.cs @@ -39,8 +39,8 @@ public static void Example() // A pipeline to project Features column into white noise vector. - var whiteningPipeline = ml.Transforms.Projection.VectorWhiten(new Transforms.Projections.VectorWhiteningEstimator.ColumnOptions( - nameof(SamplesUtils.DatasetUtils.SampleVectorOfNumbersData.Features), kind: Transforms.Projections.WhiteningKind.Pca, pcaNum: 4)); + var whiteningPipeline = ml.Transforms.Projection.VectorWhiten(new Transforms.VectorWhiteningEstimator.ColumnOptions( + nameof(SamplesUtils.DatasetUtils.SampleVectorOfNumbersData.Features), kind: Transforms.WhiteningKind.Pca, pcaNum: 4)); // The transformed (projected) data. var transformedData = whiteningPipeline.Fit(trainData).Transform(trainData); // Getting the data of the newly created column, so we can preview it. diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToArray.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToArray.cs index 0074e604fd..b3ede112c4 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToArray.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToArray.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using Microsoft.Data.DataView; -using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Conversions; namespace Microsoft.ML.Samples.Dynamic { diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToKeyType.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToKeyType.cs index e014bb6ae9..0c77474670 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToKeyType.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/ValueMappingStringToKeyType.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using Microsoft.Data.DataView; -using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Conversions; namespace Microsoft.ML.Samples.Dynamic { diff --git a/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs b/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs index bb27b1376c..64190db69c 100644 --- a/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs +++ b/src/Microsoft.ML.Data/Commands/CrossValidationCommand.cs @@ -15,7 +15,6 @@ using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; [assembly: LoadableClass(typeof(CrossValidationCommand), typeof(CrossValidationCommand.Arguments), typeof(SignatureCommand), "Cross Validation", CrossValidationCommand.LoadName)] diff --git a/src/Microsoft.ML.Data/Commands/TrainCommand.cs b/src/Microsoft.ML.Data/Commands/TrainCommand.cs index 28a641c2a9..129629cc19 100644 --- a/src/Microsoft.ML.Data/Commands/TrainCommand.cs +++ b/src/Microsoft.ML.Data/Commands/TrainCommand.cs @@ -15,7 +15,7 @@ using Microsoft.ML.Data.IO; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Normalizers; +using Microsoft.ML.Transforms; [assembly: LoadableClass(TrainCommand.Summary, typeof(TrainCommand), typeof(TrainCommand.Arguments), typeof(SignatureCommand), "Train Predictor", "Train")] diff --git a/src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs index b34fbeaa33..a825554bf7 100644 --- a/src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs +++ b/src/Microsoft.ML.Data/Evaluators/ClusteringEvaluator.cs @@ -11,9 +11,8 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Numeric; -using Microsoft.ML.Transforms.FeatureSelection; +using Microsoft.ML.Transforms; [assembly: LoadableClass(typeof(ClusteringEvaluator), typeof(ClusteringEvaluator), typeof(ClusteringEvaluator.Arguments), typeof(SignatureEvaluator), "Clustering Evaluator", ClusteringEvaluator.LoadName, "Clustering")] diff --git a/src/Microsoft.ML.Data/Evaluators/EvaluatorUtils.cs b/src/Microsoft.ML.Data/Evaluators/EvaluatorUtils.cs index fb2c6a1517..709ed0257e 100644 --- a/src/Microsoft.ML.Data/Evaluators/EvaluatorUtils.cs +++ b/src/Microsoft.ML.Data/Evaluators/EvaluatorUtils.cs @@ -12,7 +12,6 @@ using Microsoft.ML.Data.IO; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; namespace Microsoft.ML.Data { diff --git a/src/Microsoft.ML.Data/Evaluators/MultiClassClassifierEvaluator.cs b/src/Microsoft.ML.Data/Evaluators/MultiClassClassifierEvaluator.cs index fc39907760..8df06099b6 100644 --- a/src/Microsoft.ML.Data/Evaluators/MultiClassClassifierEvaluator.cs +++ b/src/Microsoft.ML.Data/Evaluators/MultiClassClassifierEvaluator.cs @@ -12,9 +12,7 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.FeatureSelection; [assembly: LoadableClass(typeof(MultiClassClassifierEvaluator), typeof(MultiClassClassifierEvaluator), typeof(MultiClassClassifierEvaluator.Arguments), typeof(SignatureEvaluator), "Multi-Class Classifier Evaluator", MultiClassClassifierEvaluator.LoadName, "MultiClassClassifier", "MultiClass")] diff --git a/src/Microsoft.ML.Data/TrainCatalog.cs b/src/Microsoft.ML.Data/TrainCatalog.cs index c3b7f7bd99..423aeabace 100644 --- a/src/Microsoft.ML.Data/TrainCatalog.cs +++ b/src/Microsoft.ML.Data/TrainCatalog.cs @@ -7,7 +7,6 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs b/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs index 613021ff37..9f32ed758f 100644 --- a/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs +++ b/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs @@ -10,7 +10,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.CommandLine; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML.Data { diff --git a/src/Microsoft.ML.Data/Transforms/ConversionsExtensionsCatalog.cs b/src/Microsoft.ML.Data/Transforms/ConversionsExtensionsCatalog.cs index 21b6ff4fd2..5c16779443 100644 --- a/src/Microsoft.ML.Data/Transforms/ConversionsExtensionsCatalog.cs +++ b/src/Microsoft.ML.Data/Transforms/ConversionsExtensionsCatalog.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Data/Transforms/ExplainabilityCatalog.cs b/src/Microsoft.ML.Data/Transforms/ExplainabilityCatalog.cs index c4ace428e6..5ce76a680a 100644 --- a/src/Microsoft.ML.Data/Transforms/ExplainabilityCatalog.cs +++ b/src/Microsoft.ML.Data/Transforms/ExplainabilityCatalog.cs @@ -4,6 +4,7 @@ using Microsoft.ML.Data; using Microsoft.ML.Model; +using Microsoft.ML.Transforms; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Data/Transforms/FeatureContributionCalculationTransformer.cs b/src/Microsoft.ML.Data/Transforms/FeatureContributionCalculationTransformer.cs index d218f8cb0c..fa8a83d935 100644 --- a/src/Microsoft.ML.Data/Transforms/FeatureContributionCalculationTransformer.cs +++ b/src/Microsoft.ML.Data/Transforms/FeatureContributionCalculationTransformer.cs @@ -10,9 +10,9 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; +using Microsoft.ML.Transforms; [assembly: LoadableClass(FeatureContributionCalculatingTransformer.Summary, typeof(FeatureContributionCalculatingTransformer), null, typeof(SignatureLoadModel), FeatureContributionCalculatingTransformer.FriendlyName, FeatureContributionCalculatingTransformer.LoaderSignature)] @@ -22,7 +22,7 @@ [assembly: LoadableClass(typeof(void), typeof(FeatureContributionEntryPoint), null, typeof(SignatureEntryPointModule), FeatureContributionCalculatingTransformer.LoaderSignature)] -namespace Microsoft.ML.Data +namespace Microsoft.ML.Transforms { /// /// The FeatureContributionCalculationTransformer computes model-specific per-feature contributions to the score of each example. diff --git a/src/Microsoft.ML.Data/Transforms/Hashing.cs b/src/Microsoft.ML.Data/Transforms/Hashing.cs index 174c5f2e0a..089d7b2792 100644 --- a/src/Microsoft.ML.Data/Transforms/Hashing.cs +++ b/src/Microsoft.ML.Data/Transforms/Hashing.cs @@ -12,8 +12,7 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(HashingTransformer.Summary, typeof(IDataTransform), typeof(HashingTransformer), typeof(HashingTransformer.Options), typeof(SignatureDataTransform), "Hash Transform", "HashTransform", "Hash", DocName = "transform/HashTransform.md")] @@ -27,7 +26,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(HashingTransformer), null, typeof(SignatureLoadRowMapper), "Hash Transform", HashingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { /// /// This transformer can hash either single valued columns or vector columns. For vector columns, diff --git a/src/Microsoft.ML.Data/Transforms/InvertHashUtils.cs b/src/Microsoft.ML.Data/Transforms/InvertHashUtils.cs index db579c1b4e..c87d1d6b72 100644 --- a/src/Microsoft.ML.Data/Transforms/InvertHashUtils.cs +++ b/src/Microsoft.ML.Data/Transforms/InvertHashUtils.cs @@ -9,7 +9,6 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data.IO; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; namespace Microsoft.ML.Data { diff --git a/src/Microsoft.ML.Data/Transforms/KeyToValue.cs b/src/Microsoft.ML.Data/Transforms/KeyToValue.cs index 160a21ddad..f374735e2a 100644 --- a/src/Microsoft.ML.Data/Transforms/KeyToValue.cs +++ b/src/Microsoft.ML.Data/Transforms/KeyToValue.cs @@ -13,9 +13,8 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Model.Pfa; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Newtonsoft.Json.Linq; [assembly: LoadableClass(typeof(IDataTransform), typeof(KeyToValueMappingTransformer), typeof(KeyToValueMappingTransformer.Options), typeof(SignatureDataTransform), @@ -30,7 +29,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(KeyToValueMappingTransformer), null, typeof(SignatureLoadRowMapper), KeyToValueMappingTransformer.UserName, KeyToValueMappingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { /// /// KeyToValueTransform utilizes KeyValues metadata to map key indices to the corresponding values in the KeyValues metadata. diff --git a/src/Microsoft.ML.Data/Transforms/KeyToVector.cs b/src/Microsoft.ML.Data/Transforms/KeyToVector.cs index 3c9afe60d2..c065a198c0 100644 --- a/src/Microsoft.ML.Data/Transforms/KeyToVector.cs +++ b/src/Microsoft.ML.Data/Transforms/KeyToVector.cs @@ -11,10 +11,9 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Newtonsoft.Json.Linq; [assembly: LoadableClass(KeyToVectorMappingTransformer.Summary, typeof(IDataTransform), typeof(KeyToVectorMappingTransformer), typeof(KeyToVectorMappingTransformer.Options), typeof(SignatureDataTransform), @@ -29,7 +28,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(KeyToVectorMappingTransformer), null, typeof(SignatureLoadRowMapper), KeyToVectorMappingTransformer.UserName, KeyToVectorMappingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { /// /// Converts the key types back to their original vectors. diff --git a/src/Microsoft.ML.Data/Transforms/NormalizeColumn.cs b/src/Microsoft.ML.Data/Transforms/NormalizeColumn.cs index df13b33afe..a372017d93 100644 --- a/src/Microsoft.ML.Data/Transforms/NormalizeColumn.cs +++ b/src/Microsoft.ML.Data/Transforms/NormalizeColumn.cs @@ -13,10 +13,9 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; -using Microsoft.ML.Transforms.Normalizers; +using Microsoft.ML.Transforms; using Newtonsoft.Json.Linq; [assembly: LoadableClass(NormalizeTransform.MinMaxNormalizerSummary, typeof(IDataTransform), typeof(NormalizeTransform), typeof(NormalizeTransform.MinMaxArguments), typeof(SignatureDataTransform), @@ -40,7 +39,7 @@ [assembly: LoadableClass(NormalizeTransform.BinNormalizerSummary, typeof(NormalizeTransform.BinColumnFunction), null, typeof(SignatureLoadColumnFunction), "Bin Normalizer", NormalizeTransform.BinColumnFunction.LoaderSignature)] -namespace Microsoft.ML.Transforms.Normalizers +namespace Microsoft.ML.Transforms { /// /// The normalize transform for support of normalization via the mechanism. diff --git a/src/Microsoft.ML.Data/Transforms/NormalizeColumnDbl.cs b/src/Microsoft.ML.Data/Transforms/NormalizeColumnDbl.cs index 12a765b1a6..5061b9f2de 100644 --- a/src/Microsoft.ML.Data/Transforms/NormalizeColumnDbl.cs +++ b/src/Microsoft.ML.Data/Transforms/NormalizeColumnDbl.cs @@ -10,12 +10,11 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; using Newtonsoft.Json.Linq; -namespace Microsoft.ML.Transforms.Normalizers +namespace Microsoft.ML.Transforms { // !!! WARNING !!! // This file contains the Double version for normalizers and is almost identical with NormalizeColumnSng.cs diff --git a/src/Microsoft.ML.Data/Transforms/NormalizeColumnSng.cs b/src/Microsoft.ML.Data/Transforms/NormalizeColumnSng.cs index 8a5d33f53c..92341e0661 100644 --- a/src/Microsoft.ML.Data/Transforms/NormalizeColumnSng.cs +++ b/src/Microsoft.ML.Data/Transforms/NormalizeColumnSng.cs @@ -10,12 +10,11 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; using Newtonsoft.Json.Linq; -namespace Microsoft.ML.Transforms.Normalizers +namespace Microsoft.ML.Transforms { // !!! WARNING !!! // This file contains the Single version for normalizers and is almost identical with NormalizeColumnDbl.cs diff --git a/src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs b/src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs index ae81134ab3..a122625a12 100644 --- a/src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs +++ b/src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs @@ -8,10 +8,9 @@ using Microsoft.ML; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; -using Microsoft.ML.Transforms.Normalizers; +using Microsoft.ML.Transforms; using Newtonsoft.Json.Linq; [assembly: LoadableClass(typeof(void), typeof(Normalize), null, typeof(SignatureEntryPointModule), "Normalize")] diff --git a/src/Microsoft.ML.Data/Transforms/Normalizer.cs b/src/Microsoft.ML.Data/Transforms/Normalizer.cs index beb3af8004..a6f4178551 100644 --- a/src/Microsoft.ML.Data/Transforms/Normalizer.cs +++ b/src/Microsoft.ML.Data/Transforms/Normalizer.cs @@ -10,10 +10,9 @@ using Microsoft.Data.DataView; using Microsoft.ML; using Microsoft.ML.Data; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; -using Microsoft.ML.Transforms.Normalizers; +using Microsoft.ML.Transforms; using Newtonsoft.Json.Linq; [assembly: LoadableClass(typeof(NormalizingTransformer), null, typeof(SignatureLoadModel), @@ -25,7 +24,7 @@ [assembly: LoadableClass(typeof(IDataTransform), typeof(NormalizingTransformer), null, typeof(SignatureLoadDataTransform), "", NormalizingTransformer.LoaderSignature, "NormalizeTransform")] -namespace Microsoft.ML.Transforms.Normalizers +namespace Microsoft.ML.Transforms { public sealed class NormalizingEstimator : IEstimator { diff --git a/src/Microsoft.ML.Data/Transforms/NormalizerCatalog.cs b/src/Microsoft.ML.Data/Transforms/NormalizerCatalog.cs index 0c34ba805b..b7fe4681ba 100644 --- a/src/Microsoft.ML.Data/Transforms/NormalizerCatalog.cs +++ b/src/Microsoft.ML.Data/Transforms/NormalizerCatalog.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Normalizers; +using Microsoft.ML.Transforms; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Data/Transforms/OneToOneTransformerBase.cs b/src/Microsoft.ML.Data/Transforms/OneToOneTransformerBase.cs index 37cfb33792..2c1b767730 100644 --- a/src/Microsoft.ML.Data/Transforms/OneToOneTransformerBase.cs +++ b/src/Microsoft.ML.Data/Transforms/OneToOneTransformerBase.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using Microsoft.Data.DataView; -using Microsoft.ML.Model; namespace Microsoft.ML.Data { diff --git a/src/Microsoft.ML.Data/Transforms/PerGroupTransformBase.cs b/src/Microsoft.ML.Data/Transforms/PerGroupTransformBase.cs index 1fa08e024a..cdbc67355e 100644 --- a/src/Microsoft.ML.Data/Transforms/PerGroupTransformBase.cs +++ b/src/Microsoft.ML.Data/Transforms/PerGroupTransformBase.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Data.DataView; -using Microsoft.ML.Model; namespace Microsoft.ML.Data { diff --git a/src/Microsoft.ML.Data/Transforms/SlotsDroppingTransformer.cs b/src/Microsoft.ML.Data/Transforms/SlotsDroppingTransformer.cs index d1f879622c..041708f687 100644 --- a/src/Microsoft.ML.Data/Transforms/SlotsDroppingTransformer.cs +++ b/src/Microsoft.ML.Data/Transforms/SlotsDroppingTransformer.cs @@ -13,8 +13,7 @@ using Microsoft.ML.Data; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.FeatureSelection; +using Microsoft.ML.Transforms; [assembly: LoadableClass(SlotsDroppingTransformer.Summary, typeof(IDataTransform), typeof(SlotsDroppingTransformer), typeof(SlotsDroppingTransformer.Options), typeof(SignatureDataTransform), SlotsDroppingTransformer.FriendlyName, SlotsDroppingTransformer.LoaderSignature, "DropSlots")] @@ -28,7 +27,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(SlotsDroppingTransformer), null, typeof(SignatureLoadRowMapper), SlotsDroppingTransformer.FriendlyName, SlotsDroppingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.FeatureSelection +namespace Microsoft.ML.Transforms { /// /// Transform to drop slots from columns. If the column is scalar, the only slot that can be dropped is slot 0. diff --git a/src/Microsoft.ML.Data/Transforms/TransformBase.cs b/src/Microsoft.ML.Data/Transforms/TransformBase.cs index 8f8a79fe5b..97d6f55f92 100644 --- a/src/Microsoft.ML.Data/Transforms/TransformBase.cs +++ b/src/Microsoft.ML.Data/Transforms/TransformBase.cs @@ -8,7 +8,6 @@ using System.Reflection; using Microsoft.Data.DataView; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; using Newtonsoft.Json.Linq; diff --git a/src/Microsoft.ML.Data/Transforms/TypeConverting.cs b/src/Microsoft.ML.Data/Transforms/TypeConverting.cs index 95acff6789..8dcdfaf7f1 100644 --- a/src/Microsoft.ML.Data/Transforms/TypeConverting.cs +++ b/src/Microsoft.ML.Data/Transforms/TypeConverting.cs @@ -12,9 +12,8 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(TypeConvertingTransformer.Summary, typeof(IDataTransform), typeof(TypeConvertingTransformer), typeof(TypeConvertingTransformer.Options), typeof(SignatureDataTransform), TypeConvertingTransformer.UserName, TypeConvertingTransformer.ShortName, "ConvertTransform", DocName = "transform/ConvertTransform.md")] @@ -30,7 +29,7 @@ [assembly: EntryPointModule(typeof(TypeConversion))] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { internal static class TypeConversion { diff --git a/src/Microsoft.ML.Data/Transforms/ValueMapping.cs b/src/Microsoft.ML.Data/Transforms/ValueMapping.cs index 093834a99c..dee91c4a65 100644 --- a/src/Microsoft.ML.Data/Transforms/ValueMapping.cs +++ b/src/Microsoft.ML.Data/Transforms/ValueMapping.cs @@ -13,8 +13,7 @@ using Microsoft.ML.Data; using Microsoft.ML.Data.IO; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(ValueMappingTransformer.Summary, typeof(IDataTransform), typeof(ValueMappingTransformer), typeof(ValueMappingTransformer.Options), typeof(SignatureDataTransform), @@ -30,7 +29,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(ValueMappingTransformer), null, typeof(SignatureLoadRowMapper), ValueMappingTransformer.UserName, ValueMappingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { /// public class ValueMappingEstimator : TrivialEstimator diff --git a/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingEstimator.cs b/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingEstimator.cs index 3055c5b910..fb9240b60b 100644 --- a/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingEstimator.cs +++ b/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingEstimator.cs @@ -6,7 +6,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { /// public sealed class ValueToKeyMappingEstimator : IEstimator diff --git a/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformer.cs b/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformer.cs index 5441d3502a..71b61ef33d 100644 --- a/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformer.cs +++ b/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformer.cs @@ -15,10 +15,9 @@ using Microsoft.ML.Data.IO; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Newtonsoft.Json.Linq; [assembly: LoadableClass(ValueToKeyMappingTransformer.Summary, typeof(IDataTransform), typeof(ValueToKeyMappingTransformer), @@ -34,7 +33,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(ValueToKeyMappingTransformer), null, typeof(SignatureLoadRowMapper), ValueToKeyMappingTransformer.UserName, ValueToKeyMappingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { // TermTransform builds up term vocabularies (dictionaries). // Notes: diff --git a/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformerImpl.cs b/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformerImpl.cs index 337811014a..ae13468a80 100644 --- a/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformerImpl.cs +++ b/src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformerImpl.cs @@ -9,9 +9,8 @@ using Microsoft.ML.Data; using Microsoft.ML.Data.IO; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { public sealed partial class ValueToKeyMappingTransformer { diff --git a/src/Microsoft.ML.Data/Utilities/TypeParsingUtils.cs b/src/Microsoft.ML.Data/Utilities/TypeParsingUtils.cs index c3bc1e9491..bd460b20bf 100644 --- a/src/Microsoft.ML.Data/Utilities/TypeParsingUtils.cs +++ b/src/Microsoft.ML.Data/Utilities/TypeParsingUtils.cs @@ -6,7 +6,7 @@ using System.Text; using Microsoft.Data.DataView; using Microsoft.ML.CommandLine; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML.Data { diff --git a/src/Microsoft.ML.EntryPoints/FeatureCombiner.cs b/src/Microsoft.ML.EntryPoints/FeatureCombiner.cs index 8160ee1e2a..8b409da8c5 100644 --- a/src/Microsoft.ML.EntryPoints/FeatureCombiner.cs +++ b/src/Microsoft.ML.EntryPoints/FeatureCombiner.cs @@ -12,7 +12,7 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(typeof(void), typeof(FeatureCombiner), null, typeof(SignatureEntryPointModule), "FeatureCombiner")] diff --git a/src/Microsoft.ML.EntryPoints/TrainTestSplit.cs b/src/Microsoft.ML.EntryPoints/TrainTestSplit.cs index e1f41ae37e..844c462ff2 100644 --- a/src/Microsoft.ML.EntryPoints/TrainTestSplit.cs +++ b/src/Microsoft.ML.EntryPoints/TrainTestSplit.cs @@ -8,7 +8,6 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; [assembly: LoadableClass(typeof(void), typeof(TrainTestSplit), null, typeof(SignatureEntryPointModule), "TrainTestSplit")] diff --git a/src/Microsoft.ML.FastTree/FastTree.cs b/src/Microsoft.ML.FastTree/FastTree.cs index 240cf6d2cd..5acc742b81 100644 --- a/src/Microsoft.ML.FastTree/FastTree.cs +++ b/src/Microsoft.ML.FastTree/FastTree.cs @@ -21,7 +21,6 @@ using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Model.Pfa; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.TreePredictor; using Newtonsoft.Json.Linq; using Float = System.Single; diff --git a/src/Microsoft.ML.FastTree/GamModelParameters.cs b/src/Microsoft.ML.FastTree/GamModelParameters.cs index b84c9ae356..091de95de9 100644 --- a/src/Microsoft.ML.FastTree/GamModelParameters.cs +++ b/src/Microsoft.ML.FastTree/GamModelParameters.cs @@ -17,6 +17,7 @@ using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; using Microsoft.ML.Trainers.FastTree; +using Microsoft.ML.Transforms; [assembly: LoadableClass(typeof(GamModelParametersBase.VisualizationCommand), typeof(GamModelParametersBase.VisualizationCommand.Arguments), typeof(SignatureCommand), "GAM Vizualization Command", GamModelParametersBase.VisualizationCommand.LoadName, "gamviz", DocName = "command/GamViz.md")] diff --git a/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs b/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs index d67afd4754..c3bf58f560 100644 --- a/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs +++ b/src/Microsoft.ML.HalLearners.StaticPipe/VectorWhiteningStaticExtensions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.ML.StaticPipe; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; namespace Microsoft.ML.HalLearners.StaticPipe { diff --git a/src/Microsoft.ML.HalLearners/HalLearnersCatalog.cs b/src/Microsoft.ML.HalLearners/HalLearnersCatalog.cs index b92b8cfb8e..b3b8387184 100644 --- a/src/Microsoft.ML.HalLearners/HalLearnersCatalog.cs +++ b/src/Microsoft.ML.HalLearners/HalLearnersCatalog.cs @@ -3,9 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.EntryPoints; using Microsoft.ML.Trainers.HalLearners; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.HalLearners/VectorWhitening.cs b/src/Microsoft.ML.HalLearners/VectorWhitening.cs index f564dda364..02b2d15260 100644 --- a/src/Microsoft.ML.HalLearners/VectorWhitening.cs +++ b/src/Microsoft.ML.HalLearners/VectorWhitening.cs @@ -14,8 +14,7 @@ using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; [assembly: LoadableClass(VectorWhiteningTransformer.Summary, typeof(IDataTransform), typeof(VectorWhiteningTransformer), typeof(VectorWhiteningTransformer.Options), typeof(SignatureDataTransform), VectorWhiteningTransformer.FriendlyName, VectorWhiteningTransformer.LoaderSignature, "Whitening")] @@ -29,7 +28,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(VectorWhiteningTransformer), null, typeof(SignatureLoadRowMapper), VectorWhiteningTransformer.FriendlyName, VectorWhiteningTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Projections +namespace Microsoft.ML.Transforms { /// /// Which vector whitening technique to use. ZCA whitening ensures that the average covariance between whitened diff --git a/src/Microsoft.ML.PCA/PCACatalog.cs b/src/Microsoft.ML.PCA/PCACatalog.cs index d410122077..49c8c9ceef 100644 --- a/src/Microsoft.ML.PCA/PCACatalog.cs +++ b/src/Microsoft.ML.PCA/PCACatalog.cs @@ -4,7 +4,7 @@ using Microsoft.ML.Data; using Microsoft.ML.Trainers.PCA; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; using static Microsoft.ML.Trainers.PCA.RandomizedPcaTrainer; namespace Microsoft.ML diff --git a/src/Microsoft.ML.PCA/PcaTransformer.cs b/src/Microsoft.ML.PCA/PcaTransformer.cs index fcab7e2b7c..b05cf20895 100644 --- a/src/Microsoft.ML.PCA/PcaTransformer.cs +++ b/src/Microsoft.ML.PCA/PcaTransformer.cs @@ -14,7 +14,7 @@ using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; using Microsoft.ML.Numeric; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; [assembly: LoadableClass(PrincipalComponentAnalysisTransformer.Summary, typeof(IDataTransform), typeof(PrincipalComponentAnalysisTransformer), typeof(PrincipalComponentAnalysisTransformer.Options), typeof(SignatureDataTransform), PrincipalComponentAnalysisTransformer.UserName, PrincipalComponentAnalysisTransformer.LoaderSignature, PrincipalComponentAnalysisTransformer.ShortName)] @@ -30,7 +30,7 @@ [assembly: LoadableClass(typeof(void), typeof(PrincipalComponentAnalysisTransformer), null, typeof(SignatureEntryPointModule), PrincipalComponentAnalysisTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Projections +namespace Microsoft.ML.Transforms { /// public sealed class PrincipalComponentAnalysisTransformer : OneToOneTransformerBase diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs b/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs index 366bea0b11..3b56c40106 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LinearModelParameters.cs @@ -18,6 +18,7 @@ using Microsoft.ML.Model.Pfa; using Microsoft.ML.Numeric; using Microsoft.ML.Trainers; +using Microsoft.ML.Transforms; using Newtonsoft.Json.Linq; // This is for deserialization from a model repository. diff --git a/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs index a80f91a208..b1ae24d105 100644 --- a/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/CategoricalHashStaticExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Microsoft.ML.Transforms.Categorical; +using Microsoft.ML.Transforms; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs index e6691f0674..90196520e3 100644 --- a/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/CategoricalStaticExtensions.cs @@ -4,8 +4,7 @@ using System; using System.Collections.Generic; -using Microsoft.ML.Transforms.Categorical; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using static Microsoft.ML.StaticPipe.TermStaticExtensions; namespace Microsoft.ML.StaticPipe diff --git a/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs index dc774b06e6..cc722ba3d4 100644 --- a/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/LpNormalizerStaticExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs index 41b7e4f3cc..87be3e1e2c 100644 --- a/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/NormalizerStaticExtensions.cs @@ -7,7 +7,7 @@ using System.Collections.Immutable; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Transforms.Normalizers; +using Microsoft.ML.Transforms; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/TermStaticExtensions.cs b/src/Microsoft.ML.StaticPipe/TermStaticExtensions.cs index c18d47f45a..2e24884334 100644 --- a/src/Microsoft.ML.StaticPipe/TermStaticExtensions.cs +++ b/src/Microsoft.ML.StaticPipe/TermStaticExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/TermStaticExtensions.tt b/src/Microsoft.ML.StaticPipe/TermStaticExtensions.tt index a4c0409ec2..703a71d4ef 100644 --- a/src/Microsoft.ML.StaticPipe/TermStaticExtensions.tt +++ b/src/Microsoft.ML.StaticPipe/TermStaticExtensions.tt @@ -9,7 +9,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/TransformsStatic.cs b/src/Microsoft.ML.StaticPipe/TransformsStatic.cs index 8f37b7084f..543a98a16d 100644 --- a/src/Microsoft.ML.StaticPipe/TransformsStatic.cs +++ b/src/Microsoft.ML.StaticPipe/TransformsStatic.cs @@ -8,9 +8,7 @@ using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.Transforms.FeatureSelection; -using Microsoft.ML.Transforms.Projections; using Microsoft.ML.Transforms.Text; using static Microsoft.ML.Transforms.Text.TextFeaturizingEstimator; diff --git a/src/Microsoft.ML.Transforms/CategoricalCatalog.cs b/src/Microsoft.ML.Transforms/CategoricalCatalog.cs index 36ee0f83a9..3db44b57be 100644 --- a/src/Microsoft.ML.Transforms/CategoricalCatalog.cs +++ b/src/Microsoft.ML.Transforms/CategoricalCatalog.cs @@ -4,7 +4,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Categorical; +using Microsoft.ML.Transforms; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Transforms/ConversionsCatalog.cs b/src/Microsoft.ML.Transforms/ConversionsCatalog.cs index 0dc119a3f5..ae3b96a968 100644 --- a/src/Microsoft.ML.Transforms/ConversionsCatalog.cs +++ b/src/Microsoft.ML.Transforms/ConversionsCatalog.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Transforms/EntryPoints/TextAnalytics.cs b/src/Microsoft.ML.Transforms/EntryPoints/TextAnalytics.cs index 7959a59c92..daacdcfab7 100644 --- a/src/Microsoft.ML.Transforms/EntryPoints/TextAnalytics.cs +++ b/src/Microsoft.ML.Transforms/EntryPoints/TextAnalytics.cs @@ -5,7 +5,6 @@ using System.Linq; using Microsoft.ML; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.Transforms.Text; [assembly: LoadableClass(typeof(void), typeof(TextAnalytics), null, typeof(SignatureEntryPointModule), "TextAnalytics")] diff --git a/src/Microsoft.ML.Transforms/FourierDistributionSampler.cs b/src/Microsoft.ML.Transforms/FourierDistributionSampler.cs index d3ea00f5e0..73b3ca34a4 100644 --- a/src/Microsoft.ML.Transforms/FourierDistributionSampler.cs +++ b/src/Microsoft.ML.Transforms/FourierDistributionSampler.cs @@ -7,9 +7,8 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; using Microsoft.ML.Numeric; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; [assembly: LoadableClass(typeof(GaussianKernel), typeof(GaussianKernel.Options), typeof(SignatureKernelBase), "Gaussian Kernel", GaussianKernel.LoadName, "Gaussian")] @@ -25,7 +24,7 @@ [assembly: LoadableClass(typeof(LaplacianKernel.RandomNumberGenerator), null, typeof(SignatureLoadModel), "Laplacian Fourier Sampler Executor", "LaplacianSamplerExecutor", LaplacianKernel.RandomNumberGenerator.LoaderSignature)] -namespace Microsoft.ML.Transforms.Projections +namespace Microsoft.ML.Transforms { /// /// Signature for a constructor. diff --git a/src/Microsoft.ML.Transforms/GcnTransform.cs b/src/Microsoft.ML.Transforms/GcnTransform.cs index 98923d2cda..1e5df5b5b4 100644 --- a/src/Microsoft.ML.Transforms/GcnTransform.cs +++ b/src/Microsoft.ML.Transforms/GcnTransform.cs @@ -13,8 +13,7 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; [assembly: LoadableClass(LpNormalizingTransformer.GcnSummary, typeof(IDataTransform), typeof(LpNormalizingTransformer), typeof(LpNormalizingTransformer.GcnOptions), typeof(SignatureDataTransform), LpNormalizingTransformer.UserNameGn, "GcnTransform", LpNormalizingTransformer.ShortNameGn)] @@ -33,7 +32,7 @@ [assembly: EntryPointModule(typeof(LpNormalization))] -namespace Microsoft.ML.Transforms.Projections +namespace Microsoft.ML.Transforms { /// /// Lp-Norm (vector/row-wise) normalization transform. Has the following two set of arguments: diff --git a/src/Microsoft.ML.Transforms/HashJoiningTransform.cs b/src/Microsoft.ML.Transforms/HashJoiningTransform.cs index 30a93c8107..bfaa28f3bf 100644 --- a/src/Microsoft.ML.Transforms/HashJoiningTransform.cs +++ b/src/Microsoft.ML.Transforms/HashJoiningTransform.cs @@ -13,8 +13,7 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(HashJoiningTransform.Summary, typeof(HashJoiningTransform), typeof(HashJoiningTransform.Arguments), typeof(SignatureDataTransform), HashJoiningTransform.UserName, "HashJoinTransform", HashJoiningTransform.RegistrationName)] @@ -24,7 +23,7 @@ [assembly: EntryPointModule(typeof(HashJoin))] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { /// /// This transform hashes its input columns. Each column is hashed separately, and within each diff --git a/src/Microsoft.ML.Transforms/KeyToVectorMapping.cs b/src/Microsoft.ML.Transforms/KeyToVectorMapping.cs index 3335eb7847..68fa84e590 100644 --- a/src/Microsoft.ML.Transforms/KeyToVectorMapping.cs +++ b/src/Microsoft.ML.Transforms/KeyToVectorMapping.cs @@ -11,8 +11,7 @@ using Microsoft.ML.CommandLine; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(KeyToBinaryVectorMappingTransformer.Summary, typeof(IDataTransform), typeof(KeyToBinaryVectorMappingTransformer), typeof(KeyToBinaryVectorMappingTransformer.Options), typeof(SignatureDataTransform), "Key To Binary Vector Transform", KeyToBinaryVectorMappingTransformer.UserName, "KeyToBinary", "ToBinaryVector", DocName = "transform/KeyToBinaryVectorTransform.md")] @@ -26,7 +25,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(KeyToBinaryVectorMappingTransformer), null, typeof(SignatureLoadRowMapper), KeyToBinaryVectorMappingTransformer.UserName, KeyToBinaryVectorMappingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Conversions +namespace Microsoft.ML.Transforms { /// /// Converts the key types back to binary vectors. diff --git a/src/Microsoft.ML.Transforms/MissingValueHandlingTransformer.cs b/src/Microsoft.ML.Transforms/MissingValueHandlingTransformer.cs index a053f0c0f7..505ceed86e 100644 --- a/src/Microsoft.ML.Transforms/MissingValueHandlingTransformer.cs +++ b/src/Microsoft.ML.Transforms/MissingValueHandlingTransformer.cs @@ -12,7 +12,6 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; [assembly: LoadableClass(MissingValueHandlingTransformer.Summary, typeof(IDataTransform), typeof(MissingValueHandlingTransformer), typeof(MissingValueHandlingTransformer.Options), typeof(SignatureDataTransform), diff --git a/src/Microsoft.ML.Transforms/OneHotEncoding.cs b/src/Microsoft.ML.Transforms/OneHotEncoding.cs index 13895abcff..bb71544595 100644 --- a/src/Microsoft.ML.Transforms/OneHotEncoding.cs +++ b/src/Microsoft.ML.Transforms/OneHotEncoding.cs @@ -14,15 +14,14 @@ using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Categorical; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(OneHotEncodingTransformer.Summary, typeof(IDataTransform), typeof(OneHotEncodingTransformer), typeof(OneHotEncodingTransformer.Options), typeof(SignatureDataTransform), OneHotEncodingTransformer.UserName, "CategoricalTransform", "CatTransform", "Categorical", "Cat")] [assembly: LoadableClass(typeof(void), typeof(Categorical), null, typeof(SignatureEntryPointModule), "Categorical")] -namespace Microsoft.ML.Transforms.Categorical +namespace Microsoft.ML.Transforms { /// public sealed class OneHotEncodingTransformer : ITransformer diff --git a/src/Microsoft.ML.Transforms/OneHotHashEncoding.cs b/src/Microsoft.ML.Transforms/OneHotHashEncoding.cs index 3d3e1ec98d..78601c709d 100644 --- a/src/Microsoft.ML.Transforms/OneHotHashEncoding.cs +++ b/src/Microsoft.ML.Transforms/OneHotHashEncoding.cs @@ -11,14 +11,12 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Categorical; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; [assembly: LoadableClass(OneHotHashEncodingTransformer.Summary, typeof(IDataTransform), typeof(OneHotHashEncodingTransformer), typeof(OneHotHashEncodingTransformer.Options), typeof(SignatureDataTransform), OneHotHashEncodingTransformer.UserName, "CategoricalHashTransform", "CatHashTransform", "CategoricalHash", "CatHash")] -namespace Microsoft.ML.Transforms.Categorical +namespace Microsoft.ML.Transforms { /// /// Produces a column of indicator vectors. The mapping between a value and a corresponding index is done through hashing. diff --git a/src/Microsoft.ML.Transforms/ProjectionCatalog.cs b/src/Microsoft.ML.Transforms/ProjectionCatalog.cs index b36d17295a..dadaed940a 100644 --- a/src/Microsoft.ML.Transforms/ProjectionCatalog.cs +++ b/src/Microsoft.ML.Transforms/ProjectionCatalog.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.Transforms/RandomFourierFeaturizing.cs b/src/Microsoft.ML.Transforms/RandomFourierFeaturizing.cs index bbd01d0977..152719b00d 100644 --- a/src/Microsoft.ML.Transforms/RandomFourierFeaturizing.cs +++ b/src/Microsoft.ML.Transforms/RandomFourierFeaturizing.cs @@ -13,7 +13,7 @@ using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Projections; +using Microsoft.ML.Transforms; [assembly: LoadableClass(RandomFourierFeaturizingTransformer.Summary, typeof(IDataTransform), typeof(RandomFourierFeaturizingTransformer), typeof(RandomFourierFeaturizingTransformer.Options), typeof(SignatureDataTransform), "Random Fourier Features Transform", "RffTransform", "Rff")] @@ -27,7 +27,7 @@ [assembly: LoadableClass(typeof(IRowMapper), typeof(RandomFourierFeaturizingTransformer), null, typeof(SignatureLoadRowMapper), "Random Fourier Features Transform", RandomFourierFeaturizingTransformer.LoaderSignature)] -namespace Microsoft.ML.Transforms.Projections +namespace Microsoft.ML.Transforms { /// /// Maps vector columns to a feature space where the inner products approximate a user specified shift-invariant kernel. diff --git a/src/Microsoft.ML.Transforms/Text/TextFeaturizingEstimator.cs b/src/Microsoft.ML.Transforms/Text/TextFeaturizingEstimator.cs index 39a400a984..21530fbb0d 100644 --- a/src/Microsoft.ML.Transforms/Text/TextFeaturizingEstimator.cs +++ b/src/Microsoft.ML.Transforms/Text/TextFeaturizingEstimator.cs @@ -14,8 +14,6 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Model; -using Microsoft.ML.Transforms.Projections; using Microsoft.ML.Transforms.Text; [assembly: LoadableClass(TextFeaturizingEstimator.Summary, typeof(IDataTransform), typeof(TextFeaturizingEstimator), typeof(TextFeaturizingEstimator.Arguments), typeof(SignatureDataTransform), diff --git a/src/Microsoft.ML.Transforms/Text/WordBagTransform.cs b/src/Microsoft.ML.Transforms/Text/WordBagTransform.cs index 6595ebafee..72de0b6bd3 100644 --- a/src/Microsoft.ML.Transforms/Text/WordBagTransform.cs +++ b/src/Microsoft.ML.Transforms/Text/WordBagTransform.cs @@ -11,7 +11,6 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.Transforms.Text; [assembly: LoadableClass(WordBagBuildingTransformer.Summary, typeof(IDataTransform), typeof(WordBagBuildingTransformer), typeof(WordBagBuildingTransformer.Options), typeof(SignatureDataTransform), diff --git a/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs b/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs index b10c9f91da..8f96a9dd47 100644 --- a/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs +++ b/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs @@ -11,7 +11,6 @@ using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.Transforms.Text; [assembly: LoadableClass(WordHashBagProducingTransformer.Summary, typeof(IDataTransform), typeof(WordHashBagProducingTransformer), typeof(WordHashBagProducingTransformer.Options), typeof(SignatureDataTransform), diff --git a/src/Microsoft.ML.Transforms/doc.xml b/src/Microsoft.ML.Transforms/doc.xml index 9cc2c58403..d0ccc8b637 100644 --- a/src/Microsoft.ML.Transforms/doc.xml +++ b/src/Microsoft.ML.Transforms/doc.xml @@ -64,7 +64,7 @@ This transform uses a set of aggregators to count the number of non-default values for each slot and - instantiates a to actually drop the slots. + instantiates a to actually drop the slots. This transform is useful when applied together with a . The count feature selection can remove those features generated by the hash transform that have no data in the examples. @@ -214,7 +214,7 @@ Scaling inputs to unit norms is a common operation for text classification or clustering. For more information see: - + pipeline.Add(new LpNormalizer("FeatureCol") @@ -236,7 +236,7 @@ For more information see: An Analysis of Single-Layer Networks in Unsupervised Feature Learning - + pipeline.Add(new GlobalContrastNormalizer("FeatureCol") diff --git a/test/Microsoft.ML.Benchmarks/HashBench.cs b/test/Microsoft.ML.Benchmarks/HashBench.cs index 6372fa862a..4acbd65490 100644 --- a/test/Microsoft.ML.Benchmarks/HashBench.cs +++ b/test/Microsoft.ML.Benchmarks/HashBench.cs @@ -8,7 +8,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Benchmarks.Harness; using Microsoft.ML.Data; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML.Benchmarks { diff --git a/test/Microsoft.ML.Benchmarks/Numeric/Ranking.cs b/test/Microsoft.ML.Benchmarks/Numeric/Ranking.cs index 63dab27311..9113df76ea 100644 --- a/test/Microsoft.ML.Benchmarks/Numeric/Ranking.cs +++ b/test/Microsoft.ML.Benchmarks/Numeric/Ranking.cs @@ -9,7 +9,7 @@ using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.FastTree; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using System.IO; namespace Microsoft.ML.Benchmarks diff --git a/test/Microsoft.ML.Benchmarks/RffTransform.cs b/test/Microsoft.ML.Benchmarks/RffTransform.cs index e86271a0d7..1559a37de5 100644 --- a/test/Microsoft.ML.Benchmarks/RffTransform.cs +++ b/test/Microsoft.ML.Benchmarks/RffTransform.cs @@ -8,7 +8,7 @@ using Microsoft.ML.Data; using Microsoft.ML.RunTests; using Microsoft.ML.TestFramework; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; namespace Microsoft.ML.Benchmarks { diff --git a/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs b/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs index 3ab12386b9..969769e573 100644 --- a/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs +++ b/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs @@ -9,7 +9,7 @@ using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.Online; -using Microsoft.ML.Transforms.Categorical; +using Microsoft.ML.Transforms; using System.IO; namespace Microsoft.ML.Benchmarks diff --git a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs index 4496a1e19e..c342347ff1 100644 --- a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs +++ b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs @@ -14,7 +14,6 @@ using Microsoft.ML.Data.IO; using Microsoft.ML.EntryPoints; using Microsoft.ML.ImageAnalytics; -using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.LightGBM; using Microsoft.ML.Model; @@ -26,10 +25,6 @@ using Microsoft.ML.Trainers.HalLearners; using Microsoft.ML.Trainers.PCA; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Categorical; -using Microsoft.ML.Transforms.Conversions; -using Microsoft.ML.Transforms.Normalizers; -using Microsoft.ML.Transforms.Projections; using Microsoft.ML.Transforms.Text; using Microsoft.ML.Transforms.TimeSeries; using Newtonsoft.Json; diff --git a/test/Microsoft.ML.StaticPipelineTesting/StaticPipeTests.cs b/test/Microsoft.ML.StaticPipelineTesting/StaticPipeTests.cs index 059d075370..4fec951efc 100644 --- a/test/Microsoft.ML.StaticPipelineTesting/StaticPipeTests.cs +++ b/test/Microsoft.ML.StaticPipelineTesting/StaticPipeTests.cs @@ -17,7 +17,6 @@ using Microsoft.ML.StaticPipe; using Microsoft.ML.TestFramework; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Projections; using Microsoft.ML.Transforms.Text; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.TestFramework/DataPipe/TestDataPipe.cs b/test/Microsoft.ML.TestFramework/DataPipe/TestDataPipe.cs index 886585cdb6..cfa26e0409 100644 --- a/test/Microsoft.ML.TestFramework/DataPipe/TestDataPipe.cs +++ b/test/Microsoft.ML.TestFramework/DataPipe/TestDataPipe.cs @@ -10,8 +10,6 @@ using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; -using Microsoft.ML.Transforms.Text; using Xunit; using Float = System.Single; diff --git a/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs b/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs index 51f9c7e465..b485deb4ba 100644 --- a/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs +++ b/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs @@ -9,7 +9,7 @@ using Microsoft.ML.Trainers.FastTree; using Microsoft.ML.Trainers.KMeans; using Microsoft.ML.Trainers.PCA; -using Microsoft.ML.Transforms.Categorical; +using Microsoft.ML.Transforms; namespace Microsoft.ML.TestFramework { diff --git a/test/Microsoft.ML.Tests/CachingTests.cs b/test/Microsoft.ML.Tests/CachingTests.cs index 8fd8519889..ea4a3b4cbe 100644 --- a/test/Microsoft.ML.Tests/CachingTests.cs +++ b/test/Microsoft.ML.Tests/CachingTests.cs @@ -44,7 +44,7 @@ public void CacheCheckpointTest() var pipe = ML.Transforms.CopyColumns("F1", "Features") .Append(ML.Transforms.Normalize("Norm1", "F1")) - .Append(ML.Transforms.Normalize("Norm2", "F1", Transforms.Normalizers.NormalizingEstimator.NormalizerMode.MeanVariance)); + .Append(ML.Transforms.Normalize("Norm2", "F1", Transforms.NormalizingEstimator.NormalizerMode.MeanVariance)); pipe.Fit(ML.Data.LoadFromEnumerable(trainData)); @@ -54,7 +54,7 @@ public void CacheCheckpointTest() pipe = ML.Transforms.CopyColumns("F1", "Features") .AppendCacheCheckpoint(ML) .Append(ML.Transforms.Normalize("Norm1", "F1")) - .Append(ML.Transforms.Normalize("Norm2", "F1", Transforms.Normalizers.NormalizingEstimator.NormalizerMode.MeanVariance)); + .Append(ML.Transforms.Normalize("Norm2", "F1", Transforms.NormalizingEstimator.NormalizerMode.MeanVariance)); pipe.Fit(ML.Data.LoadFromEnumerable(trainData)); diff --git a/test/Microsoft.ML.Tests/FeatureContributionTests.cs b/test/Microsoft.ML.Tests/FeatureContributionTests.cs index 4929ad8f52..2db4dcb93c 100644 --- a/test/Microsoft.ML.Tests/FeatureContributionTests.cs +++ b/test/Microsoft.ML.Tests/FeatureContributionTests.cs @@ -13,6 +13,7 @@ using Microsoft.ML.RunTests; using Microsoft.ML.TestFramework.Attributes; using Microsoft.ML.Trainers; +using Microsoft.ML.Transforms; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/OnnxConversionTest.cs b/test/Microsoft.ML.Tests/OnnxConversionTest.cs index 4bde758a7a..716f234e57 100644 --- a/test/Microsoft.ML.Tests/OnnxConversionTest.cs +++ b/test/Microsoft.ML.Tests/OnnxConversionTest.cs @@ -210,7 +210,7 @@ public void KeyToVectorWithBagOnnxConversionTest() separatorChar: '\t', hasHeader: true); - var pipeline = mlContext.Transforms.Categorical.OneHotEncoding("F2", "F2", Transforms.Categorical.OneHotEncodingTransformer.OutputKind.Bag) + var pipeline = mlContext.Transforms.Categorical.OneHotEncoding("F2", "F2", Transforms.OneHotEncodingTransformer.OutputKind.Bag) .Append(mlContext.Transforms.ReplaceMissingValues(new MissingValueReplacingEstimator.ColumnOptions("F2"))) .Append(mlContext.Transforms.Concatenate("Features", "F1", "F2")) .Append(mlContext.BinaryClassification.Trainers.FastTree(labelColumnName: "Label", featureColumnName: "Features", numLeaves: 2, numTrees: 1, minDatapointsInLeaves: 2)); @@ -404,7 +404,7 @@ public void RemoveVariablesInPipelineTest() separatorChar: '\t', hasHeader: true); - var pipeline = mlContext.Transforms.Categorical.OneHotEncoding("F2", "F2", Transforms.Categorical.OneHotEncodingTransformer.OutputKind.Bag) + var pipeline = mlContext.Transforms.Categorical.OneHotEncoding("F2", "F2", Transforms.OneHotEncodingTransformer.OutputKind.Bag) .Append(mlContext.Transforms.ReplaceMissingValues(new MissingValueReplacingEstimator.ColumnOptions("F2"))) .Append(mlContext.Transforms.Concatenate("Features", "F1", "F2")) .Append(mlContext.Transforms.Normalize("Features")) diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamples.cs b/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamples.cs index c794c23f11..888e3ac857 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamples.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamples.cs @@ -14,7 +14,6 @@ using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.Transforms.Text; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamplesDynamicApi.cs b/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamplesDynamicApi.cs index 3b760dae6d..96215444e1 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamplesDynamicApi.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/CookbookSamples/CookbookSamplesDynamicApi.cs @@ -12,8 +12,6 @@ using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Categorical; -using Microsoft.ML.Transforms.Normalizers; using Microsoft.ML.Transforms.Text; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/DecomposableTrainAndPredict.cs b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/DecomposableTrainAndPredict.cs index 5c3d4da3f5..28886b70d6 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/DecomposableTrainAndPredict.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/DecomposableTrainAndPredict.cs @@ -7,7 +7,6 @@ using Microsoft.ML.RunTests; using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Xunit; namespace Microsoft.ML.Tests.Scenarios.Api diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Extensibility.cs b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Extensibility.cs index 27b2c1e82b..47e1fc4034 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Extensibility.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Extensibility.cs @@ -8,7 +8,6 @@ using Microsoft.ML.RunTests; using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Xunit; namespace Microsoft.ML.Tests.Scenarios.Api diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Metacomponents.cs b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Metacomponents.cs index 6fe1bc6a9c..a468c57704 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Metacomponents.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/Estimators/Metacomponents.cs @@ -6,7 +6,6 @@ using Microsoft.ML.RunTests; using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Xunit; namespace Microsoft.ML.Tests.Scenarios.Api diff --git a/test/Microsoft.ML.Tests/Scenarios/TensorflowTests.cs b/test/Microsoft.ML.Tests/Scenarios/TensorflowTests.cs index a2116b5bb3..8105c2b221 100644 --- a/test/Microsoft.ML.Tests/Scenarios/TensorflowTests.cs +++ b/test/Microsoft.ML.Tests/Scenarios/TensorflowTests.cs @@ -7,7 +7,6 @@ using Microsoft.ML.ImageAnalytics; using Microsoft.ML.TestFramework.Attributes; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Xunit; namespace Microsoft.ML.Scenarios diff --git a/test/Microsoft.ML.Tests/ScenariosWithDirectInstantiation/TensorflowTests.cs b/test/Microsoft.ML.Tests/ScenariosWithDirectInstantiation/TensorflowTests.cs index 687800a5e1..0e2d53edf8 100644 --- a/test/Microsoft.ML.Tests/ScenariosWithDirectInstantiation/TensorflowTests.cs +++ b/test/Microsoft.ML.Tests/ScenariosWithDirectInstantiation/TensorflowTests.cs @@ -12,7 +12,6 @@ using Microsoft.ML.RunTests; using Microsoft.ML.TestFramework.Attributes; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Normalizers; using Microsoft.ML.Transforms.TensorFlow; using Xunit; diff --git a/test/Microsoft.ML.Tests/TermEstimatorTests.cs b/test/Microsoft.ML.Tests/TermEstimatorTests.cs index 8431840d6f..c114567a9e 100644 --- a/test/Microsoft.ML.Tests/TermEstimatorTests.cs +++ b/test/Microsoft.ML.Tests/TermEstimatorTests.cs @@ -10,7 +10,7 @@ using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.Tools; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs index 4a8aa9de33..5c7f3230a0 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs @@ -8,7 +8,6 @@ using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.Online; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Xunit; namespace Microsoft.ML.Tests.TrainerEstimators diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs index 2d977db9fd..e7b2b8aa82 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs @@ -7,7 +7,7 @@ using Microsoft.ML.RunTests; using Microsoft.ML.Trainers.KMeans; using Microsoft.ML.Trainers.PCA; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Text; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs index 259730599e..595cc76895 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/TreeEstimators.cs @@ -12,7 +12,7 @@ using Microsoft.ML.RunTests; using Microsoft.ML.TestFramework.Attributes; using Microsoft.ML.Trainers.FastTree; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Xunit; namespace Microsoft.ML.Tests.TrainerEstimators diff --git a/test/Microsoft.ML.Tests/Transformers/CategoricalHashTests.cs b/test/Microsoft.ML.Tests/Transformers/CategoricalHashTests.cs index c0d1200a6f..04f5b76d61 100644 --- a/test/Microsoft.ML.Tests/Transformers/CategoricalHashTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/CategoricalHashTests.cs @@ -7,13 +7,11 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Data.IO; using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.StaticPipe; using Microsoft.ML.Tools; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Categorical; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/CategoricalTests.cs b/test/Microsoft.ML.Tests/Transformers/CategoricalTests.cs index 4443c98883..869abd46ff 100644 --- a/test/Microsoft.ML.Tests/Transformers/CategoricalTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/CategoricalTests.cs @@ -7,13 +7,11 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML.Data; -using Microsoft.ML.Data.IO; using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.StaticPipe; using Microsoft.ML.Tools; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Categorical; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/ConvertTests.cs b/test/Microsoft.ML.Tests/Transformers/ConvertTests.cs index e00e413f8d..bdc01a7141 100644 --- a/test/Microsoft.ML.Tests/Transformers/ConvertTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/ConvertTests.cs @@ -10,8 +10,7 @@ using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.Tools; -using Microsoft.ML.Transforms.Categorical; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/CopyColumnEstimatorTests.cs b/test/Microsoft.ML.Tests/Transformers/CopyColumnEstimatorTests.cs index ed02e02efc..c8f47a833d 100644 --- a/test/Microsoft.ML.Tests/Transformers/CopyColumnEstimatorTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/CopyColumnEstimatorTests.cs @@ -9,7 +9,6 @@ using Microsoft.ML.Model; using Microsoft.ML.Tools; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Xunit; namespace Microsoft.ML.Tests diff --git a/test/Microsoft.ML.Tests/Transformers/HashTests.cs b/test/Microsoft.ML.Tests/Transformers/HashTests.cs index 2acb6d98af..2edd1fe9e3 100644 --- a/test/Microsoft.ML.Tests/Transformers/HashTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/HashTests.cs @@ -11,7 +11,7 @@ using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.Tools; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/KeyToBinaryVectorEstimatorTest.cs b/test/Microsoft.ML.Tests/Transformers/KeyToBinaryVectorEstimatorTest.cs index 91f5b6581d..ec0d8d7939 100644 --- a/test/Microsoft.ML.Tests/Transformers/KeyToBinaryVectorEstimatorTest.cs +++ b/test/Microsoft.ML.Tests/Transformers/KeyToBinaryVectorEstimatorTest.cs @@ -11,7 +11,7 @@ using Microsoft.ML.RunTests; using Microsoft.ML.StaticPipe; using Microsoft.ML.Tools; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/KeyToValueTests.cs b/test/Microsoft.ML.Tests/Transformers/KeyToValueTests.cs index 7c643ca7d1..9652011b47 100644 --- a/test/Microsoft.ML.Tests/Transformers/KeyToValueTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/KeyToValueTests.cs @@ -9,7 +9,6 @@ using Microsoft.ML.RunTests; using Microsoft.ML.StaticPipe; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/KeyToVectorEstimatorTests.cs b/test/Microsoft.ML.Tests/Transformers/KeyToVectorEstimatorTests.cs index 34f73429bb..5645f46927 100644 --- a/test/Microsoft.ML.Tests/Transformers/KeyToVectorEstimatorTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/KeyToVectorEstimatorTests.cs @@ -11,7 +11,7 @@ using Microsoft.ML.RunTests; using Microsoft.ML.StaticPipe; using Microsoft.ML.Tools; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/NAIndicatorTests.cs b/test/Microsoft.ML.Tests/Transformers/NAIndicatorTests.cs index 527ccf500b..369495ebf5 100644 --- a/test/Microsoft.ML.Tests/Transformers/NAIndicatorTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/NAIndicatorTests.cs @@ -4,15 +4,12 @@ using System; using System.IO; -using Microsoft.Data.DataView; using Microsoft.ML.Data; using Microsoft.ML.Data.IO; using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.StaticPipe; using Microsoft.ML.Tools; -using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Categorical; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/NormalizerTests.cs b/test/Microsoft.ML.Tests/Transformers/NormalizerTests.cs index 7861c444ba..450af1212a 100644 --- a/test/Microsoft.ML.Tests/Transformers/NormalizerTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/NormalizerTests.cs @@ -14,8 +14,6 @@ using Microsoft.ML.TestFramework.Attributes; using Microsoft.ML.Tools; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Normalizers; -using Microsoft.ML.Transforms.Projections; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/RffTests.cs b/test/Microsoft.ML.Tests/Transformers/RffTests.cs index 84fb1ea364..393715d41c 100644 --- a/test/Microsoft.ML.Tests/Transformers/RffTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/RffTests.cs @@ -11,7 +11,6 @@ using Microsoft.ML.StaticPipe; using Microsoft.ML.Tools; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Projections; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/TextFeaturizerTests.cs b/test/Microsoft.ML.Tests/Transformers/TextFeaturizerTests.cs index 0addcb6945..c48eaae238 100644 --- a/test/Microsoft.ML.Tests/Transformers/TextFeaturizerTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/TextFeaturizerTests.cs @@ -13,7 +13,6 @@ using Microsoft.ML.StaticPipe; using Microsoft.ML.Tools; using Microsoft.ML.Transforms; -using Microsoft.ML.Transforms.Conversions; using Microsoft.ML.Transforms.Text; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Transformers/ValueMappingTests.cs b/test/Microsoft.ML.Tests/Transformers/ValueMappingTests.cs index b7b99f2291..d109a1ebb4 100644 --- a/test/Microsoft.ML.Tests/Transformers/ValueMappingTests.cs +++ b/test/Microsoft.ML.Tests/Transformers/ValueMappingTests.cs @@ -6,12 +6,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.Data.DataView; using Microsoft.ML.Data; using Microsoft.ML.Model; using Microsoft.ML.RunTests; using Microsoft.ML.Tools; -using Microsoft.ML.Transforms.Conversions; +using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Text; using Xunit; using Xunit.Abstractions; From 15a68d029e736eec996fcc045207efa2b68e7f39 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Tue, 26 Feb 2019 23:28:28 -0800 Subject: [PATCH 2/4] folding: Microsoft.ML.Trainers.KMeans Microsoft.ML.Trainers.PCA Microsoft.ML.Trainers.OnlineLearners Microsoft.ML.Trainers.FactorizationMachine into Microsoft.ML.Trainers --- .../BinaryClassification/AveragedPerceptronWithOptions.cs | 3 +-- .../FieldAwareFactorizationMachinewWithOptions.cs | 2 +- src/Microsoft.ML.Ensemble/Trainer/Binary/EnsembleTrainer.cs | 1 - .../Trainer/Regression/RegressionEnsembleTrainer.cs | 1 - src/Microsoft.ML.KMeansClustering/KMeansCatalog.cs | 2 +- src/Microsoft.ML.KMeansClustering/KMeansModelParameters.cs | 4 ++-- src/Microsoft.ML.KMeansClustering/KMeansPlusPlusTrainer.cs | 4 ++-- src/Microsoft.ML.PCA/PCACatalog.cs | 4 ++-- src/Microsoft.ML.PCA/PcaTrainer.cs | 4 ++-- .../FactorizationMachine/FactorizationMachineCatalog.cs | 2 +- .../FactorizationMachine/FactorizationMachineInterface.cs | 2 +- .../FactorizationMachine/FactorizationMachineTrainer.cs | 4 ++-- .../FieldAwareFactorizationMachineModelParameters.cs | 5 ++--- .../FieldAwareFactorizationMachineUtils.cs | 2 +- .../Standard/MultiClass/MetaMulticlassTrainer.cs | 2 +- .../Standard/Online/AveragedLinear.cs | 2 +- .../Standard/Online/AveragedPerceptron.cs | 4 ++-- .../Standard/Online/LinearSvm.cs | 4 ++-- .../Standard/Online/OnlineGradientDescent.cs | 4 ++-- .../Standard/Online/OnlineLinear.cs | 2 +- src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs | 1 - src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs | 2 +- src/Microsoft.ML.StaticPipe/KMeansStatic.cs | 2 +- src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs | 1 - .../Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs | 1 - test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs | 1 - test/Microsoft.ML.Functional.Tests/Evaluation.cs | 1 - test/Microsoft.ML.Predictor.Tests/TestPredictors.cs | 2 -- test/Microsoft.ML.StaticPipelineTesting/Training.cs | 5 +---- test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs | 2 -- test/Microsoft.ML.Tests/OnnxConversionTest.cs | 4 ++-- test/Microsoft.ML.Tests/Scenarios/Api/TestApi.cs | 2 +- test/Microsoft.ML.Tests/Scenarios/OvaTest.cs | 2 +- test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs | 2 +- .../TrainerEstimators/MetalinearEstimators.cs | 1 - .../TrainerEstimators/OnlineLinearTests.cs | 2 +- .../TrainerEstimators/TrainerEstimators.cs | 3 +-- 37 files changed, 37 insertions(+), 55 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptronWithOptions.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptronWithOptions.cs index 1c58ee48aa..fb1dfacf50 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptronWithOptions.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/AveragedPerceptronWithOptions.cs @@ -1,5 +1,4 @@ -using Microsoft.ML; -using Microsoft.ML.Trainers.Online; +using Microsoft.ML.Trainers; namespace Microsoft.ML.Samples.Dynamic.Trainers.BinaryClassification { diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/FieldAwareFactorizationMachinewWithOptions.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/FieldAwareFactorizationMachinewWithOptions.cs index c93b735a59..f4ec502d1f 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/FieldAwareFactorizationMachinewWithOptions.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/BinaryClassification/FieldAwareFactorizationMachinewWithOptions.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using Microsoft.ML.Data; -using Microsoft.ML.Trainers.FactorizationMachine; +using Microsoft.ML.Trainers; namespace Microsoft.ML.Samples.Dynamic { diff --git a/src/Microsoft.ML.Ensemble/Trainer/Binary/EnsembleTrainer.cs b/src/Microsoft.ML.Ensemble/Trainer/Binary/EnsembleTrainer.cs index 48c8ab8aa4..9d7826c606 100644 --- a/src/Microsoft.ML.Ensemble/Trainer/Binary/EnsembleTrainer.cs +++ b/src/Microsoft.ML.Ensemble/Trainer/Binary/EnsembleTrainer.cs @@ -10,7 +10,6 @@ using Microsoft.ML.Data; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Online; [assembly: LoadableClass(EnsembleTrainer.Summary, typeof(EnsembleTrainer), typeof(EnsembleTrainer.Arguments), new[] { typeof(SignatureBinaryClassifierTrainer), typeof(SignatureTrainer) }, diff --git a/src/Microsoft.ML.Ensemble/Trainer/Regression/RegressionEnsembleTrainer.cs b/src/Microsoft.ML.Ensemble/Trainer/Regression/RegressionEnsembleTrainer.cs index 099e4187f3..2f2bfa555e 100644 --- a/src/Microsoft.ML.Ensemble/Trainer/Regression/RegressionEnsembleTrainer.cs +++ b/src/Microsoft.ML.Ensemble/Trainer/Regression/RegressionEnsembleTrainer.cs @@ -10,7 +10,6 @@ using Microsoft.ML.Data; using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Trainers.Ensemble; -using Microsoft.ML.Trainers.Online; [assembly: LoadableClass(typeof(RegressionEnsembleTrainer), typeof(RegressionEnsembleTrainer.Arguments), new[] { typeof(SignatureRegressorTrainer), typeof(SignatureTrainer) }, diff --git a/src/Microsoft.ML.KMeansClustering/KMeansCatalog.cs b/src/Microsoft.ML.KMeansClustering/KMeansCatalog.cs index f7c4067861..29e0bf03c4 100644 --- a/src/Microsoft.ML.KMeansClustering/KMeansCatalog.cs +++ b/src/Microsoft.ML.KMeansClustering/KMeansCatalog.cs @@ -5,7 +5,7 @@ using System; using Microsoft.ML.Data; using Microsoft.ML.EntryPoints; -using Microsoft.ML.Trainers.KMeans; +using Microsoft.ML.Trainers; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.KMeansClustering/KMeansModelParameters.cs b/src/Microsoft.ML.KMeansClustering/KMeansModelParameters.cs index 20de43d068..ff3b007957 100644 --- a/src/Microsoft.ML.KMeansClustering/KMeansModelParameters.cs +++ b/src/Microsoft.ML.KMeansClustering/KMeansModelParameters.cs @@ -13,13 +13,13 @@ using Microsoft.ML.Model; using Microsoft.ML.Model.OnnxConverter; using Microsoft.ML.Numeric; -using Microsoft.ML.Trainers.KMeans; +using Microsoft.ML.Trainers; using Float = System.Single; [assembly: LoadableClass(typeof(KMeansModelParameters), null, typeof(SignatureLoadModel), "KMeans predictor", KMeansModelParameters.LoaderSignature)] -namespace Microsoft.ML.Trainers.KMeans +namespace Microsoft.ML.Trainers { /// /// diff --git a/src/Microsoft.ML.KMeansClustering/KMeansPlusPlusTrainer.cs b/src/Microsoft.ML.KMeansClustering/KMeansPlusPlusTrainer.cs index 2d8d8b0bf1..652c858af0 100644 --- a/src/Microsoft.ML.KMeansClustering/KMeansPlusPlusTrainer.cs +++ b/src/Microsoft.ML.KMeansClustering/KMeansPlusPlusTrainer.cs @@ -14,7 +14,7 @@ using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Numeric; -using Microsoft.ML.Trainers.KMeans; +using Microsoft.ML.Trainers; [assembly: LoadableClass(KMeansPlusPlusTrainer.Summary, typeof(KMeansPlusPlusTrainer), typeof(KMeansPlusPlusTrainer.Options), new[] { typeof(SignatureClusteringTrainer), typeof(SignatureTrainer) }, @@ -24,7 +24,7 @@ [assembly: LoadableClass(typeof(void), typeof(KMeansPlusPlusTrainer), null, typeof(SignatureEntryPointModule), "KMeans")] -namespace Microsoft.ML.Trainers.KMeans +namespace Microsoft.ML.Trainers { /// public class KMeansPlusPlusTrainer : TrainerEstimatorBase, KMeansModelParameters> diff --git a/src/Microsoft.ML.PCA/PCACatalog.cs b/src/Microsoft.ML.PCA/PCACatalog.cs index 49c8c9ceef..e4eb886448 100644 --- a/src/Microsoft.ML.PCA/PCACatalog.cs +++ b/src/Microsoft.ML.PCA/PCACatalog.cs @@ -3,9 +3,9 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.Trainers.PCA; +using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; -using static Microsoft.ML.Trainers.PCA.RandomizedPcaTrainer; +using static Microsoft.ML.Trainers.RandomizedPcaTrainer; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.PCA/PcaTrainer.cs b/src/Microsoft.ML.PCA/PcaTrainer.cs index e4e506a61a..8705b85f87 100644 --- a/src/Microsoft.ML.PCA/PcaTrainer.cs +++ b/src/Microsoft.ML.PCA/PcaTrainer.cs @@ -15,7 +15,7 @@ using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; using Microsoft.ML.Numeric; -using Microsoft.ML.Trainers.PCA; +using Microsoft.ML.Trainers; [assembly: LoadableClass(RandomizedPcaTrainer.Summary, typeof(RandomizedPcaTrainer), typeof(RandomizedPcaTrainer.Options), new[] { typeof(SignatureAnomalyDetectorTrainer), typeof(SignatureTrainer) }, @@ -28,7 +28,7 @@ [assembly: LoadableClass(typeof(void), typeof(RandomizedPcaTrainer), null, typeof(SignatureEntryPointModule), RandomizedPcaTrainer.LoadNameValue)] -namespace Microsoft.ML.Trainers.PCA +namespace Microsoft.ML.Trainers { // REVIEW: make RFF transformer an option here. diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs index 4ffffafd7e..4d5e4df381 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineCatalog.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; -using Microsoft.ML.Trainers.FactorizationMachine; +using Microsoft.ML.Trainers; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineInterface.cs index 43c72e6b6b..bce1745843 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.Trainers.FactorizationMachine +namespace Microsoft.ML.Trainers { internal static unsafe class FieldAwareFactorizationMachineInterface { diff --git a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs index 77974e1457..bd2e2d09e3 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FactorizationMachineTrainer.cs @@ -12,7 +12,7 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Internal.CpuMath; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Trainers.FactorizationMachine; +using Microsoft.ML.Trainers; [assembly: LoadableClass(FieldAwareFactorizationMachineBinaryClassificationTrainer.Summary, typeof(FieldAwareFactorizationMachineBinaryClassificationTrainer), typeof(FieldAwareFactorizationMachineBinaryClassificationTrainer.Options), new[] { typeof(SignatureBinaryClassifierTrainer), typeof(SignatureTrainer) } @@ -21,7 +21,7 @@ [assembly: LoadableClass(typeof(void), typeof(FieldAwareFactorizationMachineBinaryClassificationTrainer), null, typeof(SignatureEntryPointModule), FieldAwareFactorizationMachineBinaryClassificationTrainer.LoadName)] -namespace Microsoft.ML.Trainers.FactorizationMachine +namespace Microsoft.ML.Trainers { /* 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 8779d5a48c..b262fa02f5 100644 --- a/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs +++ b/src/Microsoft.ML.StandardLearners/FactorizationMachine/FieldAwareFactorizationMachineModelParameters.cs @@ -9,17 +9,16 @@ using Microsoft.ML.Data; using Microsoft.ML.Data.IO; using Microsoft.ML.Internal.CpuMath; -using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; -using Microsoft.ML.Trainers.FactorizationMachine; +using Microsoft.ML.Trainers; [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.Trainers.FactorizationMachine +namespace Microsoft.ML.Trainers { 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 ec1682ba0f..9b91275a46 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.Trainers.FactorizationMachine +namespace Microsoft.ML.Trainers { internal sealed class FieldAwareFactorizationMachineUtils { diff --git a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs index 0afc17a8d0..8174fa7627 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/MultiClass/MetaMulticlassTrainer.cs @@ -10,7 +10,7 @@ using Microsoft.ML.Data; using Microsoft.ML.Data.Conversion; using Microsoft.ML.Internal.Internallearn; -using Microsoft.ML.Trainers.Online; +using Microsoft.ML.Trainers; namespace Microsoft.ML.Trainers { diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedLinear.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedLinear.cs index 37abdfd88e..6e291134e9 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedLinear.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedLinear.cs @@ -12,7 +12,7 @@ // TODO: Check if it works properly if Averaged is set to false -namespace Microsoft.ML.Trainers.Online +namespace Microsoft.ML.Trainers { /// /// Arguments class for averaged linear trainers. diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs index 052e9e1495..45bec60c2b 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/AveragedPerceptron.cs @@ -11,7 +11,7 @@ using Microsoft.ML.EntryPoints; using Microsoft.ML.Model; using Microsoft.ML.Numeric; -using Microsoft.ML.Trainers.Online; +using Microsoft.ML.Trainers; [assembly: LoadableClass(AveragedPerceptronTrainer.Summary, typeof(AveragedPerceptronTrainer), typeof(AveragedPerceptronTrainer.Options), new[] { typeof(SignatureBinaryClassifierTrainer), typeof(SignatureTrainer), typeof(SignatureFeatureScorerTrainer) }, @@ -20,7 +20,7 @@ [assembly: LoadableClass(typeof(void), typeof(AveragedPerceptronTrainer), null, typeof(SignatureEntryPointModule), "AP")] -namespace Microsoft.ML.Trainers.Online +namespace Microsoft.ML.Trainers { /// /// The for the averaged perceptron trainer. diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs index fa77314f47..522079a8bc 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/LinearSvm.cs @@ -13,7 +13,7 @@ using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Model; using Microsoft.ML.Numeric; -using Microsoft.ML.Trainers.Online; +using Microsoft.ML.Trainers; [assembly: LoadableClass(LinearSvmTrainer.Summary, typeof(LinearSvmTrainer), typeof(LinearSvmTrainer.Options), new[] { typeof(SignatureBinaryClassifierTrainer), typeof(SignatureTrainer), typeof(SignatureFeatureScorerTrainer) }, @@ -23,7 +23,7 @@ [assembly: LoadableClass(typeof(void), typeof(LinearSvmTrainer), null, typeof(SignatureEntryPointModule), "LinearSvm")] -namespace Microsoft.ML.Trainers.Online +namespace Microsoft.ML.Trainers { /// /// Linear SVM that implements PEGASOS for training. See: http://ttic.uchicago.edu/~shai/papers/ShalevSiSr07.pdf diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineGradientDescent.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineGradientDescent.cs index 736c0e9a25..dc13544c5c 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineGradientDescent.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineGradientDescent.cs @@ -10,7 +10,7 @@ using Microsoft.ML.Internal.Internallearn; using Microsoft.ML.Model; using Microsoft.ML.Numeric; -using Microsoft.ML.Trainers.Online; +using Microsoft.ML.Trainers; [assembly: LoadableClass(OnlineGradientDescentTrainer.Summary, typeof(OnlineGradientDescentTrainer), typeof(OnlineGradientDescentTrainer.Options), new[] { typeof(SignatureRegressorTrainer), typeof(SignatureTrainer), typeof(SignatureFeatureScorerTrainer) }, @@ -21,7 +21,7 @@ "stochasticgradientdescentregression")] [assembly: LoadableClass(typeof(void), typeof(OnlineGradientDescentTrainer), null, typeof(SignatureEntryPointModule), "OGD")] -namespace Microsoft.ML.Trainers.Online +namespace Microsoft.ML.Trainers { /// diff --git a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs b/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs index fc8cd3914d..a80e9d61fb 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/Online/OnlineLinear.cs @@ -12,7 +12,7 @@ using Microsoft.ML.Internal.Utilities; using Microsoft.ML.Numeric; -namespace Microsoft.ML.Trainers.Online +namespace Microsoft.ML.Trainers { /// /// Arguments class for online linear trainers. diff --git a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs index 906fe9529b..5f3329792e 100644 --- a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs +++ b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs @@ -5,7 +5,6 @@ using Microsoft.ML.Calibrators; using Microsoft.ML.Data; using Microsoft.ML.Trainers; -using Microsoft.ML.Trainers.Online; namespace Microsoft.ML { diff --git a/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs b/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs index 86e73b289f..9ab04b50fc 100644 --- a/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs +++ b/src/Microsoft.ML.StaticPipe/FactorizationMachineStatic.cs @@ -7,7 +7,7 @@ using System.Linq; using Microsoft.ML.Data; using Microsoft.ML.Internal.Utilities; -using Microsoft.ML.Trainers.FactorizationMachine; +using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/KMeansStatic.cs b/src/Microsoft.ML.StaticPipe/KMeansStatic.cs index 0b46f49385..fbd20d3dcd 100644 --- a/src/Microsoft.ML.StaticPipe/KMeansStatic.cs +++ b/src/Microsoft.ML.StaticPipe/KMeansStatic.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.ML.Trainers.KMeans; +using Microsoft.ML.Trainers; namespace Microsoft.ML.StaticPipe { diff --git a/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs b/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs index 02e961f914..5030d44e63 100644 --- a/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs +++ b/src/Microsoft.ML.StaticPipe/OnlineLearnerStatic.cs @@ -4,7 +4,6 @@ using System; using Microsoft.ML.Trainers; -using Microsoft.ML.Trainers.Online; namespace Microsoft.ML.StaticPipe { diff --git a/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs b/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs index 969769e573..51be1fb79a 100644 --- a/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs +++ b/test/Microsoft.ML.Benchmarks/Text/MultiClassClassification.cs @@ -8,7 +8,6 @@ using Microsoft.ML.RunTests; using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; -using Microsoft.ML.Trainers.Online; using Microsoft.ML.Transforms; using System.IO; diff --git a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs index c342347ff1..69ee9afb81 100644 --- a/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs +++ b/test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs @@ -23,7 +23,6 @@ using Microsoft.ML.Trainers.Ensemble; using Microsoft.ML.Trainers.FastTree; using Microsoft.ML.Trainers.HalLearners; -using Microsoft.ML.Trainers.PCA; using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Text; using Microsoft.ML.Transforms.TimeSeries; diff --git a/test/Microsoft.ML.Functional.Tests/Evaluation.cs b/test/Microsoft.ML.Functional.Tests/Evaluation.cs index 77eadea945..fd16635d6e 100644 --- a/test/Microsoft.ML.Functional.Tests/Evaluation.cs +++ b/test/Microsoft.ML.Functional.Tests/Evaluation.cs @@ -8,7 +8,6 @@ using Microsoft.ML.TestFramework.Attributes; using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.FastTree; -using Microsoft.ML.Trainers.KMeans; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Predictor.Tests/TestPredictors.cs b/test/Microsoft.ML.Predictor.Tests/TestPredictors.cs index 0c6fc3f47e..e91800259c 100644 --- a/test/Microsoft.ML.Predictor.Tests/TestPredictors.cs +++ b/test/Microsoft.ML.Predictor.Tests/TestPredictors.cs @@ -20,10 +20,8 @@ namespace Microsoft.ML.RunTests using Microsoft.ML.LightGBM; using Microsoft.ML.TestFramework; using Microsoft.ML.Trainers; - using Microsoft.ML.Trainers.Ensemble; using Microsoft.ML.Trainers.FastTree; using Microsoft.ML.Trainers.HalLearners; - using Microsoft.ML.Trainers.Online; using Xunit; using Xunit.Abstractions; using TestLearners = TestLearnersBase; diff --git a/test/Microsoft.ML.StaticPipelineTesting/Training.cs b/test/Microsoft.ML.StaticPipelineTesting/Training.cs index 406ace5aae..8413627c8c 100644 --- a/test/Microsoft.ML.StaticPipelineTesting/Training.cs +++ b/test/Microsoft.ML.StaticPipelineTesting/Training.cs @@ -6,9 +6,8 @@ using System.Linq; using Microsoft.Data.DataView; using Microsoft.ML; -using Microsoft.ML.Data; using Microsoft.ML.Calibrators; -using Microsoft.ML.Internal.Internallearn; +using Microsoft.ML.Data; using Microsoft.ML.LightGBM; using Microsoft.ML.LightGBM.StaticPipe; using Microsoft.ML.Model; @@ -16,9 +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; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs b/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs index b485deb4ba..fb716691c4 100644 --- a/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs +++ b/test/Microsoft.ML.TestFramework/EnvironmentExtensions.cs @@ -7,8 +7,6 @@ using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.Ensemble; using Microsoft.ML.Trainers.FastTree; -using Microsoft.ML.Trainers.KMeans; -using Microsoft.ML.Trainers.PCA; using Microsoft.ML.Transforms; namespace Microsoft.ML.TestFramework diff --git a/test/Microsoft.ML.Tests/OnnxConversionTest.cs b/test/Microsoft.ML.Tests/OnnxConversionTest.cs index 716f234e57..b4808b4e7c 100644 --- a/test/Microsoft.ML.Tests/OnnxConversionTest.cs +++ b/test/Microsoft.ML.Tests/OnnxConversionTest.cs @@ -133,13 +133,13 @@ public void KmeansOnnxConversionTest() hasHeader: true); var pipeline = mlContext.Transforms.Normalize("Features"). - Append(mlContext.Clustering.Trainers.KMeans(new Trainers.KMeans.KMeansPlusPlusTrainer.Options + Append(mlContext.Clustering.Trainers.KMeans(new Trainers.KMeansPlusPlusTrainer.Options { FeatureColumn = DefaultColumnNames.Features, MaxIterations = 1, ClustersCount = 4, NumThreads = 1, - InitAlgorithm = Trainers.KMeans.KMeansPlusPlusTrainer.InitAlgorithm.Random + InitAlgorithm = Trainers.KMeansPlusPlusTrainer.InitAlgorithm.Random })); var model = pipeline.Fit(data); diff --git a/test/Microsoft.ML.Tests/Scenarios/Api/TestApi.cs b/test/Microsoft.ML.Tests/Scenarios/Api/TestApi.cs index dda1652a2d..3f9078da3d 100644 --- a/test/Microsoft.ML.Tests/Scenarios/Api/TestApi.cs +++ b/test/Microsoft.ML.Tests/Scenarios/Api/TestApi.cs @@ -11,7 +11,7 @@ using Microsoft.ML.Data.IO; using Microsoft.ML.Internal.Utilities; using Microsoft.ML.TestFramework; -using Microsoft.ML.Trainers.Online; +using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.ML.Tests/Scenarios/OvaTest.cs b/test/Microsoft.ML.Tests/Scenarios/OvaTest.cs index a2ed9399d5..cce93ef1df 100644 --- a/test/Microsoft.ML.Tests/Scenarios/OvaTest.cs +++ b/test/Microsoft.ML.Tests/Scenarios/OvaTest.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using Microsoft.ML.Data; +using Microsoft.ML.Trainers; using Microsoft.ML.Trainers.FastTree; -using Microsoft.ML.Trainers.Online; using Xunit; namespace Microsoft.ML.Scenarios diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs b/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs index 3140f5dcb3..3bbc8b5df6 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/FAFMEstimator.cs @@ -5,7 +5,7 @@ using Microsoft.ML.Data; using Microsoft.ML.RunTests; using Microsoft.ML.SamplesUtils; -using Microsoft.ML.Trainers.FactorizationMachine; +using Microsoft.ML.Trainers; using Xunit; namespace Microsoft.ML.Tests.TrainerEstimators diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs index 5c7f3230a0..b048cc2393 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/MetalinearEstimators.cs @@ -6,7 +6,6 @@ using Microsoft.ML.Data; using Microsoft.ML.RunTests; using Microsoft.ML.Trainers; -using Microsoft.ML.Trainers.Online; using Microsoft.ML.Transforms; using Xunit; diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/OnlineLinearTests.cs b/test/Microsoft.ML.Tests/TrainerEstimators/OnlineLinearTests.cs index ddd5cebfe4..a4c91e954e 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/OnlineLinearTests.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/OnlineLinearTests.cs @@ -4,7 +4,7 @@ using Microsoft.ML; using Microsoft.ML.StaticPipe; -using Microsoft.ML.Trainers.Online; +using Microsoft.ML.Trainers; using Xunit; namespace Microsoft.ML.Tests.TrainerEstimators diff --git a/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs b/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs index e7b2b8aa82..71cac57d55 100644 --- a/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs +++ b/test/Microsoft.ML.Tests/TrainerEstimators/TrainerEstimators.cs @@ -5,8 +5,7 @@ using Microsoft.Data.DataView; using Microsoft.ML.Data; using Microsoft.ML.RunTests; -using Microsoft.ML.Trainers.KMeans; -using Microsoft.ML.Trainers.PCA; +using Microsoft.ML.Trainers; using Microsoft.ML.Transforms; using Microsoft.ML.Transforms.Text; using Xunit; From 27802e4fac9230b1a2107668bde66ab40b11444b Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Wed, 27 Feb 2019 09:03:49 -0800 Subject: [PATCH 3/4] regenerating the catalog --- .../Common/EntryPoints/core_ep-list.tsv | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv b/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv index 701562750b..e5f4cb2b71 100644 --- a/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv +++ b/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv @@ -39,7 +39,7 @@ TimeSeriesProcessingEntryPoints.PValueTransform This P-Value transform calculate TimeSeriesProcessingEntryPoints.SlidingWindowTransform Returns the last values for a time series [y(t-d-l+1), y(t-d-l+2), ..., y(t-l-1), y(t-l)] where d is the size of the window, l the lag and y is a Float. Microsoft.ML.Transforms.TimeSeries.TimeSeriesProcessingEntryPoints SlidingWindowTransform Microsoft.ML.Transforms.TimeSeries.SlidingWindowTransformBase`1+Arguments[System.Single] Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput TimeSeriesProcessingEntryPoints.SsaChangePointDetector This transform detects the change-points in a seasonal time-series using Singular Spectrum Analysis (SSA). Microsoft.ML.Transforms.TimeSeries.TimeSeriesProcessingEntryPoints SsaChangePointDetector Microsoft.ML.Transforms.TimeSeries.SsaChangePointDetector+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput TimeSeriesProcessingEntryPoints.SsaSpikeDetector This transform detects the spikes in a seasonal time-series using Singular Spectrum Analysis (SSA). Microsoft.ML.Transforms.TimeSeries.TimeSeriesProcessingEntryPoints SsaSpikeDetector Microsoft.ML.Transforms.TimeSeries.SsaSpikeDetector+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Trainers.AveragedPerceptronBinaryClassifier Averaged Perceptron Binary Classifier. Microsoft.ML.Trainers.Online.AveragedPerceptronTrainer TrainBinary Microsoft.ML.Trainers.Online.AveragedPerceptronTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput +Trainers.AveragedPerceptronBinaryClassifier Averaged Perceptron Binary Classifier. Microsoft.ML.Trainers.AveragedPerceptronTrainer TrainBinary Microsoft.ML.Trainers.AveragedPerceptronTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.EnsembleBinaryClassifier Train binary ensemble. Microsoft.ML.Trainers.Ensemble.Ensemble CreateBinaryEnsemble Microsoft.ML.Trainers.Ensemble.EnsembleTrainer+Arguments Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.EnsembleClassification Train multiclass ensemble. Microsoft.ML.Trainers.Ensemble.Ensemble CreateMultiClassEnsemble Microsoft.ML.Trainers.Ensemble.MulticlassDataPartitionEnsembleTrainer+Arguments Microsoft.ML.EntryPoints.CommonOutputs+MulticlassClassificationOutput Trainers.EnsembleRegression Train regression ensemble. Microsoft.ML.Trainers.Ensemble.Ensemble CreateRegressionEnsemble Microsoft.ML.Trainers.Ensemble.RegressionEnsembleTrainer+Arguments Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput @@ -49,21 +49,21 @@ 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.Trainers.FactorizationMachine.FieldAwareFactorizationMachineBinaryClassificationTrainer TrainBinary Microsoft.ML.Trainers.FactorizationMachine.FieldAwareFactorizationMachineBinaryClassificationTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput +Trainers.FieldAwareFactorizationMachineBinaryClassifier Train a field-aware factorization machine for binary classification Microsoft.ML.Trainers.FieldAwareFactorizationMachineBinaryClassificationTrainer TrainBinary Microsoft.ML.Trainers.FieldAwareFactorizationMachineBinaryClassificationTrainer+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 +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.KMeansPlusPlusTrainer TrainKMeans Microsoft.ML.Trainers.KMeansPlusPlusTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+ClusteringOutput Trainers.LightGbmBinaryClassifier Train a LightGBM binary classification model. Microsoft.ML.LightGBM.LightGbm TrainBinary Microsoft.ML.LightGBM.Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.LightGbmClassifier Train a LightGBM multi class model. Microsoft.ML.LightGBM.LightGbm TrainMultiClass Microsoft.ML.LightGBM.Options Microsoft.ML.EntryPoints.CommonOutputs+MulticlassClassificationOutput Trainers.LightGbmRanker Train a LightGBM ranking model. Microsoft.ML.LightGBM.LightGbm TrainRanking Microsoft.ML.LightGBM.Options Microsoft.ML.EntryPoints.CommonOutputs+RankingOutput Trainers.LightGbmRegressor LightGBM Regression Microsoft.ML.LightGBM.LightGbm TrainRegression Microsoft.ML.LightGBM.Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput -Trainers.LinearSvmBinaryClassifier Train a linear SVM. Microsoft.ML.Trainers.Online.LinearSvmTrainer TrainLinearSvm Microsoft.ML.Trainers.Online.LinearSvmTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput +Trainers.LinearSvmBinaryClassifier Train a linear SVM. Microsoft.ML.Trainers.LinearSvmTrainer TrainLinearSvm Microsoft.ML.Trainers.LinearSvmTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.LogisticRegressionBinaryClassifier Logistic Regression is a method in statistics used to predict the probability of occurrence of an event and can be used as a classification algorithm. The algorithm predicts the probability of occurrence of an event by fitting data to a logistical function. Microsoft.ML.Trainers.LogisticRegression TrainBinary Microsoft.ML.Trainers.LogisticRegression+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.LogisticRegressionClassifier Logistic Regression is a method in statistics used to predict the probability of occurrence of an event and can be used as a classification algorithm. The algorithm predicts the probability of occurrence of an event by fitting data to a logistical function. Microsoft.ML.Trainers.LogisticRegression TrainMultiClass Microsoft.ML.Trainers.MulticlassLogisticRegression+Options Microsoft.ML.EntryPoints.CommonOutputs+MulticlassClassificationOutput Trainers.NaiveBayesClassifier Train a MultiClassNaiveBayesTrainer. Microsoft.ML.Trainers.MultiClassNaiveBayesTrainer TrainMultiClassNaiveBayesTrainer Microsoft.ML.Trainers.MultiClassNaiveBayesTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+MulticlassClassificationOutput -Trainers.OnlineGradientDescentRegressor Train a Online gradient descent perceptron. Microsoft.ML.Trainers.Online.OnlineGradientDescentTrainer TrainRegression Microsoft.ML.Trainers.Online.OnlineGradientDescentTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput +Trainers.OnlineGradientDescentRegressor Train a Online gradient descent perceptron. Microsoft.ML.Trainers.OnlineGradientDescentTrainer TrainRegression Microsoft.ML.Trainers.OnlineGradientDescentTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput Trainers.OrdinaryLeastSquaresRegressor Train an OLS regression model. Microsoft.ML.Trainers.HalLearners.OlsLinearRegressionTrainer TrainRegression Microsoft.ML.Trainers.HalLearners.OlsLinearRegressionTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput -Trainers.PcaAnomalyDetector Train an PCA Anomaly model. Microsoft.ML.Trainers.PCA.RandomizedPcaTrainer TrainPcaAnomaly Microsoft.ML.Trainers.PCA.RandomizedPcaTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+AnomalyDetectionOutput +Trainers.PcaAnomalyDetector Train an PCA Anomaly model. Microsoft.ML.Trainers.RandomizedPcaTrainer TrainPcaAnomaly Microsoft.ML.Trainers.RandomizedPcaTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+AnomalyDetectionOutput Trainers.PoissonRegressor Train an Poisson regression model. Microsoft.ML.Trainers.PoissonRegression TrainRegression Microsoft.ML.Trainers.PoissonRegression+Options Microsoft.ML.EntryPoints.CommonOutputs+RegressionOutput Trainers.StochasticDualCoordinateAscentBinaryClassifier Train an SDCA binary model. Microsoft.ML.Trainers.Sdca TrainBinary Microsoft.ML.Trainers.LegacySdcaBinaryTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Trainers.StochasticDualCoordinateAscentClassifier The SDCA linear multi-class classification trainer. Microsoft.ML.Trainers.Sdca TrainMultiClass Microsoft.ML.Trainers.SdcaMultiClassTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+MulticlassClassificationOutput @@ -72,39 +72,40 @@ Trainers.StochasticGradientDescentBinaryClassifier Train an Hogwild SGD binary m Trainers.SymSgdBinaryClassifier Train a symbolic SGD. Microsoft.ML.Trainers.HalLearners.SymSgdClassificationTrainer TrainSymSgd Microsoft.ML.Trainers.HalLearners.SymSgdClassificationTrainer+Options Microsoft.ML.EntryPoints.CommonOutputs+BinaryClassificationOutput Transforms.ApproximateBootstrapSampler Approximate bootstrap sampling. Microsoft.ML.Transforms.BootstrapSample GetSample Microsoft.ML.Transforms.BootstrapSamplingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.BinaryPredictionScoreColumnsRenamer For binary prediction, it renames the PredictedLabel and Score columns to include the name of the positive class. Microsoft.ML.EntryPoints.ScoreModel RenameBinaryPredictionScoreColumns Microsoft.ML.EntryPoints.ScoreModel+RenameBinaryPredictionScoreColumnsInput Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.BinNormalizer The values are assigned into equidensity bins and a value is mapped to its bin_number/number_of_bins. Microsoft.ML.Data.Normalize Bin Microsoft.ML.Transforms.Normalizers.NormalizeTransform+BinArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.CategoricalHashOneHotVectorizer Converts the categorical value into an indicator array by hashing the value and using the hash as an index in the bag. If the input column is a vector, a single indicator bag is returned for it. Microsoft.ML.Transforms.Categorical.Categorical CatTransformHash Microsoft.ML.Transforms.Categorical.OneHotHashEncodingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.CategoricalOneHotVectorizer Converts the categorical value into an indicator array by building a dictionary of categories based on the data and using the id in the dictionary as the index in the array. Microsoft.ML.Transforms.Categorical.Categorical CatTransformDict Microsoft.ML.Transforms.Categorical.OneHotEncodingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.BinNormalizer The values are assigned into equidensity bins and a value is mapped to its bin_number/number_of_bins. Microsoft.ML.Data.Normalize Bin Microsoft.ML.Transforms.NormalizeTransform+BinArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.CategoricalHashOneHotVectorizer Converts the categorical value into an indicator array by hashing the value and using the hash as an index in the bag. If the input column is a vector, a single indicator bag is returned for it. Microsoft.ML.Transforms.Categorical CatTransformHash Microsoft.ML.Transforms.OneHotHashEncodingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.CategoricalOneHotVectorizer Converts the categorical value into an indicator array by building a dictionary of categories based on the data and using the id in the dictionary as the index in the array. Microsoft.ML.Transforms.Categorical CatTransformDict Microsoft.ML.Transforms.OneHotEncodingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.CharacterTokenizer Character-oriented tokenizer where text is considered a sequence of characters. Microsoft.ML.Transforms.Text.TextAnalytics CharTokenize Microsoft.ML.Transforms.Text.TokenizingByCharactersTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.ColumnConcatenator Concatenates one or more columns of the same item type. Microsoft.ML.EntryPoints.SchemaManipulation ConcatColumns Microsoft.ML.Data.ColumnConcatenatingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.ColumnCopier Duplicates columns from the dataset Microsoft.ML.EntryPoints.SchemaManipulation CopyColumns Microsoft.ML.Transforms.ColumnCopyingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.ColumnSelector Selects a set of columns, dropping all others Microsoft.ML.EntryPoints.SchemaManipulation SelectColumns Microsoft.ML.Transforms.ColumnSelectingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.ColumnTypeConverter Converts a column to a different type, using standard conversions. Microsoft.ML.Transforms.Conversions.TypeConversion Convert Microsoft.ML.Transforms.Conversions.TypeConvertingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.ColumnTypeConverter Converts a column to a different type, using standard conversions. Microsoft.ML.Transforms.TypeConversion Convert Microsoft.ML.Transforms.TypeConvertingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.CombinerByContiguousGroupId Groups values of a scalar column into a vector, by a contiguous group ID Microsoft.ML.Transforms.GroupingOperations Group Microsoft.ML.Transforms.GroupTransform+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.ConditionalNormalizer Normalize the columns only if needed Microsoft.ML.Data.Normalize IfNeeded Microsoft.ML.Transforms.Normalizers.NormalizeTransform+MinMaxArguments Microsoft.ML.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput] +Transforms.ConditionalNormalizer Normalize the columns only if needed Microsoft.ML.Data.Normalize IfNeeded Microsoft.ML.Transforms.NormalizeTransform+MinMaxArguments Microsoft.ML.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput] +Transforms.DataCache Caches using the specified cache option. Microsoft.ML.EntryPoints.Cache CacheData Microsoft.ML.EntryPoints.Cache+CacheInput Microsoft.ML.EntryPoints.Cache+CacheOutput Transforms.DatasetScorer Score a dataset with a predictor model Microsoft.ML.EntryPoints.ScoreModel Score Microsoft.ML.EntryPoints.ScoreModel+Input Microsoft.ML.EntryPoints.ScoreModel+Output Transforms.DatasetTransformScorer Score a dataset with a transform model Microsoft.ML.EntryPoints.ScoreModel ScoreUsingTransform Microsoft.ML.EntryPoints.ScoreModel+InputTransformScorer Microsoft.ML.EntryPoints.ScoreModel+Output -Transforms.Dictionarizer Converts input values (words, numbers, etc.) to index in a dictionary. Microsoft.ML.Transforms.Text.TextAnalytics TermTransform Microsoft.ML.Transforms.Conversions.ValueToKeyMappingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.Dictionarizer Converts input values (words, numbers, etc.) to index in a dictionary. Microsoft.ML.Transforms.Text.TextAnalytics TermTransform Microsoft.ML.Transforms.ValueToKeyMappingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.FeatureCombiner Combines all the features into one feature column. Microsoft.ML.EntryPoints.FeatureCombiner PrepareFeatures Microsoft.ML.EntryPoints.FeatureCombiner+FeatureCombinerInput Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.FeatureContributionCalculationTransformer For each data point, calculates the contribution of individual features to the model prediction. Microsoft.ML.Data.FeatureContributionEntryPoint FeatureContributionCalculation Microsoft.ML.Data.FeatureContributionCalculatingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.FeatureContributionCalculationTransformer For each data point, calculates the contribution of individual features to the model prediction. Microsoft.ML.Transforms.FeatureContributionEntryPoint FeatureContributionCalculation Microsoft.ML.Transforms.FeatureContributionCalculatingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.FeatureSelectorByCount Selects the slots for which the count of non-default values is greater than or equal to a threshold. Microsoft.ML.Transforms.SelectFeatures CountSelect Microsoft.ML.Transforms.FeatureSelection.CountFeatureSelectingEstimator+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput 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.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.LpNormalization GcNormalize Microsoft.ML.Transforms.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.HashJoin Apply Microsoft.ML.Transforms.HashJoiningTransform+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.KeyToTextConverter KeyToValueTransform utilizes KeyValues metadata to map key indices to the corresponding values in the KeyValues metadata. Microsoft.ML.Transforms.Categorical KeyToText Microsoft.ML.Transforms.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 Transforms.LabelToFloatConverter Transforms the label to float to make it suitable for regression. Microsoft.ML.EntryPoints.FeatureCombiner PrepareRegressionLabel Microsoft.ML.EntryPoints.FeatureCombiner+RegressionLabelInput Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.LightLda The LDA transform implements LightLDA, a state-of-the-art implementation of Latent Dirichlet Allocation. Microsoft.ML.Transforms.Text.TextAnalytics LightLda Microsoft.ML.Transforms.Text.LatentDirichletAllocationTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.LogMeanVarianceNormalizer Normalizes the data based on the computed mean and variance of the logarithm of the data. Microsoft.ML.Data.Normalize LogMeanVar Microsoft.ML.Transforms.Normalizers.NormalizeTransform+LogMeanVarArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.LpNormalizer Normalize vectors (rows) individually by rescaling them to unit norm (L2, L1 or LInf). Performs the following operation on a vector X: Y = (X - M) / D, where M is mean and D is either L2 norm, L1 norm or LInf norm. Microsoft.ML.Transforms.Projections.LpNormalization Normalize Microsoft.ML.Transforms.Projections.LpNormalizingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.LogMeanVarianceNormalizer Normalizes the data based on the computed mean and variance of the logarithm of the data. Microsoft.ML.Data.Normalize LogMeanVar Microsoft.ML.Transforms.NormalizeTransform+LogMeanVarArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.LpNormalizer Normalize vectors (rows) individually by rescaling them to unit norm (L2, L1 or LInf). Performs the following operation on a vector X: Y = (X - M) / D, where M is mean and D is either L2 norm, L1 norm or LInf norm. Microsoft.ML.Transforms.LpNormalization Normalize Microsoft.ML.Transforms.LpNormalizingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.ManyHeterogeneousModelCombiner Combines a sequence of TransformModels and a PredictorModel into a single PredictorModel. Microsoft.ML.EntryPoints.ModelOperations CombineModels Microsoft.ML.EntryPoints.ModelOperations+PredictorModelInput Microsoft.ML.EntryPoints.ModelOperations+PredictorModelOutput -Transforms.MeanVarianceNormalizer Normalizes the data based on the computed mean and variance of the data. Microsoft.ML.Data.Normalize MeanVar Microsoft.ML.Transforms.Normalizers.NormalizeTransform+MeanVarArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.MinMaxNormalizer Normalizes the data based on the observed minimum and maximum values of the data. Microsoft.ML.Data.Normalize MinMax Microsoft.ML.Transforms.Normalizers.NormalizeTransform+MinMaxArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.MeanVarianceNormalizer Normalizes the data based on the computed mean and variance of the data. Microsoft.ML.Data.Normalize MeanVar Microsoft.ML.Transforms.NormalizeTransform+MeanVarArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.MinMaxNormalizer Normalizes the data based on the observed minimum and maximum values of the data. Microsoft.ML.Data.Normalize MinMax Microsoft.ML.Transforms.NormalizeTransform+MinMaxArguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.MissingValueHandler Handle missing values by replacing them with either the default value or the mean/min/max value (for non-text columns only). An indicator column can optionally be concatenated, if theinput column type is numeric. Microsoft.ML.Transforms.NAHandling Handle Microsoft.ML.Transforms.MissingValueHandlingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.MissingValueIndicator Create a boolean output column with the same number of slots as the input column, where the output value is true if the value in the input column is missing. Microsoft.ML.Transforms.NAHandling Indicator Microsoft.ML.Transforms.MissingValueIndicatorTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.MissingValuesDropper Removes NAs from vector columns. Microsoft.ML.Transforms.NAHandling Drop Microsoft.ML.Transforms.MissingValueDroppingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput @@ -114,7 +115,7 @@ Transforms.ModelCombiner Combines a sequence of TransformModels into a single mo Transforms.NGramTranslator Produces a bag of counts of ngrams (sequences of consecutive values of length 1-n) in a given vector of keys. It does so by building a dictionary of ngrams and using the id in the dictionary as the index in the bag. Microsoft.ML.Transforms.Text.TextAnalytics NGramTransform Microsoft.ML.Transforms.Text.NgramExtractingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.NoOperation Does nothing. Microsoft.ML.Data.NopTransform Nop Microsoft.ML.Data.NopTransform+NopInput Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.OptionalColumnCreator If the source column does not exist after deserialization, create a column with the right type and default values. Microsoft.ML.Transforms.OptionalColumnTransform MakeOptional Microsoft.ML.Transforms.OptionalColumnTransform+Arguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.PcaCalculator PCA is a dimensionality-reduction transform which computes the projection of a numeric vector onto a low-rank subspace. Microsoft.ML.Transforms.Projections.PrincipalComponentAnalysisTransformer Calculate Microsoft.ML.Transforms.Projections.PrincipalComponentAnalysisTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.PcaCalculator PCA is a dimensionality-reduction transform which computes the projection of a numeric vector onto a low-rank subspace. Microsoft.ML.Transforms.PrincipalComponentAnalysisTransformer Calculate Microsoft.ML.Transforms.PrincipalComponentAnalysisTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.PredictedLabelColumnOriginalValueConverter Transforms a predicted label column to its original values, unless it is of type bool. Microsoft.ML.EntryPoints.FeatureCombiner ConvertPredictedLabel Microsoft.ML.EntryPoints.FeatureCombiner+PredictedLabelInput Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.RandomNumberGenerator Adds a column with a generated number sequence. Microsoft.ML.Transforms.RandomNumberGenerator Generate Microsoft.ML.Transforms.GenerateNumberTransform+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.RowRangeFilter Filters a dataview on a column of type Single, Double or Key (contiguous). Keeps the values that are in the specified min/max range. NaNs are always filtered out. If the input is a Key type, the min/max are considered percentages of the number of values. Microsoft.ML.EntryPoints.SelectRows FilterByRange Microsoft.ML.Transforms.RangeFilter+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput @@ -127,7 +128,7 @@ Transforms.Segregator Un-groups vector columns into sequences of rows, inverse o Transforms.SentimentAnalyzer Uses a pretrained sentiment model to score input strings Microsoft.ML.Transforms.Text.TextAnalytics AnalyzeSentiment Microsoft.ML.Transforms.Text.SentimentAnalyzingTransformer+Arguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.TensorFlowScorer Transforms the data using the TensorFlow model. Microsoft.ML.Transforms.TensorFlowTransformer TensorFlowScorer Microsoft.ML.Transforms.TensorFlowEstimator+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.TextFeaturizer A transform that turns a collection of text documents into numerical feature vectors. The feature vectors are normalized counts of (word and/or character) ngrams in a given tokenized text. Microsoft.ML.Transforms.Text.TextAnalytics TextTransform Microsoft.ML.Transforms.Text.TextFeaturizingEstimator+Arguments Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput -Transforms.TextToKeyConverter Converts input values (words, numbers, etc.) to index in a dictionary. Microsoft.ML.Transforms.Categorical.Categorical TextToKey Microsoft.ML.Transforms.Conversions.ValueToKeyMappingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput +Transforms.TextToKeyConverter Converts input values (words, numbers, etc.) to index in a dictionary. Microsoft.ML.Transforms.Categorical TextToKey Microsoft.ML.Transforms.ValueToKeyMappingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput 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 From 62366e9c1eb44c5d480b930e2a961c9b89f9b1a6 Mon Sep 17 00:00:00 2001 From: Senja Filipi Date: Wed, 27 Feb 2019 09:35:34 -0800 Subject: [PATCH 4/4] rebase, than regenerate the catalog. --- test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv | 1 - 1 file changed, 1 deletion(-) diff --git a/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv b/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv index e5f4cb2b71..fc162e8dbe 100644 --- a/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv +++ b/test/BaselineOutput/Common/EntryPoints/core_ep-list.tsv @@ -82,7 +82,6 @@ Transforms.ColumnSelector Selects a set of columns, dropping all others Microsof Transforms.ColumnTypeConverter Converts a column to a different type, using standard conversions. Microsoft.ML.Transforms.TypeConversion Convert Microsoft.ML.Transforms.TypeConvertingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.CombinerByContiguousGroupId Groups values of a scalar column into a vector, by a contiguous group ID Microsoft.ML.Transforms.GroupingOperations Group Microsoft.ML.Transforms.GroupTransform+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput Transforms.ConditionalNormalizer Normalize the columns only if needed Microsoft.ML.Data.Normalize IfNeeded Microsoft.ML.Transforms.NormalizeTransform+MinMaxArguments Microsoft.ML.EntryPoints.CommonOutputs+MacroOutput`1[Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput] -Transforms.DataCache Caches using the specified cache option. Microsoft.ML.EntryPoints.Cache CacheData Microsoft.ML.EntryPoints.Cache+CacheInput Microsoft.ML.EntryPoints.Cache+CacheOutput Transforms.DatasetScorer Score a dataset with a predictor model Microsoft.ML.EntryPoints.ScoreModel Score Microsoft.ML.EntryPoints.ScoreModel+Input Microsoft.ML.EntryPoints.ScoreModel+Output Transforms.DatasetTransformScorer Score a dataset with a transform model Microsoft.ML.EntryPoints.ScoreModel ScoreUsingTransform Microsoft.ML.EntryPoints.ScoreModel+InputTransformScorer Microsoft.ML.EntryPoints.ScoreModel+Output Transforms.Dictionarizer Converts input values (words, numbers, etc.) to index in a dictionary. Microsoft.ML.Transforms.Text.TextAnalytics TermTransform Microsoft.ML.Transforms.ValueToKeyMappingTransformer+Options Microsoft.ML.EntryPoints.CommonOutputs+TransformOutput