Modify ImageClassification API to use a workspace for saving data #4410
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
codemzs
reviewed
Oct 29, 2019
src/Microsoft.ML.Dnn/DnnUtils.cs
Outdated
| if (arch == Architecture.InceptionV3) | ||
| { | ||
| DownloadIfNeeded(env, @"tfhub_modules.zip",currentDirectory,@"tfhub_modules.zip",timeout); | ||
| DownloadIfNeeded(env, @"tfhub_modules.zip",path,@"tfhub_modules.zip",timeout); |
There was a problem hiding this comment.
",path,@" [](start = 57, length = 9)
ctrl + K + D will set spaces. #Resolved
codemzs
reviewed
Oct 29, 2019
src/Microsoft.ML.Dnn/DnnUtils.cs
Outdated
| if (path == null) | ||
| { | ||
| path = GetTemporaryDirectory(); | ||
| } |
There was a problem hiding this comment.
} [](start = 12, length = 1)
new lines #Resolved
codemzs
reviewed
Oct 29, 2019
src/Microsoft.ML.Dnn/DnnUtils.cs
Outdated
| @@ -494,5 +498,11 @@ public Tensor[] Run() | |||
|
|
|||
| } | |||
|
|
|||
| internal static string GetTemporaryDirectory() | |||
There was a problem hiding this comment.
internal [](start = 8, length = 8)
private #Pending
There was a problem hiding this comment.
Cannot change to private as it is used in ImageClassificationTrainer.cs, and thus must remain internal
In reply to: 340255936 [](ancestors = 340255936)
codemzs
reviewed
Oct 29, 2019
test/Microsoft.ML.Tests/ScenariosWithDirectInstantiation/TensorflowTests.cs
Show resolved
Hide resolved
codemzs
reviewed
Oct 29, 2019
| if (options.WorkspacePath == null) | ||
| { | ||
| options.WorkspacePath = GetTemporaryDirectory(); | ||
| } |
codemzs
reviewed
Oct 29, 2019
| @@ -602,12 +605,14 @@ private protected override ImageClassificationModelParameters TrainModelCore(Tra | |||
| var validationSet = trainContext.ValidationSet?.Data ?? _options.ValidationSet; | |||
| var imageProcessor = new ImageProcessor(_session, _jpegDataTensorName, _resizedImageTensorName); | |||
| int trainingsetSize = -1; | |||
| string trainSetBottleneckCachedValuesFilePath = Path.Combine(_options.WorkspacePath, _options.TrainSetBottleneckCachedValuesFileName); | |||
| string validationSetBottleneckCachedValuesFilePath = Path.Combine(_options.WorkspacePath, _options.ValidationSetBottleneckCachedValuesFileName); | |||
There was a problem hiding this comment.
check for null for train/test file names #Resolved
codemzs
reviewed
Oct 29, 2019
test/Microsoft.ML.Tests/ScenariosWithDirectInstantiation/TensorflowTests.cs
Show resolved
Hide resolved
eerhardt
reviewed
Oct 29, 2019
| @@ -390,10 +390,10 @@ public sealed class Options : TrainerInputBaseWithLabel | |||
| public Action<ImageClassificationMetrics> MetricsCallback = null; | |||
|
|
|||
| /// <summary> | |||
| /// Indicates the path where the newly retrained model should be saved. | |||
| /// Indicates the path where the models get downloaded and cache files saved | |||
| /// </summary> | |||
| [Argument(ArgumentType.AtMostOnce, HelpText = "Indicates the path where the newly retrained model should be saved.", SortOrder = 15)] | |||
There was a problem hiding this comment.
HelpText should be updated. #Resolved
eerhardt
reviewed
Oct 29, 2019
| @@ -390,10 +390,10 @@ public sealed class Options : TrainerInputBaseWithLabel | |||
| public Action<ImageClassificationMetrics> MetricsCallback = null; | |||
|
|
|||
| /// <summary> | |||
| /// Indicates the path where the newly retrained model should be saved. | |||
| /// Indicates the path where the models get downloaded and cache files saved | |||
There was a problem hiding this comment.
Should probably explain the default behavior, so callers know what to expect if this isn't specified. #Resolved
eerhardt
reviewed
Oct 29, 2019
src/Microsoft.ML.Dnn/DnnUtils.cs
Outdated
| int timeout = 10 * 60 * 1000; | ||
| string currentDirectory = Directory.GetCurrentDirectory(); | ||
| DownloadIfNeeded(env, modelFileName, currentDirectory, modelFileName, timeout); | ||
| if (path == null) |
There was a problem hiding this comment.
if (string.IsNullOrEmpty(path)) #Resolved
eerhardt
reviewed
Oct 29, 2019
| @@ -87,8 +87,7 @@ public TransformerChain<KeyToValueMappingTransformer> TrainResnetV250() | |||
| BatchSize = 10, | |||
| LearningRate = 0.01f, | |||
| EarlyStoppingCriteria = new ImageClassificationTrainer.EarlyStopping(minDelta: 0.001f, patience: 20, metric: ImageClassificationTrainer.EarlyStoppingMetric.Loss), | |||
| ValidationSet = testDataset, | |||
| ModelSavePath = assetsPath | |||
There was a problem hiding this comment.
With this change, assetsPath no longer needs to be an instance variable. #Resolved
Originally this API saved data to the same directory as the DLL, this could cause issues if the DLL was in a read only path. Instead moving to default to a temporary workspace path which can be defined in the options by the user. This will allow all the data to be saved in one path.
codemzs
approved these changes
Oct 30, 2019
frank-dong-ms-zz
pushed a commit
to frank-dong-ms-zz/machinelearning
that referenced
this pull request
Nov 4, 2019
…tnet#4410) Originally this API saved data to the same directory as the DLL, this could cause issues if the DLL was in a read only path. Instead moving to default to a temporary workspace path which can be defined in the options by the user. This will allow all the data to be saved in one path.
frank-dong-ms-zz
pushed a commit
to frank-dong-ms-zz/machinelearning
that referenced
this pull request
Nov 4, 2019
…tnet#4410) Originally this API saved data to the same directory as the DLL, this could cause issues if the DLL was in a read only path. Instead moving to default to a temporary workspace path which can be defined in the options by the user. This will allow all the data to be saved in one path.
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Originally this API saved data to the same directory as the DLL, this
could cause issues if the DLL was in a read only path. Instead moving to
default to a temporary workspace path which can be defined in the
options by the user. This will allow all the data to be saved in one
path.