From 0a9dfaf5e1526ddff70473fe3aabdbb29728e015 Mon Sep 17 00:00:00 2001 From: Eldar Akchurin Date: Tue, 12 Apr 2016 12:01:14 +0200 Subject: [PATCH] Addressing CR comments --- .gitattributes | 1 + .../Examples/Speech/TIMIT/AdaptLearnRate/run-test | 2 +- .../Examples/Speech/TIMIT/CrossValidateSimpleNetwork/run-test | 2 +- .../Examples/Speech/TIMIT/EvalSimpleNetwork/run-test | 2 +- .../Examples/Speech/TIMIT/TrainAutoEncoder/run-test | 2 +- Tests/EndToEndTests/Examples/Speech/TIMIT/TrainLstm/run-test | 3 ++- .../Examples/Speech/TIMIT/TrainMultiInput/run-test | 2 +- .../Examples/Speech/TIMIT/TrainMultiTask/run-test | 2 +- .../Examples/Speech/TIMIT/TrainNdlNetwork/run-test | 2 +- .../Examples/Speech/TIMIT/TrainSimpleNetwork/run-test | 2 +- .../Examples/Speech/TIMIT/TrainWithPreTrain/run-test | 2 +- .../Examples/Speech/TIMIT/WriteBottleneck/run-test | 2 +- .../Examples/Speech/TIMIT/WriteScaledLogLike/run-test | 3 ++- .../Speech/TIMIT/{run-test-common => run-timit-test-common} | 0 14 files changed, 15 insertions(+), 12 deletions(-) rename Tests/EndToEndTests/Examples/Speech/TIMIT/{run-test-common => run-timit-test-common} (100%) diff --git a/.gitattributes b/.gitattributes index e292844213bd..a24d7e984205 100644 --- a/.gitattributes +++ b/.gitattributes @@ -36,6 +36,7 @@ configure text eol=lf generate_build_info text eol=lf run-test text eol=lf run-test-common text eol=lf +run-timit-test-common text eol=lf make_binary_drop_linux text eol=lf Makefile text diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/AdaptLearnRate/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/AdaptLearnRate/run-test index 20395e154bfc..a7156fbb9a17 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/AdaptLearnRate/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/AdaptLearnRate/run-test @@ -3,7 +3,7 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common # cntkrun cntkrun TIMIT_AdaptLearnRate.cntk "$CntkArguments" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/CrossValidateSimpleNetwork/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/CrossValidateSimpleNetwork/run-test index 27f352b3ab89..e05894d45f86 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/CrossValidateSimpleNetwork/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/CrossValidateSimpleNetwork/run-test @@ -3,7 +3,7 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common # Train: cntkrun TIMIT_TrainSimpleNetwork.cntk "$CntkArguments" || exit $? diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/EvalSimpleNetwork/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/EvalSimpleNetwork/run-test index 2f0cdcbe33b8..3927fcea9d6f 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/EvalSimpleNetwork/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/EvalSimpleNetwork/run-test @@ -3,7 +3,7 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common # Train: cntkrun TIMIT_TrainSimpleNetwork.cntk "$CntkArguments" || exit $? diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainAutoEncoder/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainAutoEncoder/run-test index 8270c16c1fe1..f9fce4958563 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainAutoEncoder/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainAutoEncoder/run-test @@ -3,6 +3,6 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common cntkrun TIMIT_TrainAutoEncoder.cntk "$CntkArguments" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainLstm/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainLstm/run-test index 1cbd877a10c1..e64c9229934d 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainLstm/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainLstm/run-test @@ -3,6 +3,7 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common +# Running only 3 epochs (~1000s gpu release), because full run takes a lot of time. cntkrun TIMIT_TrainLSTM.cntk "$CntkArguments TIMIT_TrainLSTM=[SGD=[maxEpochs=3]]" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiInput/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiInput/run-test index cc387300cefd..d33d2a2cc498 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiInput/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiInput/run-test @@ -3,6 +3,6 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common cntkrun TIMIT_TrainMultiInput.cntk "$CntkArguments" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiTask/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiTask/run-test index af49c9f6c98b..02e52e62b56c 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiTask/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainMultiTask/run-test @@ -3,6 +3,6 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common cntkrun TIMIT_TrainMultiTask.cntk "$CntkArguments" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainNdlNetwork/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainNdlNetwork/run-test index 09e491a7711d..3c48d3f88396 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainNdlNetwork/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainNdlNetwork/run-test @@ -3,6 +3,6 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common cntkrun TIMIT_TrainNDLNetwork.cntk "$CntkArguments" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainSimpleNetwork/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainSimpleNetwork/run-test index dcb5f6f52951..54f46ae30ba4 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainSimpleNetwork/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainSimpleNetwork/run-test @@ -3,6 +3,6 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common cntkrun TIMIT_TrainSimpleNetwork.cntk "$CntkArguments" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainWithPreTrain/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainWithPreTrain/run-test index 0834ca142a8a..e26fbf8a579d 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainWithPreTrain/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/TrainWithPreTrain/run-test @@ -3,6 +3,6 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common cntkrun TIMIT_TrainWithPreTrain.cntk "$CntkArguments" || exit $? \ No newline at end of file diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteBottleneck/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteBottleneck/run-test index a56ddf356275..084bdd58849d 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteBottleneck/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteBottleneck/run-test @@ -3,7 +3,7 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common # Train: cntkrun TIMIT_TrainAutoEncoder.cntk "$CntkArguments" || exit $? diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteScaledLogLike/run-test b/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteScaledLogLike/run-test index e11fdad82e46..e3ccf6aa0686 100755 --- a/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteScaledLogLike/run-test +++ b/Tests/EndToEndTests/Examples/Speech/TIMIT/WriteScaledLogLike/run-test @@ -3,7 +3,7 @@ . $TEST_ROOT_DIR/run-test-common # specific TIMIT variables -. $TEST_DIR/../run-test-common +. $TEST_DIR/../run-timit-test-common # Train: cntkrun TIMIT_TrainSimpleNetwork.cntk "$CntkArguments" || exit $? @@ -25,6 +25,7 @@ if [ $? != 0 ]; then echo Error: Output files are different. $ExitCode = 1 fi +echo MD5 check succeeded. # Delete the test data rm -rf $DataDir diff --git a/Tests/EndToEndTests/Examples/Speech/TIMIT/run-test-common b/Tests/EndToEndTests/Examples/Speech/TIMIT/run-timit-test-common similarity index 100% rename from Tests/EndToEndTests/Examples/Speech/TIMIT/run-test-common rename to Tests/EndToEndTests/Examples/Speech/TIMIT/run-timit-test-common