Skip to content

Commit acbf668

Browse files
committed
PR feedback.
1 parent a7622c2 commit acbf668

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/Microsoft.ML.Data/Model/ModelOperationsCatalog.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public ITransformer Load(string modelPath, out DataViewSchema inputSchema)
204204
/// <param name="stream">A readable, seekable stream to load from.</param>
205205
/// <returns>A model of type <see cref="CompositeDataLoader{IMultiStreamSource, ITransformer}"/> containing the loader
206206
/// and the transformer chain.</returns>
207-
public IDataLoader<IMultiStreamSource> Load(Stream stream)
207+
public IDataLoader<IMultiStreamSource> LoadDataLoader(Stream stream)
208208
{
209209
_env.CheckValue(stream, nameof(stream));
210210

@@ -228,10 +228,10 @@ public IDataLoader<IMultiStreamSource> Load(Stream stream)
228228
/// <param name="modelPath">Path to model.</param>
229229
/// <returns>A model of type <see cref="CompositeDataLoader{IMultiStreamSource, ITransformer}"/> containing the loader
230230
/// and the transformer chain.</returns>
231-
public IDataLoader<IMultiStreamSource> Load(string modelPath)
231+
public IDataLoader<IMultiStreamSource> LoadDataLoader(string modelPath)
232232
{
233233
using (var stream = File.OpenRead(modelPath))
234-
return Load(stream);
234+
return LoadDataLoader(stream);
235235
}
236236

237237
/// <summary>
@@ -244,7 +244,7 @@ public ITransformer LoadWithDataLoader(Stream stream, out IDataLoader<IMultiStre
244244
{
245245
_env.CheckValue(stream, nameof(stream));
246246

247-
loader = Load(stream);
247+
loader = LoadDataLoader(stream);
248248
if (loader is CompositeDataLoader<IMultiStreamSource, ITransformer> composite)
249249
{
250250
loader = composite.Loader;

test/Microsoft.ML.Functional.Tests/ModelLoading.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ public void LoadModelAndExtractPredictor()
7474
// a transformer model + an input schema, or a transformer model + a data loader.
7575
var t = _ml.Model.LoadWithDataLoader(compositeLoaderModelPath, out IDataLoader<IMultiStreamSource> l);
7676
var t1 = _ml.Model.Load(compositeLoaderModelPath, out var s);
77-
loadedCompositeLoader = _ml.Model.Load(compositeLoaderModelPath);
77+
loadedCompositeLoader = _ml.Model.LoadDataLoader(compositeLoaderModelPath);
7878

7979
// This model can be loaded either as a composite data loader,
8080
// a transformer model + an input schema, or a transformer model + a data loader.
8181
var tt = _ml.Model.Load(loaderAndTransformerModelPath, out var ss);
82-
var c = _ml.Model.Load(loaderAndTransformerModelPath);
82+
var c = _ml.Model.LoadDataLoader(loaderAndTransformerModelPath);
8383
loadedTransformerModel1 = _ml.Model.LoadWithDataLoader(loaderAndTransformerModelPath, out IDataLoader<IMultiStreamSource> ll);
8484

8585
var gam = ((loadedTransformerModel as ISingleFeaturePredictionTransformer<object>).Model
@@ -120,7 +120,7 @@ public void SaveAndLoadModelWithLoader()
120120
IDataLoader<IMultiStreamSource> loadedModel;
121121
ITransformer loadedModelWithoutLoader;
122122
DataViewSchema loadedSchema;
123-
loadedModel = _ml.Model.Load(modelPath);
123+
loadedModel = _ml.Model.LoadDataLoader(modelPath);
124124
loadedModelWithoutLoader = _ml.Model.Load(modelPath, out loadedSchema);
125125

126126
// Without deserializing the loader from the model we lose the slot names.
@@ -292,7 +292,7 @@ private void Load(string filename, out ITransformer loadedWithSchema, out DataVi
292292

293293
try
294294
{
295-
loadedLoader = _ml.Model.Load(filename);
295+
loadedLoader = _ml.Model.LoadDataLoader(filename);
296296
}
297297
catch (Exception)
298298
{

0 commit comments

Comments
 (0)