Internalize ITransformTemplate

src/Microsoft.ML.Data/Commands/ScoreCommand.cs

@@ -20,7 +20,8 @@ namespace Microsoft.ML.Data
 {
     using TScorerFactory = IComponentFactory<IDataView, ISchemaBoundMapper, RoleMappedSchema, IDataScorerTransform>;
 
-    public interface IDataScorerTransform : IDataTransform, ITransformTemplate
+    [BestFriend]
+    internal interface IDataScorerTransform : IDataTransform, ITransformTemplate
     {
     }
 

src/Microsoft.ML.Data/Data/IDataLoader.cs

@@ -97,7 +97,8 @@ public interface IDataTransform : IDataView, ICanSaveModel
     /// Data transforms need to be able to apply themselves to a different input IDataView.
     /// This interface allows them to implement custom rebinding logic.
     /// </summary>
-    public interface ITransformTemplate : IDataTransform
+    [BestFriend]
+    internal interface ITransformTemplate : IDataTransform
     {
         // REVIEW: re-apply operation should support shallow schema modification,
         // like renaming source and destination columns.

src/Microsoft.ML.Data/DataView/RowToRowMapperTransform.cs

@@ -271,7 +271,7 @@ public Row GetRow(Row input, Func<int, bool> active)
             }
         }
 
-        public IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+        IDataTransform ITransformTemplate.ApplyToData(IHostEnvironment env, IDataView newSource)
         {
             Contracts.CheckValue(env, nameof(env));
 

src/Microsoft.ML.Data/Scorers/BinaryClassifierScorer.cs

@@ -209,7 +209,7 @@ private protected override void SaveAsOnnxCore(OnnxContext ctx)
             }
         }
 
-        public override IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+        private protected override IDataTransform ApplyToDataCore(IHostEnvironment env, IDataView newSource)
         {
             Contracts.CheckValue(env, nameof(env));
             env.CheckValue(newSource, nameof(newSource));

src/Microsoft.ML.Data/Scorers/ClusteringScorer.cs

@@ -84,7 +84,7 @@ private protected override void SaveCore(ModelSaveContext ctx)
             base.SaveCore(ctx);
         }
 
-        public override IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+        private protected override IDataTransform ApplyToDataCore(IHostEnvironment env, IDataView newSource)
         {
             Contracts.CheckValue(env, nameof(env));
             Contracts.CheckValue(newSource, nameof(newSource));

src/Microsoft.ML.Data/Scorers/GenericScorer.cs

@@ -165,7 +165,7 @@ internal GenericScorer(IHostEnvironment env, ScorerArgumentsBase args, IDataView
         }
 
         /// <summary>
-        /// Constructor for <see cref="ApplyToData"/> method.
+        /// Constructor for <see cref="ApplyToDataCore"/> method.
         /// </summary>
         private GenericScorer(IHostEnvironment env, GenericScorer transform, IDataView data)
             : base(env, data, RegistrationName, transform.Bindable)
@@ -254,7 +254,7 @@ protected override bool WantParallelCursors(Func<int, bool> predicate)
             return _bindings.AnyNewColumnsActive(predicate);
         }
 
-        public override IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+        private protected override IDataTransform ApplyToDataCore(IHostEnvironment env, IDataView newSource)
         {
             Host.CheckValue(env, nameof(env));
             Host.CheckValue(newSource, nameof(newSource));

src/Microsoft.ML.Data/Scorers/MultiClassClassifierScorer.cs

@@ -484,7 +484,7 @@ private protected override void SaveCore(ModelSaveContext ctx)
             base.SaveCore(ctx);
         }
 
-        public override IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+        private protected override IDataTransform ApplyToDataCore(IHostEnvironment env, IDataView newSource)
         {
             Contracts.CheckValue(env, nameof(env));
             Contracts.CheckValue(newSource, nameof(newSource));

src/Microsoft.ML.Data/Scorers/RowToRowScorerBase.cs

@@ -63,10 +63,12 @@ public sealed override void Save(ModelSaveContext ctx)
         [BestFriend]
         private protected abstract void SaveCore(ModelSaveContext ctx);
 
-        /// <summary>
-        /// For the ITransformTemplate implementation.
-        /// </summary>
-        public abstract IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource);
+        private protected abstract IDataTransform ApplyToDataCore(IHostEnvironment env, IDataView newSource);
+
+        IDataTransform ITransformTemplate.ApplyToData(IHostEnvironment env, IDataView newSource)
+            => ApplyToDataCore(env, newSource);
+        internal IDataView ApplyToData(IHostEnvironment env, IDataView newSource)
+            => ApplyToDataCore(env, newSource);
 
         /// <summary>
         /// Derived classes provide the specific bindings object.

