eliminate IFileInfo from CLI (dotnet#260)

Author: daholste

src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.cs

@@ -10,7 +10,6 @@
 using Microsoft.ML.CLI.CodeGenerator.CSharp;
 using Microsoft.ML.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using mlnet.Test.Utilities;
 
 namespace mlnet.Test
 {
@@ -33,10 +32,10 @@ public void GeneratedTrainCodeTest()
                 MlTask = TaskKind.BinaryClassification,
                 OutputBaseDir = null,
                 OutputName = "MyNamespace",
-                TrainDataset = new MockFileInfo("x:\\dummypath\\dummy_train.csv"),
-                TestDataset = new MockFileInfo("x:\\dummypath\\dummy_test.csv"),
+                TrainDataset = "x:\\dummypath\\dummy_train.csv",
+                TestDataset = "x:\\dummypath\\dummy_test.csv",
                 LabelName = "Label",
-                ModelPath = new MockFileInfo("x:\\models\\model.zip")
+                ModelPath = "x:\\models\\model.zip"
             });
 
             (string trainCode, string projectCode, string helperCode) = consoleCodeGen.GenerateCode();
@@ -57,10 +56,10 @@ public void GeneratedProjectCodeTest()
                 MlTask = TaskKind.BinaryClassification,
                 OutputBaseDir = null,
                 OutputName = "MyNamespace",
-                TrainDataset = new MockFileInfo("x:\\dummypath\\dummy_train.csv"),
-                TestDataset = new MockFileInfo("x:\\dummypath\\dummy_test.csv"),
+                TrainDataset = "x:\\dummypath\\dummy_train.csv",
+                TestDataset = "x:\\dummypath\\dummy_test.csv",
                 LabelName = "Label",
-                ModelPath = new MockFileInfo("x:\\models\\model.zip")
+                ModelPath = "x:\\models\\model.zip"
             });
 
             (string trainCode, string projectCode, string helperCode) = consoleCodeGen.GenerateCode();
@@ -81,10 +80,10 @@ public void GeneratedHelperCodeTest()
                 MlTask = TaskKind.BinaryClassification,
                 OutputBaseDir = null,
                 OutputName = "MyNamespace",
-                TrainDataset = new MockFileInfo("x:\\dummypath\\dummy_train.csv"),
-                TestDataset = new MockFileInfo("x:\\dummypath\\dummy_test.csv"),
+                TrainDataset = "x:\\dummypath\\dummy_train.csv",
+                TestDataset = "x:\\dummypath\\dummy_test.csv",
                 LabelName = "Label",
-                ModelPath = new MockFileInfo("x:\\models\\model.zip")
+                ModelPath = "x:\\models\\model.zip"
             });
 
             (string trainCode, string projectCode, string helperCode) = consoleCodeGen.GenerateCode();

src/mlnet.Test/Utilities/MockFileInfo.cs

@@ -105,12 +105,12 @@ internal string GenerateTrainCode(string usings, string trainer, List<string> tr
                 Trainer = trainer,
                 ClassLabels = classLabels,
                 GeneratedUsings = usings,
-                Path = settings.TrainDataset.FullName,
-                TestPath = settings.TestDataset?.FullName,
+                Path = settings.TrainDataset,
+                TestPath = settings.TestDataset,
                 TaskType = settings.MlTask.ToString(),
                 Namespace = namespaceValue,
                 LabelName = settings.LabelName,
-                ModelPath = settings.ModelPath.FullName
+                ModelPath = settings.ModelPath
             };
 
             return trainingAndScoringCodeGen.TransformText();

src/mlnet/CodeGenerator/CSharp/CodeGenerator.cs

@@ -1,21 +1,20 @@
 using Microsoft.ML.Auto;
-using Microsoft.ML.CLI.Utilities.File;
 
 namespace Microsoft.ML.CLI.CodeGenerator.CSharp
 {
     internal class CodeGeneratorSettings
     {
         internal string LabelName { get; set; }
 
-        internal IFileInfo ModelPath { get; set; }
+        internal string ModelPath { get; set; }
 
         internal string OutputName { get; set; }
 
         internal string OutputBaseDir { get; set; }
 
-        internal IFileInfo TrainDataset { get; set; }
+        internal string TrainDataset { get; set; }
 
-        internal IFileInfo TestDataset { get; set; }
+        internal string TestDataset { get; set; }
 
         internal TaskKind MlTask { get; set; }
 

src/mlnet/CodeGenerator/CSharp/CodeGeneratorSettings.cs

@@ -9,7 +9,6 @@
 using Microsoft.ML.CLI.CodeGenerator.CSharp;
 using Microsoft.ML.CLI.Data;
 using Microsoft.ML.CLI.Utilities;
-using Microsoft.ML.CLI.Utilities.File;
 using Microsoft.ML.Data;
 using NLog;
 
@@ -111,13 +110,13 @@ internal void GenerateProject(ColumnInferenceResults columnInference, Pipeline p
                 columnInference,
                 new CodeGeneratorSettings()
                 {
-                    TrainDataset = new SystemFileInfo(settings.Dataset),
+                    TrainDataset = settings.Dataset.FullName,
                     MlTask = taskKind,
-                    TestDataset = settings.TestDataset == null ? null :  new SystemFileInfo(settings.TestDataset),
+                    TestDataset = settings.TestDataset?.FullName,
                     OutputName = settings.Name,
                     OutputBaseDir = settings.OutputPath.FullName,
                     LabelName = labelName,
-                    ModelPath = new SystemFileInfo(modelPath)
+                    ModelPath = modelPath.FullName
                 });
             codeGenerator.GenerateOutput();
         }