From 59a01c37e7ca7bd7ed36e8486c46bb28e27b9478 Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Tue, 19 Feb 2019 14:11:50 -0800 Subject: [PATCH 1/2] Internalization of OneToOne and ManyToOne Column classes --- src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs | 8 +++++--- src/Microsoft.ML.Transforms/GcnTransform.cs | 1 + .../Text/WordHashBagProducingTransform.cs | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs b/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs index 93d88cc620..14ec6b8b57 100644 --- a/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs +++ b/src/Microsoft.ML.Data/Transforms/ColumnBindingsBase.cs @@ -14,7 +14,7 @@ namespace Microsoft.ML.Data { - public abstract class SourceNameColumnBase + internal abstract class SourceNameColumnBase { [Argument(ArgumentType.AtMostOnce, HelpText = "Name of the new column", ShortName = "name")] public string Name; @@ -103,13 +103,15 @@ public bool TrySanitize() } } - public abstract class OneToOneColumn : SourceNameColumnBase + [BestFriend] + internal abstract class OneToOneColumn : SourceNameColumnBase { [BestFriend] private protected OneToOneColumn() { } } - public abstract class ManyToOneColumn + [BestFriend] + internal abstract class ManyToOneColumn { [Argument(ArgumentType.AtMostOnce, HelpText = "Name of the new column", ShortName = "name")] public string Name; diff --git a/src/Microsoft.ML.Transforms/GcnTransform.cs b/src/Microsoft.ML.Transforms/GcnTransform.cs index 861d1bcbbc..07a4727624 100644 --- a/src/Microsoft.ML.Transforms/GcnTransform.cs +++ b/src/Microsoft.ML.Transforms/GcnTransform.cs @@ -77,6 +77,7 @@ internal sealed class GcnOptions : TransformInputBase public float Scale = LpNormalizingEstimatorBase.Defaults.Scale; } + [BestFriend] internal abstract class ColumnBase : OneToOneColumn { [Argument(ArgumentType.AtMostOnce, HelpText = "Subtract mean from each value before normalizing")] diff --git a/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs b/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs index 564bf880f8..eb387521a1 100644 --- a/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs +++ b/src/Microsoft.ML.Transforms/Text/WordHashBagProducingTransform.cs @@ -161,7 +161,7 @@ internal static IDataTransform Create(IHostEnvironment env, Options options, IDa /// internal static class NgramHashExtractingTransformer { - public abstract class ColumnBase : ManyToOneColumn + internal abstract class ColumnBase : ManyToOneColumn { [Argument(ArgumentType.AtMostOnce, HelpText = "Ngram length (stores all lengths up to the specified Ngram length)", ShortName = "ngram")] public int? NgramLength; From cd8fd0af671beb7f33f1ae228b58c68f5726aee0 Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Wed, 20 Feb 2019 11:27:58 -0800 Subject: [PATCH 2/2] PR feedback. --- src/Microsoft.ML.Transforms/GcnTransform.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Microsoft.ML.Transforms/GcnTransform.cs b/src/Microsoft.ML.Transforms/GcnTransform.cs index 07a4727624..861d1bcbbc 100644 --- a/src/Microsoft.ML.Transforms/GcnTransform.cs +++ b/src/Microsoft.ML.Transforms/GcnTransform.cs @@ -77,7 +77,6 @@ internal sealed class GcnOptions : TransformInputBase public float Scale = LpNormalizingEstimatorBase.Defaults.Scale; } - [BestFriend] internal abstract class ColumnBase : OneToOneColumn { [Argument(ArgumentType.AtMostOnce, HelpText = "Subtract mean from each value before normalizing")]