removed ReadFile, only kept MlContext ReadFromTextFile

Author: artidoro

docs/samples/Microsoft.ML.Samples/Dynamic/FeatureContributionCalculationTransform.cs

@@ -19,7 +19,7 @@ public static void FeatureContributionCalculationTransform_Regression()
 
             // Step 1: Read the data as an IDataView.
             // First, we define the reader: specify the data columns and where to find them in the text file.
-            var reader = mlContext.Data.TextReader(
+            var reader = mlContext.Data.CreateTextReader(
                 columns: new[]
                     {
                         new TextLoader.Column("MedianHomeValue", DataKind.R4, 0),

docs/samples/Microsoft.ML.Samples/Dynamic/FeatureSelectionTransform.cs

@@ -31,7 +31,7 @@ public static void FeatureSelectionTransform()
 
             // First, we define the reader: specify the data columns and where to find them in the text file. Notice that we combine entries from
             // all the feature columns into entries of a vector of a single column named "Features".
-            var reader = ml.Data.TextReader(
+            var reader = ml.Data.CreateTextReader(
                 columns: new[]
                     {
                         new TextLoader.Column("Label", DataKind.BL, 0),

docs/samples/Microsoft.ML.Samples/Dynamic/GeneralizedAdditiveModels.cs

@@ -19,7 +19,7 @@ public static void RunExample()
 
             // Step 1: Read the data as an IDataView.
             // First, we define the reader: specify the data columns and where to find them in the text file.
-            var reader = mlContext.Data.TextReader(
+            var reader = mlContext.Data.CreateTextReader(
                 columns: new[]
                     {
                         new TextLoader.Column("MedianHomeValue", DataKind.R4, 0),

docs/samples/Microsoft.ML.Samples/Dynamic/PermutationFeatureImportance.cs

@@ -22,7 +22,7 @@ public static void PFI_Regression()
             // First, we define the reader: specify the data columns and where to find them in the text file.
             // The data file is composed of rows of data, with each row having 11 numerical columns
             // separated by whitespace.
-            var reader = mlContext.Data.TextReader(
+            var reader = mlContext.Data.CreateTextReader(
                 columns: new[]
                     {
                         // Read the first column (indexed by 0) in the data file as an R4 (float)

docs/samples/Microsoft.ML.Samples/Dynamic/SDCA.cs

@@ -24,7 +24,7 @@ public static void SDCA_BinaryClassification()
 
             // Step 1: Read the data as an IDataView.
             // First, we define the reader: specify the data columns and where to find them in the text file.
-            var reader = mlContext.Data.TextReader(
+            var reader = mlContext.Data.CreateTextReader(
                 columns: new[]
                     {
                         new TextLoader.Column("Sentiment", DataKind.BL, 0),

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

@@ -1316,26 +1316,6 @@ internal static IDataLoader Create(IHostEnvironment env, ModelLoadContext ctx, I
         internal static IDataLoader Create(IHostEnvironment env, Arguments args, IMultiStreamSource files)
             => (IDataLoader)new TextLoader(env, args, files).Read(files);
 
-        /// <summary>
-        /// Creates a <see cref="TextLoader"/> and uses it to read a specified file.
-        /// </summary>
-        /// <param name="env">The environment to use.</param>
-        /// <param name="columns">Defines a mapping between input columns in the file and IDataView columns.</param>
-        /// <param name="hasHeader">Whether the file has a header.</param>
-        /// <param name="separatorChar"> The character used as separator between data points in a row. By default the tab character is used as separator.</param>
-        /// <param name="fileSource">Specifies a file from which to read.</param>
-        public static IDataView ReadFile(IHostEnvironment env, IMultiStreamSource fileSource, Column[] columns, bool hasHeader = false, char separatorChar = '\t')
-            => new TextLoader(env, columns, hasHeader, separatorChar, fileSource).Read(fileSource);
-
-        /// <summary>
-        /// Loads a text file into an <see cref="IDataView"/>. Supports basic mapping from input columns to IDataView columns.
-        /// </summary>
-        /// <param name="env">The environment to use.</param>
-        /// <param name="fileSource">Specifies a file from which to read.</param>
-        /// <param name="args">Defines the settings of the load operation.</param>
-        public static IDataView ReadFile(IHostEnvironment env, IMultiStreamSource fileSource, Arguments args = null)
-            => new TextLoader(env, args, fileSource).Read(fileSource);
-
         public void Save(ModelSaveContext ctx)
         {
             _host.CheckValue(ctx, nameof(ctx));

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

@@ -21,7 +21,7 @@ public static class TextLoaderSaverCatalog
         /// <param name="hasHeader">Whether the file has a header.</param>
         /// <param name="separatorChar">The character used as separator between data points in a row. By default the tab character is used as separator.</param>
         /// <param name="dataSample">The optional location of a data sample.</param>
-        public static TextLoader TextReader(this DataOperations catalog,
+        public static TextLoader CreateTextReader(this DataOperations catalog,
             Column[] columns, bool hasHeader = false, char separatorChar = '\t', IMultiStreamSource dataSample = null)
             => new TextLoader(CatalogUtils.GetEnvironment(catalog), columns, hasHeader, separatorChar, dataSample);
 
@@ -31,7 +31,7 @@ public static TextLoader TextReader(this DataOperations catalog,
         /// <param name="catalog">The catalog.</param>
         /// <param name="args">Defines the settings of the load operation.</param>
         /// <param name="dataSample">Allows to expose items that can be used for reading.</param>
-        public static TextLoader TextReader(this DataOperations catalog, Arguments args, IMultiStreamSource dataSample = null)
+        public static TextLoader CreateTextReader(this DataOperations catalog, Arguments args, IMultiStreamSource dataSample = null)
             => new TextLoader(CatalogUtils.GetEnvironment(catalog), args, dataSample);
 
         /// <summary>
@@ -62,7 +62,7 @@ public static IDataView ReadFromTextFile(this DataOperations catalog,
         /// <param name="catalog">The catalog.</param>
         /// <param name="path">Specifies a file from which to read.</param>
         /// <param name="args">Defines the settings of the load operation.</param>
-        public static IDataView ReadFromTextFile(this DataOperations catalog, string path, Arguments args)
+        public static IDataView ReadFromTextFile(this DataOperations catalog, string path, Arguments args = null)
         {
             Contracts.CheckNonEmpty(path, nameof(path));
 

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

@@ -483,9 +483,10 @@ private static TermMap CreateFileTermMap(IHostEnvironment env, IChannel ch, stri
                             "{0} should not be specified when default loader is TextLoader. Ignoring {0}={1}",
                             nameof(Arguments.TermsColumn), src);
                     }
-                    termData = TextLoader.ReadFile(env, fileSource,
-                        columns: new[] { new TextLoader.Column("Term", DataKind.TX, 0) }
-                        );
+                    termData = new TextLoader(env,
+                        columns: new[] { new TextLoader.Column("Term", DataKind.TX, 0) },
+                        dataSample: fileSource)
+                        .Read(fileSource);
                     src = "Term";
                     autoConvert = true;
                 }

src/Microsoft.ML.Data/Utilities/ModelFileUtils.cs

@@ -283,7 +283,8 @@ public static IEnumerable<KeyValuePair<ColumnRole, string>> LoadRoleMappingsOrNu
             {
                 // REVIEW: Should really validate the schema here, and consider
                 // ignoring this stream if it isn't as expected.
-                var loader = TextLoader.ReadFile(env, new RepositoryStreamWrapper(rep, DirTrainingInfo, RoleMappingFile));
+                var loader = new TextLoader(env, dataSample: new RepositoryStreamWrapper(rep, DirTrainingInfo, RoleMappingFile))
+                    .Read(new RepositoryStreamWrapper(rep, DirTrainingInfo, RoleMappingFile));
 
                 using (var cursor = loader.GetRowCursor(c => true))
                 {

src/Microsoft.ML.Transforms/TermLookupTransformer.cs

@@ -361,11 +361,14 @@ private static IComponentFactory<IMultiStreamSource, IDataLoader> GetLoaderFacto
             ulong max = ulong.MinValue;
             try
             {
-                var data = TextLoader.ReadFile(host, new MultiFileSource(filename), new[]
+                var data = new TextLoader(host, new[]
                     {
                         new TextLoader.Column("Term", DataKind.TX, 0),
                         new TextLoader.Column("Value", DataKind.TX, 1)
-                    });
+                    },
+                    dataSample: new MultiFileSource(filename)
+                ).Read(new MultiFileSource(filename));
+
                 using (var cursor = data.GetRowCursor(c => true))
                 {
                     var getTerm = cursor.GetGetter<ReadOnlyMemory<char>>(0);