From 34fa2102b01e0d5fa7b58c7a2897b3fefa5b1503 Mon Sep 17 00:00:00 2001 From: JoshuaLight Date: Sat, 30 Jun 2018 15:15:25 -0700 Subject: [PATCH 1/4] Fixed all typos in word `Transform`. --- .../RecipeInference.cs | 14 +++++++------- .../TransformInference.cs | 16 ++++++++-------- .../CategoricalTransform.cs | 2 +- src/Microsoft.ML/ILearningPipelineItem.cs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Microsoft.ML.PipelineInference/RecipeInference.cs b/src/Microsoft.ML.PipelineInference/RecipeInference.cs index 8c08e650ec..2d94a099d3 100644 --- a/src/Microsoft.ML.PipelineInference/RecipeInference.cs +++ b/src/Microsoft.ML.PipelineInference/RecipeInference.cs @@ -157,15 +157,15 @@ public abstract class Recipe public virtual List AllowedPredictorTypes() => MacroUtils.PredictorTypes.ToList(); protected virtual TransformInference.SuggestedTransform[] GetSuggestedTransforms( - TransformInference.InferenceResult tranformInferenceResult, Type predictorType) + TransformInference.InferenceResult transformInferenceResult, Type predictorType) { List allowedTransforms = AllowedTransforms(); List qualifierTransforms = QualifierTransforms(); if (AllowedPredictorTypes().Any(type => type == predictorType) && - tranformInferenceResult.SuggestedTransforms.Any(transform => qualifierTransforms.Contains(transform.ExpertType))) + transformInferenceResult.SuggestedTransforms.Any(transform => qualifierTransforms.Contains(transform.ExpertType))) { - return tranformInferenceResult.SuggestedTransforms + return transformInferenceResult.SuggestedTransforms .Where(transform => allowedTransforms.Contains(transform.ExpertType) || qualifierTransforms.Contains(transform.ExpertType)) .ToArray(); } @@ -174,10 +174,10 @@ protected virtual TransformInference.SuggestedTransform[] GetSuggestedTransforms } public virtual IEnumerable Apply( - TransformInference.InferenceResult tranformInferenceResult, Type predictorType, IChannel ch) + TransformInference.InferenceResult transformInferenceResult, Type predictorType, IChannel ch) { TransformInference.SuggestedTransform[] transforms = GetSuggestedTransforms( - tranformInferenceResult, predictorType); + transformInferenceResult, predictorType); if (transforms?.Length > 0) { @@ -431,7 +431,7 @@ public static SuggestedRecipe[] InferRecipesFromData(IHostEnvironment env, strin } } - public static InferenceResult InferRecipes(IHostEnvironment env, TransformInference.InferenceResult tranformInferenceResult, + public static InferenceResult InferRecipes(IHostEnvironment env, TransformInference.InferenceResult transformInferenceResult, Type predictorType) { Contracts.CheckValue(env, nameof(env)); @@ -441,7 +441,7 @@ public static InferenceResult InferRecipes(IHostEnvironment env, TransformInfere { var list = new List(); foreach (var recipe in GetRecipes()) - list.AddRange(recipe.Apply(tranformInferenceResult, predictorType, ch)); + list.AddRange(recipe.Apply(transformInferenceResult, predictorType, ch)); if (list.Count == 0) ch.Info("No recipes are needed for the data."); diff --git a/src/Microsoft.ML.PipelineInference/TransformInference.cs b/src/Microsoft.ML.PipelineInference/TransformInference.cs index 6390139030..4e02320451 100644 --- a/src/Microsoft.ML.PipelineInference/TransformInference.cs +++ b/src/Microsoft.ML.PipelineInference/TransformInference.cs @@ -792,7 +792,7 @@ public static StringBuilder GetTextTransformBigramTriCharArgument(string columnN } public static SuggestedTransform ConcatColumnsIntoOne(List columnNames, string concatColumnName, - Type tranformType, bool isNumeric) + Type transformType, bool isNumeric) { StringBuilder columnArgument = new StringBuilder(); StringBuilder columnNameQuoted = new StringBuilder(); @@ -843,10 +843,10 @@ public static SuggestedTransform ConcatColumnsIntoOne(List columnNames, new SuggestedTransform( $"Concatenate {columnsToConcat} columns into column {concatColumnName}", new SubComponent("Concat", - new[] { arguments }), tranformType, new TransformPipelineNode(epInput), -1, routingStructure); + new[] { arguments }), transformType, new TransformPipelineNode(epInput), -1, routingStructure); } - public static SuggestedTransform TextTransformUnigramTriChar(string srcColumn, string dstColumn, string arg, Type tranformType) + public static SuggestedTransform TextTransformUnigramTriChar(string srcColumn, string dstColumn, string arg, Type transformType) { StringBuilder columnArgument = InferenceHelpers.GetTextTransformUnigramTriCharArgument(srcColumn, dstColumn); @@ -862,10 +862,10 @@ public static SuggestedTransform TextTransformUnigramTriChar(string srcColumn, s }; return TextTransform(srcColumn, dstColumn, columnArgument.ToString(), "Unigram plus Trichar", - tranformType, new TransformPipelineNode(nodeInput)); + transformType, new TransformPipelineNode(nodeInput)); } - public static SuggestedTransform TextTransformBigramTriChar(string srcColumn, string dstColumn, string arg, Type tranformType) + public static SuggestedTransform TextTransformBigramTriChar(string srcColumn, string dstColumn, string arg, Type transformType) { StringBuilder columnArgument = InferenceHelpers.GetTextTransformBigramTriCharArgument(srcColumn, dstColumn); @@ -880,11 +880,11 @@ public static SuggestedTransform TextTransformBigramTriChar(string srcColumn, st }; return TextTransform(srcColumn, dstColumn, columnArgument.ToString(), "Bigram plus Trichar", - tranformType, new TransformPipelineNode(nodeInput)); + transformType, new TransformPipelineNode(nodeInput)); } public static SuggestedTransform TextTransform(string srcColumn, string dstColumn, string arg, - string outputMsg, Type tranformType, TransformPipelineNode pipelineNode) + string outputMsg, Type transformType, TransformPipelineNode pipelineNode) { ColumnRoutingStructure.AnnotatedName[] columnsSource = { new ColumnRoutingStructure.AnnotatedName { IsNumeric = false, Name = srcColumn } }; @@ -898,7 +898,7 @@ public static SuggestedTransform TextTransform(string srcColumn, string dstColum ") for column '{0}' and output to column '{1}'", srcColumn, dstColumn), new SubComponent("Text", arg), - tranformType, pipelineNode, -1, routingStructure); + transformType, pipelineNode, -1, routingStructure); } } diff --git a/src/Microsoft.ML.Transforms/CategoricalTransform.cs b/src/Microsoft.ML.Transforms/CategoricalTransform.cs index 621bbe6c1d..8a63e4547d 100644 --- a/src/Microsoft.ML.Transforms/CategoricalTransform.cs +++ b/src/Microsoft.ML.Transforms/CategoricalTransform.cs @@ -147,7 +147,7 @@ public static IDataTransform CreateTransformCore( Contracts.CheckValue(columnOutputKinds, nameof(columnOutputKinds)); Contracts.CheckParam(columns.Length == columnOutputKinds.Count, nameof(columns)); - using (var ch = h.Start("Create Tranform Core")) + using (var ch = h.Start("Create Transform Core")) { // Create the KeyToVectorTransform, if needed. List cols = new List(); diff --git a/src/Microsoft.ML/ILearningPipelineItem.cs b/src/Microsoft.ML/ILearningPipelineItem.cs index c36f890c57..efa4464453 100644 --- a/src/Microsoft.ML/ILearningPipelineItem.cs +++ b/src/Microsoft.ML/ILearningPipelineItem.cs @@ -32,7 +32,7 @@ public interface ILearningPipelineLoader : ILearningPipelineItem /// /// An item that can be added to the Learning Pipeline that can be trained and or return a IDataView. - /// This encapsulates an IDataView(input) and ITranformModel(output) object for a transform and + /// This encapsulates an IDataView(input) and ITransformModel(output) object for a transform and /// for a learner it will encapsulate IDataView(input) and IPredictorModel(output). /// public interface ILearningPipelineStep From 14cb62a73e4a175b938f990e63d2517bbdab0d94 Mon Sep 17 00:00:00 2001 From: JoshuaLight Date: Mon, 2 Jul 2018 14:10:22 -0700 Subject: [PATCH 2/4] Removed `data` solution-folder from `Microsoft.ML.sln`. Fixes #475. --- Microsoft.ML.sln | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln index 63a15c977c..36620a88a2 100644 --- a/Microsoft.ML.sln +++ b/Microsoft.ML.sln @@ -34,12 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Api", "src\Mic EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\Microsoft.ML.Tests\Microsoft.ML.Tests.csproj", "{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{FDA2FD2C-A708-43AC-A941-4D941B0853BF}" - ProjectSection(SolutionItems) = preProject - test\data\sentiment_data.tsv = test\data\sentiment_data.tsv - test\data\sentiment_test.tsv = test\data\sentiment_test.tsv - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}" @@ -223,7 +217,6 @@ Global {58E06735-1129-4DD5-86E0-6BBFF049AAD9} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} - {FDA2FD2C-A708-43AC-A941-4D941B0853BF} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} From ef0cc488528df266a0aea523e80fbf1ddf16d5d1 Mon Sep 17 00:00:00 2001 From: Joshua Light Date: Tue, 3 Jul 2018 10:27:53 +0300 Subject: [PATCH 3/4] Revert "Removed `data` solution-folder from `Microsoft.ML.sln`." This reverts commit 14cb62a73e4a175b938f990e63d2517bbdab0d94. --- Microsoft.ML.sln | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln index 36620a88a2..63a15c977c 100644 --- a/Microsoft.ML.sln +++ b/Microsoft.ML.sln @@ -34,6 +34,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Api", "src\Mic EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\Microsoft.ML.Tests\Microsoft.ML.Tests.csproj", "{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{FDA2FD2C-A708-43AC-A941-4D941B0853BF}" + ProjectSection(SolutionItems) = preProject + test\data\sentiment_data.tsv = test\data\sentiment_data.tsv + test\data\sentiment_test.tsv = test\data\sentiment_test.tsv + EndProjectSection +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}" @@ -217,6 +223,7 @@ Global {58E06735-1129-4DD5-86E0-6BBFF049AAD9} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} + {FDA2FD2C-A708-43AC-A941-4D941B0853BF} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} From ad5857a055ef97ddc470a7aad81341b30cd19cff Mon Sep 17 00:00:00 2001 From: JoshuaLight Date: Tue, 3 Jul 2018 14:29:26 -0700 Subject: [PATCH 4/4] Removed `data` solution-folder from solution files. Fixes #475. --- Microsoft.ML.sln | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln index 63a15c977c..36620a88a2 100644 --- a/Microsoft.ML.sln +++ b/Microsoft.ML.sln @@ -34,12 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Api", "src\Mic EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Tests", "test\Microsoft.ML.Tests\Microsoft.ML.Tests.csproj", "{64BC22D3-1E76-41EF-94D8-C79E471FF2DD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "data", "{FDA2FD2C-A708-43AC-A941-4D941B0853BF}" - ProjectSection(SolutionItems) = preProject - test\data\sentiment_data.tsv = test\data\sentiment_data.tsv - test\data\sentiment_test.tsv = test\data\sentiment_test.tsv - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TestFramework", "test\Microsoft.ML.TestFramework\Microsoft.ML.TestFramework.csproj", "{B5989C06-4FFA-46C1-9D85-9366B34AB0A2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.InternalStreams", "src\Microsoft.ML.InternalStreams\Microsoft.ML.InternalStreams.csproj", "{C4F7938F-7109-43C8-92A5-9BE47C7FF7D9}" @@ -223,7 +217,6 @@ Global {58E06735-1129-4DD5-86E0-6BBFF049AAD9} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {2F636A2C-062C-49F4-85F3-60DCADAB6A43} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {64BC22D3-1E76-41EF-94D8-C79E471FF2DD} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} - {FDA2FD2C-A708-43AC-A941-4D941B0853BF} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {B5989C06-4FFA-46C1-9D85-9366B34AB0A2} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {C4F7938F-7109-43C8-92A5-9BE47C7FF7D9} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {6B047E09-39C9-4583-96F3-685D84CA4117} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}