Textloader internalizations, documentation, and Arguments refactoring

src/Microsoft.ML.Data/DataLoadSave/DataReaderExtensions.cs

@@ -9,14 +9,12 @@ namespace Microsoft.ML
 {
     public static class DataReaderExtensions
     {
-        public static IDataView Read(this IDataReader<IMultiStreamSource> reader, string path)
-        {
-            return reader.Read(new MultiFileSource(path));
-        }
-
+        /// <summary>
+        /// Reads data from one or more file <paramref name="path"/> into an <see cref="IDataView"/>.
+        /// </summary>
+        /// <param name="reader">The reader to use.</param>
+        /// <param name="path">One or more paths from which to load data.</param>
         public static IDataView Read(this IDataReader<IMultiStreamSource> reader, params string[] path)
-        {
-            return reader.Read(new MultiFileSource(path));
-        }
+            => reader.Read(new MultiFileSource(path));
     }
 }

src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderSaverCatalog.cs

@@ -21,8 +21,8 @@ public static class TextLoaderSaverCatalog
         /// <param name="dataSample">The optional location of a data sample. The sample can be used to infer column names and number of slots in each column.</param>
         public static TextLoader CreateTextLoader(this DataOperationsCatalog catalog,
             TextLoader.Column[] columns,
-            bool hasHeader = TextLoader.DefaultArguments.HasHeader,
-            char separatorChar = TextLoader.DefaultArguments.Separator,
+            bool hasHeader = TextLoader.Defaults.HasHeader,
+            char separatorChar = TextLoader.Defaults.Separator,
             IMultiStreamSource dataSample = null)
             => new TextLoader(CatalogUtils.GetEnvironment(catalog), columns, hasHeader, separatorChar, dataSample);
 
@@ -53,11 +53,11 @@ public static TextLoader CreateTextLoader(this DataOperationsCatalog catalog,
         /// except for 3rd and 5th columns which have values 6 and 3</param>
         /// <param name="trimWhitespace">Remove trailing whitespace from lines</param>
         public static TextLoader CreateTextLoader<TInput>(this DataOperationsCatalog catalog,
-            bool hasHeader = TextLoader.DefaultArguments.HasHeader,
-            char separatorChar = TextLoader.DefaultArguments.Separator,
-            bool allowQuotedStrings = TextLoader.DefaultArguments.AllowQuoting,
-            bool supportSparse = TextLoader.DefaultArguments.AllowSparse,
-            bool trimWhitespace = TextLoader.DefaultArguments.TrimWhitespace)
+            bool hasHeader = TextLoader.Defaults.HasHeader,
+            char separatorChar = TextLoader.Defaults.Separator,
+            bool allowQuotedStrings = TextLoader.Defaults.AllowQuoting,
+            bool supportSparse = TextLoader.Defaults.AllowSparse,
+            bool trimWhitespace = TextLoader.Defaults.TrimWhitespace)
             => TextLoader.CreateTextReader<TInput>(CatalogUtils.GetEnvironment(catalog), hasHeader, separatorChar, allowQuotedStrings, supportSparse, trimWhitespace);
 
         /// <summary>
