From 264f4440204d4db64400fc67f246167da67b3eac Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Tue, 19 Mar 2019 14:00:28 -0700 Subject: [PATCH] Rename Save API for DataLoader to SaveDataLoader. --- src/Microsoft.ML.Data/Model/ModelOperationsCatalog.cs | 8 ++++---- test/Microsoft.ML.Functional.Tests/ModelLoading.cs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.ML.Data/Model/ModelOperationsCatalog.cs b/src/Microsoft.ML.Data/Model/ModelOperationsCatalog.cs index dc4cb551d0..cf99fb25ca 100644 --- a/src/Microsoft.ML.Data/Model/ModelOperationsCatalog.cs +++ b/src/Microsoft.ML.Data/Model/ModelOperationsCatalog.cs @@ -33,7 +33,7 @@ internal ModelOperationsCatalog(IHostEnvironment env) /// /// The trained model to be saved. /// A writeable, seekable stream to save to. - public void Save(IDataLoader model, Stream stream) + public void SaveDataLoader(IDataLoader model, Stream stream) { _env.CheckValue(model, nameof(model)); _env.CheckValue(stream, nameof(stream)); @@ -50,10 +50,10 @@ public void Save(IDataLoader model, Stream stream) /// /// The trained model to be saved. /// Path where model should be saved. - public void Save(IDataLoader model, string filePath) + public void SaveDataLoader(IDataLoader model, string filePath) { using (var stream = File.Create(filePath)) - Save(model, stream); + SaveDataLoader(model, stream); } /// @@ -63,7 +63,7 @@ public void Save(IDataLoader model, string filePath) /// The trained model to be saved /// A writeable, seekable stream to save to. public void Save(IDataLoader loader, ITransformer model, Stream stream) => - Save(new CompositeDataLoader(loader, new TransformerChain(model)), stream); + SaveDataLoader(new CompositeDataLoader(loader, new TransformerChain(model)), stream); /// /// Save a transformer model and the loader used to create its input data to the file. diff --git a/test/Microsoft.ML.Functional.Tests/ModelLoading.cs b/test/Microsoft.ML.Functional.Tests/ModelLoading.cs index 193ddedad5..f571583fd4 100644 --- a/test/Microsoft.ML.Functional.Tests/ModelLoading.cs +++ b/test/Microsoft.ML.Functional.Tests/ModelLoading.cs @@ -61,7 +61,7 @@ public void LoadModelAndExtractPredictor() string modelAndSchemaPath = GetOutputPath(FullTestName + "-model-schema.zip"); _ml.Model.Save(transformerModel, data.Schema, modelAndSchemaPath); string compositeLoaderModelPath = GetOutputPath(FullTestName + "-composite-model.zip"); - _ml.Model.Save(compositeLoaderModel, compositeLoaderModelPath); + _ml.Model.SaveDataLoader(compositeLoaderModel, compositeLoaderModelPath); string loaderAndTransformerModelPath = GetOutputPath(FullTestName + "-loader-transformer.zip"); _ml.Model.Save(loader, transformerModel, loaderAndTransformerModelPath); @@ -190,7 +190,7 @@ public void SaveTextLoaderAndLoad() var loader = _ml.Data.CreateTextLoader(hasHeader: true, dataSample: file); string modelPath = GetOutputPath(FullTestName + "-model.zip"); - _ml.Model.Save(loader, modelPath); + _ml.Model.SaveDataLoader(loader, modelPath); Load(modelPath, out var loadedWithSchema, out var loadedSchema, out var loadedLoader, out var loadedWithLoader, out var loadedLoaderWithTransformer); @@ -220,7 +220,7 @@ public void SaveCompositeLoaderAndLoad() var model = composite.Fit(file); string modelPath = GetOutputPath(FullTestName + "-model.zip"); - _ml.Model.Save(model, modelPath); + _ml.Model.SaveDataLoader(model, modelPath); Load(modelPath, out var loadedWithSchema, out var loadedSchema, out var loadedLoader, out var loadedWithLoader, out var loadedLoaderWithTransformer);