Skip to content

Stabilize the LR test #4446

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
merged 3 commits into from
Nov 11, 2019
+25 −21
Merged

Stabilize the LR test #4446

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
217c1af
Stabilize the LR test
Nov 7, 2019
b8d7b23
removed rand to use existing seed.
Nov 8, 2019
3a30c55
adjust for nix
Nov 8, 2019
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
4 changes: 2 additions & 2 deletions src/Microsoft.ML.Vision/ImageClassificationTrainer.cs
View file
Original file line number Diff line number Diff line change
@@ -937,7 +937,7 @@ private void TrainAndEvaluateClassificationLayer(string trainBottleneckFilePath,
metrics.Train.LearningRate = learningRate;
// Update train state.
trainstate.CurrentEpoch = epoch;
using (var cursor = trainingSet.GetRowCursor(trainingSet.Schema.ToArray(), new Random()))
using (var cursor = trainingSet.GetRowCursor(trainingSet.Schema.ToArray()))
{
var labelGetter = cursor.GetGetter<long>(trainingSet.Schema[0]);
var featuresGetter = cursor.GetGetter<VBuffer<float>>(featureColumn);
@@ -1069,7 +1069,7 @@ private void TrainAndEvaluateClassificationLayer(string trainBottleneckFilePath,
metrics.Train.BatchProcessedCount = 0;
metrics.Train.Accuracy = 0;
metrics.Train.CrossEntropy = 0;
using (var cursor = validationSet.GetRowCursor(validationSet.Schema.ToArray(), new Random()))
using (var cursor = validationSet.GetRowCursor(validationSet.Schema.ToArray()))
{
var labelGetter = cursor.GetGetter<long>(validationSet.Schema[0]);
var featuresGetter = cursor.GetGetter<VBuffer<float>>(featureColumn);
2 changes: 1 addition & 1 deletion test/Microsoft.ML.AutoML.Tests/AutoFitTests.cs
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ public void AutoFitMultiTest()
[TensorFlowFact]
public void AutoFitImageClassificationTrainTest()
{
var context = new MLContext();
var context = new MLContext(seed: 1);
var datasetPath = DatasetUtil.GetFlowersDataset();
var columnInference = context.Auto().InferColumns(datasetPath, "Label");
var textLoader = context.Data.CreateTextLoader(columnInference.TextLoaderOptions);
40 changes: 22 additions & 18 deletions test/Microsoft.ML.Tests/ScenariosWithDirectInstantiation/TensorflowTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1274,8 +1274,8 @@ public void TensorFlowImageClassificationDefault()
if (!(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))))
{
Assert.InRange(metrics.MicroAccuracy, 0.3, 1);
Assert.InRange(metrics.MacroAccuracy, 0.3, 1);
Assert.InRange(metrics.MicroAccuracy, 0.2, 1);
Assert.InRange(metrics.MacroAccuracy, 0.2, 1);
}
else
{
@@ -1370,8 +1370,8 @@ public void TensorFlowImageClassification(ImageClassificationTrainer.Architectur
if (!(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))))
{
Assert.InRange(metrics.MicroAccuracy, 0.3, 1);
Assert.InRange(metrics.MacroAccuracy, 0.3, 1);
Assert.InRange(metrics.MicroAccuracy, 0.2, 1);
Assert.InRange(metrics.MacroAccuracy, 0.2, 1);
}
else
{
@@ -1429,16 +1429,23 @@ public void TensorFlowImageClassification(ImageClassificationTrainer.Architectur
[TensorFlowFact]
public void TensorFlowImageClassificationWithExponentialLRScheduling()
{
TensorFlowImageClassificationWithLRScheduling(new ExponentialLRDecay());
TensorFlowImageClassificationWithLRScheduling(new ExponentialLRDecay(), 50);
}

[Fact(Skip ="Very unstable tests, causing many build failures.")]
[TensorFlowFact]
public void TensorFlowImageClassificationWithPolynomialLRScheduling()
{
TensorFlowImageClassificationWithLRScheduling(new PolynomialLRDecay());

/*
* Due to an issue with Nix based os performance is not as good,
* as such increase the number of epochs to produce a better model.
*/
bool isNix = (!(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))));
TensorFlowImageClassificationWithLRScheduling(new PolynomialLRDecay(), isNix ? 75: 50);
}

internal void TensorFlowImageClassificationWithLRScheduling(LearningRateScheduler learningRateScheduler)
internal void TensorFlowImageClassificationWithLRScheduling(LearningRateScheduler learningRateScheduler, int epoch)
{
string assetsRelativePath = @"assets";
string assetsPath = GetAbsolutePath(assetsRelativePath);
@@ -1484,17 +1491,14 @@ internal void TensorFlowImageClassificationWithLRScheduling(LearningRateSchedule
// ResnetV2101 you can try a different architecture/
// pre-trained model.
Arch = ImageClassificationTrainer.Architecture.ResnetV2101,
Epoch = 50,
Epoch = epoch,
BatchSize = 10,
LearningRate = 0.01f,
MetricsCallback = (metric) => Console.WriteLine(metric),
ValidationSet = validationSet,
ReuseValidationSetBottleneckCachedValues = false,
ReuseTrainSetBottleneckCachedValues = false,
EarlyStoppingCriteria = null,
// Using Exponential Decay for learning rate scheduling
// You can also try other types of Learning rate scheduling methods
// available in LearningRateScheduler.cs
LearningRateScheduler = learningRateScheduler,
WorkspacePath = GetTemporaryDirectory()
};
@@ -1526,8 +1530,8 @@ internal void TensorFlowImageClassificationWithLRScheduling(LearningRateSchedule
if (!(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))))
{
Assert.InRange(metrics.MicroAccuracy, 0.3, 1);
Assert.InRange(metrics.MacroAccuracy, 0.3, 1);
Assert.InRange(metrics.MicroAccuracy, 0.2, 1);
Assert.InRange(metrics.MacroAccuracy, 0.2, 1);
}
else
{
@@ -1669,8 +1673,8 @@ public void TensorFlowImageClassificationEarlyStoppingIncreasing()
if (!(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))))
{
Assert.InRange(metrics.MicroAccuracy, 0.3, 1);
Assert.InRange(metrics.MacroAccuracy, 0.3, 1);
Assert.InRange(metrics.MicroAccuracy, 0.2, 1);
Assert.InRange(metrics.MacroAccuracy, 0.2, 1);
}
else
{
@@ -1763,8 +1767,8 @@ public void TensorFlowImageClassificationEarlyStoppingDecreasing()
if (!(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))))
{
Assert.InRange(metrics.MicroAccuracy, 0.3, 1);
Assert.InRange(metrics.MacroAccuracy, 0.3, 1);
Assert.InRange(metrics.MicroAccuracy, 0.2, 1);
Assert.InRange(metrics.MacroAccuracy, 0.2, 1);
}
else
{