@@ -72,8 +72,8 @@ public static TextLoader CreateTextLoader<TInput>(this DataOperationsCatalog cat
         public static IDataView ReadFromTextFile(this DataOperationsCatalog catalog,
             string path,
             TextLoader.Column[] columns,
-            bool hasHeader = TextLoader.DefaultArguments.HasHeader,
-            char separatorChar = TextLoader.DefaultArguments.Separator)
+            bool hasHeader = TextLoader.Defaults.HasHeader,
+            char separatorChar = TextLoader.Defaults.Separator)
         {
             Contracts.CheckNonEmpty(path, nameof(path));
 
@@ -104,11 +104,11 @@ public static IDataView ReadFromTextFile(this DataOperationsCatalog catalog,
         /// <returns>The data view.</returns>
         public static IDataView ReadFromTextFile<TInput>(this DataOperationsCatalog catalog,
             string path,
-            bool hasHeader = TextLoader.DefaultArguments.HasHeader,
-            char separatorChar = TextLoader.DefaultArguments.Separator,
-            bool allowQuotedStrings = TextLoader.DefaultArguments.AllowQuoting,
-            bool supportSparse = TextLoader.DefaultArguments.AllowSparse,
-            bool trimWhitespace = TextLoader.DefaultArguments.TrimWhitespace)
+            bool hasHeader = TextLoader.Defaults.HasHeader,
+            char separatorChar = TextLoader.Defaults.Separator,
+            bool allowQuotedStrings = TextLoader.Defaults.AllowQuoting,
+            bool supportSparse = TextLoader.Defaults.AllowSparse,
+            bool trimWhitespace = TextLoader.Defaults.TrimWhitespace)
         {
             Contracts.CheckNonEmpty(path, nameof(path));
 
@@ -147,8 +147,8 @@ public static IDataView ReadFromTextFile(this DataOperationsCatalog catalog, str
         public static void SaveAsText(this DataOperationsCatalog catalog,
             IDataView data,
             Stream stream,
-            char separatorChar = TextLoader.DefaultArguments.Separator,
-            bool headerRow = TextLoader.DefaultArguments.HasHeader,
+            char separatorChar = TextLoader.Defaults.Separator,
+            bool headerRow = TextLoader.Defaults.HasHeader,
             bool schema = true,
             bool keepHidden = false)
         {

src/Microsoft.ML.StaticPipe/LocalPathReader.cs

@@ -2,20 +2,20 @@
 // 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.Data;
 using Microsoft.ML.Data;
 
 namespace Microsoft.ML.StaticPipe
 {
     public static class LocalPathReader
     {
-        public static DataView<TShape> Read<TShape>(this DataReader<IMultiStreamSource, TShape> reader, string path)
-        {
-            return reader.Read(new MultiFileSource(path));
-        }
 
+        /// <summary>
+        /// Reads data from one or more file <paramref name="path"/> into an <see cref="DataView"/>.
+        /// </summary>
+        /// <param name="reader">The reader to use.</param>
+        /// <param name="path">One or more paths from which to load data.</param>
         public static DataView<TShape> Read<TShape>(this DataReader<IMultiStreamSource, TShape> reader, params string[] path)
-        {
-            return reader.Read(new MultiFileSource(path));
-        }
+            => reader.Read(new MultiFileSource(path));
     }
 }

test/BaselineOutput/Common/EntryPoints/core_manifest.json

@@ -316,42 +316,6 @@
                 "IsNullable": false,
                 "Default": null
               },
-              {
-                "Name": "UseThreads",
-                "Type": "Bool",
-                "Desc": "Use separate parsing threads?",
-                "Aliases": [
-                  "threads"
-                ],
-                "Required": false,
-                "SortOrder": 150.0,
-                "IsNullable": false,
-                "Default": true
-              },
-              {
-                "Name": "HeaderFile",
-                "Type": "String",
-                "Desc": "File containing a header with feature names. If specified, header defined in the data file (header+) is ignored.",
-                "Aliases": [
-                  "hf"
-                ],
-                "Required": false,
-                "SortOrder": 150.0,
-                "IsNullable": false,
-                "Default": null
-              },
-              {
-                "Name": "MaxRows",
-                "Type": "Int",
-                "Desc": "Maximum number of rows to produce",
-                "Aliases": [
-                  "rows"
-                ],
-                "Required": false,
-                "SortOrder": 150.0,
-                "IsNullable": true,
-                "Default": null
-              },
               {
                 "Name": "AllowQuoting",
                 "Type": "Bool",
@@ -428,6 +392,42 @@
                 "SortOrder": 150.0,
                 "IsNullable": false,
                 "Default": false
+              },
+              {
+                "Name": "UseThreads",
+                "Type": "Bool",
+                "Desc": "Use separate parsing threads?",
+                "Aliases": [
+                  "threads"
+                ],
+                "Required": false,
+                "SortOrder": 150.0,
+                "IsNullable": false,
+                "Default": true
+              },
+              {
+                "Name": "HeaderFile",
+                "Type": "String",
+                "Desc": "File containing a header with feature names. If specified, header defined in the data file (header+) is ignored.",
+                "Aliases": [
+                  "hf"
+                ],
+                "Required": false,
+                "SortOrder": 150.0,
+                "IsNullable": false,
+                "Default": null
+              },
+              {
+                "Name": "MaxRows",
+                "Type": "Int",
+                "Desc": "Maximum number of rows to produce",
+                "Aliases": [
+                  "rows"
+                ],
+                "Required": false,
+                "SortOrder": 150.0,
+                "IsNullable": true,
+                "Default": null
               }
             ]
           },

test/Microsoft.ML.Core.Tests/UnitTests/TestEntryPoints.cs

@@ -463,7 +463,7 @@ public void EntryPointCreateEnsemble()
                      MetadataUtils.Const.ScoreValueKind.Score)
                     ).Transform(individualScores[i]);
 
-                individualScores[i] = ColumnSelectingTransformer.CreateDrop(Env, individualScores[i], MetadataUtils.Const.ScoreValueKind.Score);
+                individualScores[i] = new ColumnSelectingTransformer(Env, null, new[] { MetadataUtils.Const.ScoreValueKind.Score }).Transform(individualScores[i]);
             }
 
             var avgEnsembleInput = new EnsembleCreator.ClassifierInput { Models = predictorModels, ModelCombiner = EnsembleCreator.ClassifierCombiner.Average };

test/Microsoft.ML.Predictor.Tests/TestPredictors.cs

@@ -1806,7 +1806,7 @@ public void CompareSvmPredictorResultsToLibSvm()
         {
             using (var env = new LocalEnvironment(1, conc: 1))
             {
-                IDataView trainView = new TextLoader(env, new TextLoader.Arguments(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.trainFilename)));
+                IDataView trainView = new TextLoader(env, new TextLoader.Options(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.trainFilename)));
                 trainView =
                     NormalizeTransform.Create(env,
                         new NormalizeTransform.MinMaxArguments()
@@ -1815,7 +1815,7 @@ public void CompareSvmPredictorResultsToLibSvm()
                         },
                      trainView);
                 var trainData = new RoleMappedData(trainView, "Label", "Features");
-                IDataView testView = new TextLoader(env, new TextLoader.Arguments(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.testFilename)));
+                IDataView testView = new TextLoader(env, new TextLoader.Options(), new MultiFileSource(GetDataPath(TestDatasets.mnistOneClass.testFilename)));
                 ApplyTransformUtils.ApplyAllTransformsToData(env, trainView, testView);
                 var testData = new RoleMappedData(testView, "Label", "Features");