Internalize much of the entry-point attribute support

Author: TomFinley

src/Microsoft.ML.Core/EntryPoints/EntryPointModuleAttribute.cs

@@ -9,13 +9,15 @@ namespace Microsoft.ML.Runtime.EntryPoints
     /// <summary>
     /// This is a signature for classes that are 'holders' of entry points and components.
     /// </summary>
-    public delegate void SignatureEntryPointModule();
+    [BestFriend]
+    internal delegate void SignatureEntryPointModule();
 
     /// <summary>
     /// A simplified assembly attribute for marking EntryPoint modules.
     /// </summary>
     [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-    public sealed class EntryPointModuleAttribute : LoadableClassAttributeBase
+    [BestFriend]
+    internal sealed class EntryPointModuleAttribute : LoadableClassAttributeBase
     {
         public EntryPointModuleAttribute(Type loaderType)
             : base(null, typeof(void), loaderType, null, new[] { typeof(SignatureEntryPointModule) }, loaderType.FullName)

src/Microsoft.ML.Core/EntryPoints/EntryPointUtils.cs

@@ -12,7 +12,8 @@
 
 namespace Microsoft.ML.Runtime.EntryPoints
 {
-    public static class EntryPointUtils
+    [BestFriend]
+    internal static class EntryPointUtils
     {
         private static bool IsValueWithinRange<T>(TlcModule.RangeAttribute range, object obj)
         {

src/Microsoft.ML.Core/EntryPoints/IMlState.cs

@@ -10,5 +10,5 @@ namespace Microsoft.ML.Runtime.EntryPoints
     /// black box to the graph. The macro itself will then case to the concrete type.
     /// </summary>
     public interface IMlState
-    {}
+    { }
 }

src/Microsoft.ML.Core/EntryPoints/ModuleArgs.cs

@@ -18,7 +18,8 @@ namespace Microsoft.ML.Runtime.EntryPoints
     /// This class defines attributes to annotate module inputs, outputs, entry points etc. when defining
     /// the module interface.
     /// </summary>
-    public static class TlcModule
+    [BestFriend]
+    internal static class TlcModule
     {
         /// <summary>
         /// An attribute used to annotate the component.

src/Microsoft.ML.Legacy/Runtime/EntryPoints/JsonUtils/GraphRunner.cs

@@ -140,7 +140,7 @@ public void SetInput<TInput>(string name, TInput input)
         /// <summary>
         /// Get the data kind of a particular port.
         /// </summary>
-        public TlcModule.DataKind GetPortDataKind(string name)
+        internal TlcModule.DataKind GetPortDataKind(string name)
         {
             _host.CheckNonEmpty(name, nameof(name));
             EntryPointVariable variable;

src/Microsoft.ML.PipelineInference/AutoMlUtils.cs

@@ -338,7 +338,7 @@ public static AutoInference.LevelDependencyMap ComputeColumnResponsibilities(IDa
             return mapping;
         }
 
-        public static TlcModule.SweepableParamAttribute[] GetSweepRanges(Type learnerInputType)
+        internal static TlcModule.SweepableParamAttribute[] GetSweepRanges(Type learnerInputType)
         {
             var paramSet = new List<TlcModule.SweepableParamAttribute>();
             foreach (var prop in learnerInputType.GetProperties(BindingFlags.Instance |
@@ -370,7 +370,7 @@ public static TlcModule.SweepableParamAttribute[] GetSweepRanges(Type learnerInp
             return paramSet.ToArray();
         }
 
-        public static IValueGenerator ToIValueGenerator(TlcModule.SweepableParamAttribute attr)
+        internal static IValueGenerator ToIValueGenerator(TlcModule.SweepableParamAttribute attr)
         {
             if (attr is TlcModule.SweepableLongParamAttribute sweepableLongParamAttr)
             {
@@ -430,7 +430,7 @@ private static void SetValue(PropertyInfo pi, IComparable value, object entryPoi
         /// <summary>
         /// Updates properties of entryPointObj instance based on the values in sweepParams
         /// </summary>
-        public static bool UpdateProperties(object entryPointObj, TlcModule.SweepableParamAttribute[] sweepParams)
+        internal static bool UpdateProperties(object entryPointObj, TlcModule.SweepableParamAttribute[] sweepParams)
         {
             bool result = true;
             foreach (var param in sweepParams)
@@ -501,7 +501,7 @@ public static void PopulateSweepableParams(RecipeInference.SuggestedRecipe.Sugge
             }
         }
 
-        public static bool CheckEntryPointStateMatchesParamValues(object entryPointObj,
+        internal static bool CheckEntryPointStateMatchesParamValues(object entryPointObj,
             TlcModule.SweepableParamAttribute[] sweepParams)
         {
             foreach (var param in sweepParams)
@@ -584,7 +584,7 @@ public static IRunResult[] ConvertToRunResults(PipelinePattern[] history, bool i
         /// Method to convert set of sweepable hyperparameters into <see cref="IComponentFactory"/> instances used
         /// by the current smart hyperparameter sweepers.
         /// </summary>
-        public static IComponentFactory<IValueGenerator>[] ConvertToComponentFactories(TlcModule.SweepableParamAttribute[] hps)
+        internal static IComponentFactory<IValueGenerator>[] ConvertToComponentFactories(TlcModule.SweepableParamAttribute[] hps)
         {
             var results = new IComponentFactory<IValueGenerator>[hps.Length];
 

src/Microsoft.ML.PipelineInference/Interfaces/IPipelineNode.cs

@@ -60,7 +60,7 @@ protected string GetEpName(Type type)
             return epName;
         }
 
-        protected void PropagateParamSetValues(ParameterSet hyperParams,
+        private protected void PropagateParamSetValues(ParameterSet hyperParams,
             TlcModule.SweepableParamAttribute[] sweepParams)
         {
             var spMap = sweepParams.ToDictionary(sp => sp.Name);
@@ -79,9 +79,9 @@ public sealed class TransformPipelineNode : PipelineNodeBase, IPipelineNode<ITra
         private readonly CommonInputs.ITransformInput _entryPointObj;
         private readonly CommonInputs.ITrainerInput _subTrainerObj;
 
-        public TlcModule.SweepableParamAttribute[] SweepParams { get; }
+        internal TlcModule.SweepableParamAttribute[] SweepParams { get; }
 
-        public TransformPipelineNode(CommonInputs.ITransformInput entryPointObj,
+        internal TransformPipelineNode(CommonInputs.ITransformInput entryPointObj,
             IEnumerable<TlcModule.SweepableParamAttribute> sweepParams = null,
             CommonInputs.ITrainerInput subTrainerObj = null)
         {
@@ -136,9 +136,10 @@ public sealed class TrainerPipelineNode : PipelineNodeBase, IPipelineNode<IPredi
     {
         private readonly CommonInputs.ITrainerInput _entryPointObj;
 
-        public TlcModule.SweepableParamAttribute[] SweepParams { get; }
+        [BestFriend]
+        internal TlcModule.SweepableParamAttribute[] SweepParams { get; }
 
-        public TrainerPipelineNode(CommonInputs.ITrainerInput entryPointObj,
+        internal TrainerPipelineNode(CommonInputs.ITrainerInput entryPointObj,
             IEnumerable<TlcModule.SweepableParamAttribute> sweepParams = null,
             ParameterSet hyperParameterSet = null)
         {

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

@@ -0,0 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// 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.Runtime.CompilerServices;
+using Microsoft.ML;
+
+[assembly: InternalsVisibleTo(assemblyName: "Microsoft.ML.Predictor.Tests" + PublicKey.TestValue)]
+
+[assembly: WantsToBeBestFriends]