namespace moves for more transforms

src/Microsoft.ML.Legacy/Runtime/EntryPoints/TrainTestSplit.cs

@@ -7,6 +7,7 @@
 using Microsoft.ML.Runtime.Data;
 using Microsoft.ML.Runtime.EntryPoints;
 using Microsoft.ML.Transforms;
+using Microsoft.ML.Transforms.Conversions;
 
 [assembly: LoadableClass(typeof(void), typeof(TrainTestSplit), null, typeof(SignatureEntryPointModule), "TrainTestSplit")]
 

src/Microsoft.ML.PCA/PcaTransform.cs

@@ -13,7 +13,7 @@
 using Microsoft.ML.Runtime.Numeric;
 using Microsoft.ML.StaticPipe;
 using Microsoft.ML.StaticPipe.Runtime;
-using Microsoft.ML.Transforms.PCA;
+using Microsoft.ML.Transforms.Projections;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -33,7 +33,7 @@
 
 [assembly: LoadableClass(typeof(void), typeof(PcaTransform), null, typeof(SignatureEntryPointModule), PcaTransform.LoaderSignature)]
 
-namespace Microsoft.ML.Transforms.PCA
+namespace Microsoft.ML.Transforms.Projections
 {
     /// <include file='doc.xml' path='doc/members/member[@name="PCA"]/*' />
     public sealed class PcaTransform : OneToOneTransformerBase

src/Microsoft.ML.Transforms/BootstrapSampleTransform.cs

@@ -19,7 +19,7 @@
 
 [assembly: EntryPointModule(typeof(BootstrapSample))]
 
-namespace Microsoft.ML.Runtime.Data
+namespace Microsoft.ML.Transforms
 {
     /// <summary>
     /// This class approximates bootstrap sampling of a dataview.

src/Microsoft.ML.Transforms/CategoricalHashTransform.cs

@@ -20,7 +20,7 @@
 [assembly: LoadableClass(CategoricalHashTransform.Summary, typeof(IDataTransform), typeof(CategoricalHashTransform), typeof(CategoricalHashTransform.Arguments), typeof(SignatureDataTransform),
     CategoricalHashTransform.UserName, "CategoricalHashTransform", "CatHashTransform", "CategoricalHash", "CatHash")]
 
-namespace Microsoft.ML.Runtime.Data
+namespace Microsoft.ML.Transforms.Categorical
 {
     public sealed class CategoricalHashTransform : ITransformer, ICanSaveModel
     {

src/Microsoft.ML.Transforms/CategoricalTransform.cs

@@ -23,6 +23,7 @@
     CategoricalTransform.UserName, "CategoricalTransform", "CatTransform", "Categorical", "Cat")]
 
 [assembly: LoadableClass(typeof(void), typeof(Categorical), null, typeof(SignatureEntryPointModule), "Categorical")]
+
 namespace Microsoft.ML.Transforms.Categorical
 {
     /// <include file='doc.xml' path='doc/members/member[@name="CategoricalOneHotVectorizer"]/*' />

src/Microsoft.ML.Transforms/CompositeTransform.cs

@@ -2,21 +2,18 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Microsoft.ML.Runtime;
 using Microsoft.ML.Runtime.Data;
-using Microsoft.ML.Runtime.Internal.Utilities;
 using Microsoft.ML.Runtime.Model;
+using Microsoft.ML.Transforms;
 
 // REVIEW: This is a temporary hack code to allow loading old saved loader models. Delete it once it is no longer needed.
 
 // The below signatures are for (de)serialization purposes only.
 [assembly: LoadableClass(typeof(IDataTransform), typeof(CompositeTransform), null, typeof(SignatureLoadDataTransform),
     "Composite Transform", CompositeTransform.LoaderSignature)]
 
-namespace Microsoft.ML.Runtime.Data
+namespace Microsoft.ML.Transforms
 {
     public static class CompositeTransform
     {

src/Microsoft.ML.Transforms/GcnTransform.cs

@@ -2,17 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Float = System.Single;
-
-using System;
-using System.Text;
 using Microsoft.ML.Runtime;
 using Microsoft.ML.Runtime.CommandLine;
 using Microsoft.ML.Runtime.Data;
 using Microsoft.ML.Runtime.EntryPoints;
 using Microsoft.ML.Runtime.Internal.CpuMath;
 using Microsoft.ML.Runtime.Internal.Utilities;
 using Microsoft.ML.Runtime.Model;
+using Microsoft.ML.Transforms.Projections;
+using System;
+using System.Text;
+using Float = System.Single;
 
 [assembly: LoadableClass(LpNormNormalizerTransform.GcnSummary, typeof(LpNormNormalizerTransform), typeof(LpNormNormalizerTransform.GcnArguments), typeof(SignatureDataTransform),
     LpNormNormalizerTransform.UserNameGn, "GcnTransform", LpNormNormalizerTransform.ShortNameGn)]
@@ -25,7 +25,7 @@
 
 [assembly: EntryPointModule(typeof(LpNormalization))]
 
-namespace Microsoft.ML.Runtime.Data
+namespace Microsoft.ML.Transforms.Projections
 {
     /// <summary>
     /// Lp-Norm (vector/row-wise) normalization transform. Has the following two set of arguments:

src/Microsoft.ML.Transforms/GroupTransform.cs

@@ -20,7 +20,7 @@
 [assembly: LoadableClass(GroupTransform.Summary, typeof(GroupTransform), null, typeof(SignatureLoadDataTransform),
     GroupTransform.UserName, GroupTransform.LoaderSignature)]
 
-[assembly: EntryPointModule(typeof(GroupingOperations))]
+[assembly: EntryPointModule(typeof(Microsoft.ML.Transforms.GroupingOperations))]
 
 namespace Microsoft.ML.Transforms
 {

src/Microsoft.ML.Transforms/HashJoinTransform.cs

@@ -2,20 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Float = System.Single;
-
-using System;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
 using Microsoft.ML.Runtime;
 using Microsoft.ML.Runtime.CommandLine;
 using Microsoft.ML.Runtime.Data;
-using Microsoft.ML.Runtime.Data.Conversion;
 using Microsoft.ML.Runtime.EntryPoints;
 using Microsoft.ML.Runtime.Internal.Utilities;
 using Microsoft.ML.Runtime.Model;
+using Microsoft.ML.Transforms.Conversions;
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using Float = System.Single;
 
 [assembly: LoadableClass(HashJoinTransform.Summary, typeof(HashJoinTransform), typeof(HashJoinTransform.Arguments), typeof(SignatureDataTransform),
     HashJoinTransform.UserName, "HashJoinTransform", HashJoinTransform.RegistrationName)]
@@ -25,7 +24,7 @@
 
 [assembly: EntryPointModule(typeof(HashJoin))]
 
-namespace Microsoft.ML.Runtime.Data
+namespace Microsoft.ML.Transforms.Conversions
 {
     /// <summary>
     /// This transform hashes its input columns. Each column is hashed separately, and within each
@@ -656,7 +655,7 @@ private HashDelegate<TSrc> ComposeHashDelegate<TSrc>()
 
             // Default case: convert to text and hash as a string.
             var sb = default(StringBuilder);
-            var conv = Conversions.Instance.GetStringConversion<TSrc>();
+            var conv = Runtime.Data.Conversion.Conversions.Instance.GetStringConversion<TSrc>();
             return
                 (in TSrc value, uint seed) =>
                 {

src/Microsoft.ML.Transforms/RffTransform.cs

@@ -12,7 +12,7 @@
 using Microsoft.ML.Runtime.Numeric;
 using Microsoft.ML.StaticPipe;
 using Microsoft.ML.StaticPipe.Runtime;
-using Microsoft.ML.Transforms;
+using Microsoft.ML.Transforms.Projections;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -30,7 +30,7 @@
 [assembly: LoadableClass(typeof(IRowMapper), typeof(RffTransform), null, typeof(SignatureLoadRowMapper),
     "Random Fourier Features Transform", RffTransform.LoaderSignature)]
 
-namespace Microsoft.ML.Transforms
+namespace Microsoft.ML.Transforms.Projections
 {
     public sealed class RffTransform : OneToOneTransformerBase
     {

src/Microsoft.ML.Transforms/Text/TextTransform.cs

@@ -15,6 +15,7 @@
 using Microsoft.ML.StaticPipe;
 using Microsoft.ML.StaticPipe.Runtime;
 using Microsoft.ML.Transforms;
+using Microsoft.ML.Transforms.Projections;
 using Microsoft.ML.Transforms.Text;
 using System;
 using System.Collections.Generic;

src/Microsoft.ML.Transforms/WhiteningTransform.cs

@@ -16,15 +16,15 @@
 using Microsoft.ML.Runtime.Internal.Utilities;
 using Microsoft.ML.Runtime.Model;
 using Microsoft.ML.Runtime.Internal.Internallearn;
-using Microsoft.ML.Transforms;
+using Microsoft.ML.Transforms.Projections;
 
 [assembly: LoadableClass(WhiteningTransform.Summary, typeof(WhiteningTransform), typeof(WhiteningTransform.Arguments), typeof(SignatureDataTransform),
     "Whitening Transform", "WhiteningTransform", "Whitening")]
 
 [assembly: LoadableClass(WhiteningTransform.Summary, typeof(WhiteningTransform), null, typeof(SignatureLoadDataTransform),
     "Whitening Transform", WhiteningTransform.LoaderSignature, WhiteningTransform.LoaderSignatureOld)]
 
-namespace Microsoft.ML.Transforms
+namespace Microsoft.ML.Transforms.Projections
 {
     public enum WhiteningKind
     {

src/Microsoft.ML.Transforms/WrappedGcnTransformers.cs

@@ -7,9 +7,10 @@
 using Microsoft.ML.Runtime.Data;
 using Microsoft.ML.StaticPipe;
 using Microsoft.ML.StaticPipe.Runtime;
+using Microsoft.ML.Transforms.Projections;
 using System.Collections.Generic;
 using System.Linq;
-using static Microsoft.ML.Runtime.Data.LpNormNormalizerTransform;
+using static Microsoft.ML.Transforms.Projections.LpNormNormalizerTransform;
 
 namespace Microsoft.ML.Transforms
 {

src/Microsoft.ML.Transforms/WrappedWhiteningTransformer.cs

@@ -10,6 +10,7 @@
 using Microsoft.ML.StaticPipe.Runtime;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.ML.Transforms.Projections;
 
 namespace Microsoft.ML.Transforms
 {