src/Microsoft.ML.Data/Transforms/ColumnSelecting.cs

@@ -682,7 +682,7 @@ public Row GetRow(Row input, Func<int, bool> active)
                 return new RowImpl(input, _mapper);
             }
 
-            public IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+            IDataTransform ITransformTemplate.ApplyToData(IHostEnvironment env, IDataView newSource)
                 => new SelectColumnsDataTransform(env, _transform, new Mapper(_transform, newSource.Schema), newSource);
         }
 

src/Microsoft.ML.Data/Transforms/SkipTakeFilter.cs

@@ -97,10 +97,8 @@ private SkipTakeFilter(long skip, long take, IHostEnvironment env, IDataView inp
             _take = take;
         }
 
-        public IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
-        {
-            return new SkipTakeFilter(_skip, _take, env, newSource);
-        }
+        IDataTransform ITransformTemplate.ApplyToData(IHostEnvironment env, IDataView newSource)
+            => new SkipTakeFilter(_skip, _take, env, newSource);
 
         public static SkipTakeFilter Create(IHostEnvironment env, Arguments args, IDataView input)
         {

src/Microsoft.ML.TimeSeries/SequentialTransformerBase.cs

@@ -455,7 +455,7 @@ public override void Save(ModelSaveContext ctx)
                 _parent.Save(ctx);
             }
 
-            public IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+            IDataTransform ITransformTemplate.ApplyToData(IHostEnvironment env, IDataView newSource)
             {
                 return new SequentialDataTransform(Contracts.CheckRef(env, nameof(env)).Register("SequentialDataTransform"), _parent, newSource, _mapper);
             }

src/Microsoft.ML.Transforms/LambdaTransform.cs

@@ -22,7 +22,8 @@ namespace Microsoft.ML.Transforms
     /// <summary>
     /// Utility class for creating transforms easily.
     /// </summary>
-    public static class LambdaTransform
+    [BestFriend]
+    internal static class LambdaTransform
     {
         /// <summary>
         /// A delegate type to create a persistent transform, utilized by the creation functions
@@ -33,7 +34,7 @@ public static class LambdaTransform
         /// <param name="input">The dataview this transform should be persisted on</param>
         /// <returns>A transform of the input data, as parameterized by the binary input
         /// stream</returns>
-        public delegate ITransformTemplate LoadDelegate(BinaryReader reader, IHostEnvironment env, IDataView input);
+        internal delegate ITransformTemplate LoadDelegate(BinaryReader reader, IHostEnvironment env, IDataView input);
 
         internal const string LoaderSignature = "CustomTransformer";
 

src/Microsoft.ML.Transforms/Properties/AssemblyInfo.cs

@@ -14,5 +14,7 @@
 [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.RServerScoring.NeuralNetworks" + InternalPublicKey.Value)]
 [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Runtime.TextAnalytics" + InternalPublicKey.Value)]
 [assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.RServerScoring.TextAnalytics" + InternalPublicKey.Value)]
+[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.TimeSeries" + PublicKey.Value)]
+[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Tests" + PublicKey.TestValue)]
 
 [assembly: WantsToBeBestFriends]

src/Microsoft.ML.Transforms/StatefulFilterTransform.cs

@@ -133,7 +133,7 @@ public RowCursor[] GetRowCursorSet(IEnumerable<Schema.Column> columnsNeeded, int
 
         public IDataView Source => _source;
 
-        public IDataTransform ApplyToData(IHostEnvironment env, IDataView newSource)
+        IDataTransform ITransformTemplate.ApplyToData(IHostEnvironment env, IDataView newSource)
         {
             Contracts.CheckValue(env, nameof(env));
             env.CheckValue(newSource, nameof(newSource));