Address CR comments.

allenyao0702 · Apr 12, 2016 · faf0b14 · faf0b14
1 parent 6bc2539
commit faf0b14
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Examples/Image/MNIST/Config/01_OneHidden.cntk b/Examples/Image/MNIST/Config/01_OneHidden.cntk
@@ -14,7 +14,7 @@ imageLayout = "cudnn"
 # override the above as follows when running on CPU:
 # deviceId = -1
 
-command = MNISTtrain:MNISTtest
+command = train:test
 
 precision = "float"
 modelPath = "$ModelDir$/01_OneHidden"
@@ -32,7 +32,7 @@ initOnCPUOnly=true
 #  TRAINING CONFIG                    #
 #######################################
 
-MNISTtrain = [
+train = [
     action = "train"
 
     NDLNetworkBuilder = [
@@ -47,6 +47,7 @@ MNISTtrain = [
         maxEpochs = 30
     ]
 
+    # Note: this reader crashes if randomization is turned on.
     reader = [
         readerType = "UCIFastReader"
         # To get the data (Train-28x28.txt) please run `python mnist_convert.py` 
@@ -71,7 +72,7 @@ MNISTtrain = [
 #  TEST CONFIG                        #
 #######################################
 
-MNISTtest = [
+test = [
     action = "test"
     minibatchSize = 16
 

diff --git a/Examples/Image/MNIST/Config/02_Convolution.cntk b/Examples/Image/MNIST/Config/02_Convolution.cntk
@@ -11,8 +11,9 @@ ModelDir  = "$OutputDir$/Models"
 
 deviceId = 0
 imageLayout = "cudnn"
-# override the above as follows when running on CPU:
+# Override the above as follows when running on CPU:
 # deviceId = -1
+# Note: Compared to GPU, this runs very slow.
 
 command = train:test
 
@@ -49,6 +50,7 @@ train = [
         maxEpochs = 15
     ]
 
+    # Note: this reader crashes if randomization is turned on.
     reader = [
         readerType = "UCIFastReader"
         # To get the data (Train-28x28.txt) please run `python mnist_convert.py` 

diff --git a/Examples/Image/MNIST/Config/03_ConvBatchNorm.cntk b/Examples/Image/MNIST/Config/03_ConvBatchNorm.cntk
@@ -11,7 +11,8 @@ ModelDir  = "$OutputDir$/Models"
 
 deviceId = 0
 imageLayout = "cudnn"
-# override the above as follows when running on CPU:
+# Note: Batch normalization training on CPU is not yet implemented.
+# When it is, override the above as follows when running on CPU:
 # deviceId = -1
 
 command = train:test
@@ -50,6 +51,7 @@ train = [
         batchNormalizationBlendTimeConstant=0:1#INF
     ]
 
+    # Note: this reader crashes if randomization is turned on.
     reader = [
         readerType = "UCIFastReader"
         # To get the data (Train-28x28.txt) please run `python mnist_convert.py` 

diff --git a/Tests/EndToEndTests/Speech/README_Windows_Debug_commands.txt b/Tests/EndToEndTests/Speech/README_Windows_Debug_commands.txt
@@ -52,9 +52,9 @@ COMMAND:    currentDirectory=\\storage.ccp.philly.selfhost.corp.microsoft.com\pu
 
 --- MNIST:
 
-COMMAND:    configFile=$(SolutionDir)Examples/Image/MNIST/Config/01_OneHidden.cntk  currentDirectory=$(SolutionDir)Tests/EndToEndTests/Image/Data  RunDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_01_OneHidden  DataDir=$(SolutionDir)Tests/EndToEndTests/Image/Data  ConfigDir=$(SolutionDir)Examples/Image/MNIST/Config  OutputDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_01_OneHidden  DeviceId=0  MNISTtrain=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Train.txt]]  MNISTtest=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Test.txt]]  MNISTtrain=[SGD=[maxEpochs=1]]  MNISTtrain=[SGD=[epochSize=100]]  MNISTtrain=[reader=[randomize=none]]  imageLayout="cudnn"  makeMode=false
+COMMAND:    configFile=$(SolutionDir)Examples/Image/MNIST/Config/01_OneHidden.cntk  currentDirectory=$(SolutionDir)Tests/EndToEndTests/Image/Data  RunDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_01_OneHidden  DataDir=$(SolutionDir)Tests/EndToEndTests/Image/Data  ConfigDir=$(SolutionDir)Examples/Image/MNIST/Config  OutputDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_01_OneHidden  DeviceId=0  train=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Train.txt]]  test=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Test.txt]]  train=[SGD=[maxEpochs=1]]  train=[SGD=[epochSize=100]]  train=[reader=[randomize=none]]  imageLayout="cudnn"  makeMode=false
 
-COMMAND:    configFile=$(SolutionDir)Examples/Image/MNIST/Config/02_Convolution.cntk  currentDirectory=$(SolutionDir)Tests/EndToEndTests/Image/Data  RunDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_02_Convolution  DataDir=$(SolutionDir)Tests/EndToEndTests/Image/Data  ConfigDir=$(SolutionDir)Examples/Image/MNIST/Config  OutputDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_02_Convolution  DeviceId=0  train=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Train.txt]]  MNISTtest=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Test.txt]]  train=[SGD=[maxEpochs=1]]  train=[SGD=[epochSize=100]]  train=[reader=[randomize=none]]  imageLayout="cudnn"  makeMode=false
+COMMAND:    configFile=$(SolutionDir)Examples/Image/MNIST/Config/02_Convolution.cntk  currentDirectory=$(SolutionDir)Tests/EndToEndTests/Image/Data  RunDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_02_Convolution  DataDir=$(SolutionDir)Tests/EndToEndTests/Image/Data  ConfigDir=$(SolutionDir)Examples/Image/MNIST/Config  OutputDir=$(SolutionDir)Tests/EndToEndTests/RunDir/Image/MNIST_02_Convolution  DeviceId=0  train=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Train.txt]]  test=[reader=[file=$(SolutionDir)Tests/EndToEndTests/Image/Data/Test.txt]]  train=[SGD=[maxEpochs=1]]  train=[SGD=[epochSize=100]]  train=[reader=[randomize=none]]  imageLayout="cudnn"  makeMode=false
 
 TODO out-of-date:
 COMMAND:     currentDirectory=$(SolutionDir)ExampleSetups\Image\MNIST  configFile=02_Conv.cntk configName=02_Conv