Changed yaml files for e2e example runs

moizali2005 · Jan 30, 2016 · ab76545 · ab76545
1 parent d0e9354
commit ab76545
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 18 deletions.
diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/testcases.yml b/Tests/EndToEndTests/Examples/Image/MNIST/01_OneHidden/testcases.yml
@@ -1,8 +1,10 @@
 dataDir: ../../../../Image/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
-     - examples (flavor=='debug')
+    # part of examples as e2e tests (use TestDriver.py -t examples)
+     - examples 
+    # running every Nightly job in 'P' leg
+    # - nightly-p 
 
 testCases:
   CNTK Run must be completed:

diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/run-test b/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/run-test
@@ -6,5 +6,5 @@ ConfigDir=$TEST_DIR/../../../../../../Examples/Image/MNIST/Config
 CleanDataDir=$(cygpath -aw $DataDir)
 
 # cntkrun <CNTK config file name> <additional CNTK args>
-cntkrun 02_Convolution.config "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]]  train=[reader=[randomize=none]]" || exit $?
+cntkrun 02_Convolution.config "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=128]]  train=[reader=[randomize=none]]" || exit $?
 
diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/testcases.yml b/Tests/EndToEndTests/Examples/Image/MNIST/02_Convolution/testcases.yml
@@ -1,8 +1,10 @@
 dataDir: ../../../../Image/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
-     - examples (flavor=='release')
+    # part of examples as e2e tests (use TestDriver.py -t examples)
+     - examples 
+    # running every Nightly job in 'P' leg
+    # - nightly-p 
 
 testCases:
   CNTK Run must be completed:

diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/run-test b/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/run-test
@@ -6,5 +6,5 @@ ConfigDir=$TEST_DIR/../../../../../../Examples/Image/MNIST/Config
 CleanDataDir=$(cygpath -aw $DataDir)
 
 # cntkrun <CNTK config file name> <additional CNTK args>
-cntkrun 03_ConvBatchNorm.config "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=100]] train=[reader=[randomize=none]]" || exit $?
+cntkrun 03_ConvBatchNorm.config "train=[reader=[file=$CleanDataDir/Train.txt]] test=[reader=[file=$CleanDataDir/Test.txt]] train=[SGD=[maxEpochs=1]] train=[SGD=[epochSize=128]] train=[reader=[randomize=none]]" || exit $?
 
diff --git a/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/testcases.yml b/Tests/EndToEndTests/Examples/Image/MNIST/03_ConvBatchNorm/testcases.yml
@@ -1,8 +1,10 @@
 dataDir: ../../../../Image/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
-     - examples (flavor=='debug')
+    # part of examples as e2e tests (use TestDriver.py -t examples)
+     - examples 
+    # running every Nightly job in 'P' leg
+    # - nightly-p 
 
 testCases:
   CNTK Run must be completed:

diff --git a/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/run-test b/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/run-test
@@ -5,5 +5,5 @@
 ConfigDir=$TEST_DIR/../../../../../../Examples/Other/Simple2d/Config
 
 # cntkrun <CNTK config file name> <additional CNTK args>
-cntkrun Multigpu.config "Simple_Demo_Train=[SGD=[maxEpochs=1]] Simple_Demo_Train=[SGD=[epochSize=100]] Simple_Demo_Train=[reader=[randomize=none]]" || exit $?
+cntkrun Multigpu.config "Multigpu_Demo_Train=[SGD=[maxEpochs=1]] Multigpu_Demo_Train=[SGD=[epochSize=100]] Multigpu_Demo_Train=[reader=[randomize=none]]" || exit $?
 
diff --git a/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/testcases.yml b/Tests/EndToEndTests/Examples/Other/Simple2d/MultiGpu/testcases.yml
@@ -1,8 +1,10 @@
 dataDir: ../../../../../../Examples/Other/Simple2d/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
-     - examples (flavor=='debug') and (device=='gpu') and (build_sku == '1bitsgd')
+    # part of examples as e2e tests (use TestDriver.py -t examples)
+     - examples 
+    # running every Nightly job in 'P' leg, requires 1BitSGD
+    # - nightly-p (build_sku == '1bitsgd')
 
 testCases:
   CNTK Run must be completed:

diff --git a/Tests/EndToEndTests/Examples/Other/Simple2d/Simple/testcases.yml b/Tests/EndToEndTests/Examples/Other/Simple2d/Simple/testcases.yml
@@ -1,8 +1,10 @@
 dataDir: ../../../../../../Examples/Other/Simple2d/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
-     - examples (flavor=='debug') & (device=='cpu')
+    # part of examples as e2e tests (use TestDriver.py -t examples)
+     - examples 
+    # running every Nightly job in 'P' leg
+    # - nightly-p 
 
 testCases:
   CNTK Run must be completed:

diff --git a/Tests/EndToEndTests/Examples/Speech/AN4/FeedForward/testcases.yml b/Tests/EndToEndTests/Examples/Speech/AN4/FeedForward/testcases.yml
@@ -1,8 +1,10 @@
 dataDir: ../../../../../../Examples/Speech/AN4/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
-     - examples (flavor=='release') and (build_sku == '1bitsgd')
+    # part of examples as e2e tests (use TestDriver.py -t examples)
+     - examples 
+    # running every Nightly job in 'P' leg, requires 1BitSGD
+    # - nightly-p (build_sku == '1bitsgd')
 
 testCases:
   CNTK Run must be completed:

diff --git a/Tests/EndToEndTests/Examples/Speech/AN4/LSTM/testcases.yml b/Tests/EndToEndTests/Examples/Speech/AN4/LSTM/testcases.yml
@@ -1,8 +1,10 @@
 dataDir: ../../../../../../Examples/Speech/AN4/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
-     - examples (flavor=='release') and (build_sku == '1bitsgd')
+    # part of examples as e2e tests (use TestDriver.py -t examples)
+     - examples 
+    # running every Nightly job in 'P' leg, requires 1BitSGD
+    # - nightly-p (build_sku == '1bitsgd')
 
 testCases:
   CNTK Run must be completed:

diff --git a/Tests/EndToEndTests/Examples/Text/PennTreebank/RNN/testcases.yml b/Tests/EndToEndTests/Examples/Text/PennTreebank/RNN/testcases.yml
@@ -1,8 +1,11 @@
 dataDir: ../../../../../../Examples/Text/PennTreebank/Data
 
 tags:
-     # TODO: create new leg for Example-related e2e tests?
+    # part of examples as e2e tests (use TestDriver.py -t examples)
      - examples (flavor=='release') and (device=='gpu')
+    # running every Nightly job in 'P' leg
+    # currently commented out due to long runtime (> 10 minutes)
+    # - nightly-p (flavor=='release') and (device=='gpu')
 
 testCases:
   CNTK Run must be completed: