Skip to content

Fixes cases of invalid image folder path and input column name #4691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mstfbl merged 5 commits into from
Jan 30, 2020
Merged

Fixes cases of invalid image folder path and input column name #4691

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c46486
Fixes cases of invalid image folder path and input column name
mstfbl Jan 22, 2020
bfdabb0
Update ImageLoader.cs
mstfbl Jan 22, 2020
0123d44
Update ExtensionsCatalog.cs
mstfbl Jan 23, 2020
bce3ff8
Update ImageLoader.cs
mstfbl Jan 23, 2020
11dda7a
Update ImageLoader.cs
mstfbl Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Microsoft.ML.ImageAnalytics/ImageLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,8 @@ internal sealed class Options : TransformInputBase
/// <param name="imageFolder">Folder where to look for images.</param>
/// <param name="columns">Names of input and output columns.</param>
internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null, params (string outputColumnName, string inputColumnName)[] columns)
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(ImageLoadingTransformer)), columns)
: this (env, imageFolder, type: true, columns)
{
ImageFolder = imageFolder;
_useImageType = true;
}

/// <summary>
Expand All @@ -105,7 +103,11 @@ internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null
internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null, bool type = true, params (string outputColumnName, string inputColumnName)[] columns)
: base(Contracts.CheckRef(env, nameof(env)).Register(nameof(ImageLoadingTransformer)), columns)
{
ImageFolder = imageFolder;
// Throws ArgumentException if given imageFolder path is invalid or empty. Note: imageFolder may be null in this case.
if (imageFolder != null)
ImageFolder = Path.GetFullPath(imageFolder);
else
ImageFolder = null;
_useImageType = type;
}

Expand Down