Merge branch 'qiwye/asgd-dev' into qiwye/asgd-exp

Conflicts: .gitmodules Source/Multiverso Source/Readers/HTKMLFReader/utterancesourcemulti.h
jeffinstance · May 3, 2016 · d192bc7 · d192bc7
2 parents ae42f3e + facfb07
commit d192bc7
Show file tree

Hide file tree

Showing 409 changed files with 111,114 additions and 39,487 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -9,6 +9,7 @@ Dockerfile-GPU text
 *.post text
 *.cpu text
 *.gpu text
+*.rst text
 
 .gitattributes text
 .gitignore text
@@ -75,6 +76,9 @@ mean.363 text
 var.363 text
 prior.132 text
 
+# dot (graph description language) file 
+*.dot text 
+
 # AMI-specific
 Results text
 40fbank.conf text

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "Source/1BitSGD"]
 	path = Source/1BitSGD
-	url = https://git.codeplex.com/cntk1bitsgd
+	url = https://git.codeplex.com/cntk1bitsgd
diff --git a/CNTK.Cpp.props b/CNTK.Cpp.props
@@ -47,4 +47,52 @@
     <CudaLibPath>$(CudaPath)\lib\$(Platform)</CudaLibPath>
   </PropertyGroup>
 
+  <!-- TODO warn if ConfigurationType not (yet) defined -->
+
+  <PropertyGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
+    <UseDebugLibraries>$(DebugBuild)</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>$(ReleaseBuild)</WholeProgramOptimization>
+    <LinkIncremental>$(DebugBuild)</LinkIncremental>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <SDLCheck>true</SDLCheck>
+      <OpenMPSupport>true</OpenMPSupport>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(ConfigurationType)' == 'StaticLibrary' And $(DebugBuild)">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <StackReserveSize>100000000</StackReserveSize>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(ConfigurationType)' == 'StaticLibrary' And $(ReleaseBuild)">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <Profile>true</Profile>
+    </Link>
+  </ItemDefinitionGroup>
+
 </Project>
diff --git a/CNTK.sln b/CNTK.sln
diff --git a/Documentation/Documents/Configuration Files.md b/Documentation/Documents/Configuration Files.md
diff --git a/Examples/Image/MNIST/Config/01_OneHidden.ndl b/Examples/Image/MNIST/Config/01_OneHidden.ndl
@@ -25,7 +25,8 @@ DNN = [
     err = ErrorPrediction(labels, ol)
 
     # Special Nodes
-    errTop5 = ErrorPrediction(labels, ol, Const(1), tag="eval")
+    # errTop1 can be used to compute, for example, top-5 error by changing Const(1) to Const(5).
+    errTop1 = ErrorPrediction(labels, ol, Const(1), tag="eval")
     FeatureNodes = (features)
     LabelNodes = (labels)
     CriterionNodes = (ce)

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ImageNet1K_intensity.xml b/Examples/Image/Miscellaneous/ImageNet/ResNet/ImageNet1K_intensity.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<opencv_storage>
+  <EigVal type_id="opencv-matrix">
+    <rows>1</rows>
+    <cols>3</cols>
+    <dt>f</dt>
+    <data>
+      0.2175 0.0188 0.0045
+    </data>
+  </EigVal>
+  <EigVec type_id="opencv-matrix">
+    <rows>3</rows>
+    <cols>3</cols>
+    <dt>f</dt>
+    <data>
+      -0.5675  0.7192  0.4009
+      -0.5808 -0.0045 -0.8140
+      -0.5836 -0.6948  0.4203
+    </data>
+  </EigVec>
+</opencv_storage>
diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ImageNet1K_mean.xml b/Examples/Image/Miscellaneous/ImageNet/ResNet/ImageNet1K_mean.xml
diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/Macros.ndl b/Examples/Image/Miscellaneous/ImageNet/ResNet/Macros.ndl
@@ -73,12 +73,12 @@ ResNetNode2AInc(inp, outMap, inWCount, wCount, kW, kH, wScale, bValue, scValue,
 ]
 
 # Standard building block for ResNet with padding (option B).
-ResNetNode2BInc(inp, outMap, inMap, inWCount, wCount, kW, kH, wScale, bValue, scValue, bnTimeConst)
+ResNetNode2BInc(inp, outMap, inMap, inWCount, wCount, kW, kH, wScale, bValue, scValue, bnTimeConst, stride1x1, stride3x3)
 [
     # First convolution layer.
-    c1 = ConvBNReLULayer(inp, outMap, inWCount, kW, kH, 2, 2, wScale, bValue, scValue, bnTimeConst)
+    c1 = ConvBNReLULayer(inp, outMap, inWCount, kW, kH, stride1x1, stride1x1, wScale, bValue, scValue, bnTimeConst)
     # Second convolution layer, no ReLU.
-    c2 = ConvBNLayer(c1, outMap, wCount, kW, kH, 1, 1, wScale, bValue, scValue, bnTimeConst)
+    c2 = ConvBNLayer(c1, outMap, wCount, kW, kH, stride3x3, stride3x3, wScale, bValue, scValue, bnTimeConst)
 
     # Projection convolution layer.
     c_proj = Conv1x1(inp, outMap, inMap, 2, 2, wScale, bValue, scValue, bnTimeConst)
@@ -116,12 +116,12 @@ ResNetNode3AInc(inp, inMap, convMap, outMap, convWCount, wScale, bValue, scValue
     y = RectifiedLinear(p)
 ]
 
-ResNetNode3BInc(inp, inMap, convMap, outMap, convWCount, wScale, bValue, scValue, bnTimeConst, projStride)
+ResNetNode3BInc(inp, inMap, convMap, outMap, convWCount, wScale, bValue, scValue, bnTimeConst, projStride, stride1x1, stride3x3)
 [
     # 1x1 reducing convolution.
-    c1 = Conv1x1ReLU(inp, convMap, inMap, projStride, projStride, wScale, bValue, scValue, bnTimeConst)
+    c1 = Conv1x1ReLU(inp, convMap, inMap, stride1x1, stride1x1, wScale, bValue, scValue, bnTimeConst)
     # 3x3 convolution.
-    c2 = ConvBNReLULayer(c1, convMap, convWCount, 3, 3, 1, 1, wScale, bValue, scValue, bnTimeConst)
+    c2 = ConvBNReLULayer(c1, convMap, convWCount, 3, 3, stride3x3, stride3x3, wScale, bValue, scValue, bnTimeConst)
     # 1x1 expanding convolution, no ReLU.
     c3 = Conv1x1(c2, outMap, convMap, 1, 1, wScale, bValue, scValue, bnTimeConst)
     # Input-to-output mapping convolution.

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.cntk b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.cntk
@@ -18,10 +18,9 @@ stderr="$OutputDir$/ResNet_152"
 traceLevel=1
 numMBsToShowResult=500
 
-Proj64to256Filename = "$ConfigDir$/64to256.txt"
-Proj256to512Filename = "$ConfigDir$/256to512.txt"
-Proj512to1024Filename = "$ConfigDir$/512to1024.txt"
-Proj1024to2048Filename = "$ConfigDir$/1024to2048.txt"
+# Strides for increasing layers. Defaults (paper) are 2 for 1x1 and 1 for 3x3.
+stride1x1=2
+stride3x3=1
 
 Train=[
     action="train"
@@ -79,8 +78,21 @@ Train=[
             jitterType="UniRatio"
             # Interpolation to use when scaling image to width x height size.
             # Possible values: nearest, linear, cubic, lanczos. Default: linear.
-            interpolations="Linear"
-            # Stores mean values for each pixel in OpenCV matrix XML format.
+            interpolations="cubic"
+            # Aspect ratio jitter radius. Default is 0 (disabled).
+            aspectRatioRadius=0:0.2
+            # Brightness, contrast and color jittering. Default is 0 (disabled).
+            # Using 0 in the first epoch so the network can process original images.
+            brightnessRadius=0:0.2
+            contrastRadius=0:0.2
+            saturationRadius=0:0.4
+            # Intensity jittering: enabled if file is specified and intensityStdDev > 0. 
+            # The file stores 1x3 vector (eigenvalues) and 3x3 matrix (eigenvectors) in OpenCV XML format.
+            intensityFile="$ConfigDir$/ImageNet1K_intensity.xml"
+            # StdDev for intensity jittering. Start from the second epoch.
+            intensityStdDev=0:0.1
+            # Mean subtraction: enabled if file is specified.
+            # The file stores mean values for each pixel in OpenCV matrix XML format.
             meanFile="$ConfigDir$/ImageNet1K_mean.xml"
         ]
         labels=[

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.ndl b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_152.ndl
@@ -47,11 +47,11 @@ DNN=[
     pool1vs = 2
     pool1 = MaxPooling(conv1, pool1W, pool1H, pool1hs, pool1vs, imageLayout = "cudnn")
 
-    rn1_1 = ResNetNode3BInc(pool1, cMap1, cMap1, cMap3, 576, convWScale, convBValue, scValue, bnTimeConst, 1)
+    rn1_1 = ResNetNode3BInc(pool1, cMap1, cMap1, cMap3, 576, convWScale, convBValue, scValue, bnTimeConst, 1, 1, 1)
     rn1_2 = ResNetNode3A(rn1_1, cMap3, cMap1, cMap3, 576, convWScale, convBValue, scValue, bnTimeConst)
     rn1_3 = ResNetNode3A(rn1_2, cMap3, cMap1, cMap3, 576, convWScale, convBValue, scValue, bnTimeConst)
 
-    rn2_1 = ResNetNode3BInc(rn1_3, cMap3, cMap2, cMap4, 1152, convWScale, convBValue, scValue, bnTimeConst, 2)
+    rn2_1 = ResNetNode3BInc(rn1_3, cMap3, cMap2, cMap4, 1152, convWScale, convBValue, scValue, bnTimeConst, 2, $stride1x1$, $stride3x3$)
     rn2_2 = ResNetNode3A(rn2_1, cMap4, cMap2, cMap4, 1152, convWScale, convBValue, scValue, bnTimeConst)
     rn2_3 = ResNetNode3A(rn2_2, cMap4, cMap2, cMap4, 1152, convWScale, convBValue, scValue, bnTimeConst)
     rn2_4 = ResNetNode3A(rn2_3, cMap4, cMap2, cMap4, 1152, convWScale, convBValue, scValue, bnTimeConst)
@@ -60,7 +60,7 @@ DNN=[
     rn2_7 = ResNetNode3A(rn2_6, cMap4, cMap2, cMap4, 1152, convWScale, convBValue, scValue, bnTimeConst)
     rn2_8 = ResNetNode3A(rn2_7, cMap4, cMap2, cMap4, 1152, convWScale, convBValue, scValue, bnTimeConst)
 
-    rn3_1 = ResNetNode3BInc(rn2_8,  cMap4, cMap3, cMap5, 2304, convWScale, convBValue, scValue, bnTimeConst, 2)
+    rn3_1 = ResNetNode3BInc(rn2_8,  cMap4, cMap3, cMap5, 2304, convWScale, convBValue, scValue, bnTimeConst, 2, $stride1x1$, $stride3x3$)
     rn3_2 = ResNetNode3A(rn3_1,  cMap5, cMap3, cMap5, 2304, convWScale, convBValue, scValue, bnTimeConst)
     rn3_3 = ResNetNode3A(rn3_2,  cMap5, cMap3, cMap5, 2304, convWScale, convBValue, scValue, bnTimeConst)
     rn3_4 = ResNetNode3A(rn3_3,  cMap5, cMap3, cMap5, 2304, convWScale, convBValue, scValue, bnTimeConst)
@@ -97,7 +97,7 @@ DNN=[
     rn3_35= ResNetNode3A(rn3_34, cMap5, cMap3, cMap5, 2304, convWScale, convBValue, scValue, bnTimeConst)
     rn3_36= ResNetNode3A(rn3_35, cMap5, cMap3, cMap5, 2304, convWScale, convBValue, scValue, bnTimeConst)
 
-    rn4_1 = ResNetNode3BInc(rn3_36, cMap5, cMap4, cMap6, 4608, convWScale, convBValue, scValue, bnTimeConst, 2)
+    rn4_1 = ResNetNode3BInc(rn3_36, cMap5, cMap4, cMap6, 4608, convWScale, convBValue, scValue, bnTimeConst, 2, $stride1x1$, $stride3x3$)
     rn4_2 = ResNetNode3A(rn4_1, cMap6, cMap4, cMap6, 4608, convWScale, convBValue, scValue, bnTimeConst)
     rn4_3 = ResNetNode3A(rn4_2, cMap6, cMap4, cMap6, 4608, convWScale, convBValue, scValue, bnTimeConst)
 

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_18.cntk b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_18.cntk
@@ -18,10 +18,14 @@ stderr="$OutputDir$/ResNet_18"
 traceLevel=1
 numMBsToShowResult=500
 
+# Strides for increasing layers. Defaults (paper) are 2 for 1x1 and 1 for 3x3.
+stride1x1=2
+stride3x3=1
+
 Train=[
     action="train"
     modelPath="$ModelDir$/ResNet_18"
-
+    
      NDLNetworkBuilder=[
         networkDescription="$ConfigDir$/ResNet_18.ndl"
     ]
@@ -74,8 +78,21 @@ Train=[
             jitterType="UniRatio"
             # Interpolation to use when scaling image to width x height size.
             # Possible values: nearest, linear, cubic, lanczos. Default: linear.
-            interpolations="Linear"
-            # Stores mean values for each pixel in OpenCV matrix XML format.
+            interpolations="cubic"
+            # Aspect ratio jitter radius. Default is 0 (disabled).
+            aspectRatioRadius=0:0.2
+            # Brightness, contrast and color jittering. Default is 0 (disabled).
+            # Using 0 in the first epoch so the network can process original images.
+            brightnessRadius=0:0.2
+            contrastRadius=0:0.2
+            saturationRadius=0:0.4
+            # Intensity jittering: enabled if file is specified and intensityStdDev > 0. 
+            # The file stores 1x3 vector (eigenvalues) and 3x3 matrix (eigenvectors) in OpenCV XML format.
+            intensityFile="$ConfigDir$/ImageNet1K_intensity.xml"
+            # StdDev for intensity jittering. Start from the second epoch.
+            intensityStdDev=0:0.1
+            # Mean subtraction: enabled if file is specified.
+            # The file stores mean values for each pixel in OpenCV matrix XML format.
             meanFile="$ConfigDir$/ImageNet1K_mean.xml"
         ]
         labels=[

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_18.ndl b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_18.ndl
@@ -45,15 +45,15 @@ DNN=[
     rn1_2 = ResNetNode2A(rn1_1, cMap1, 576, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 
     cMap2 = 128
-    rn2_1 = ResNetNode2BInc(rn1_2, cMap2, cMap1, 576, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
+    rn2_1 = ResNetNode2BInc(rn1_2, cMap2, cMap1, 576, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst, $stride1x1$, $stride3x3$)
     rn2_2 = ResNetNode2A(rn2_1, cMap2, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 
     cMap3 = 256
-    rn3_1 = ResNetNode2BInc(rn2_2, cMap3, cMap2, 1152, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
+    rn3_1 = ResNetNode2BInc(rn2_2, cMap3, cMap2, 1152, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst, $stride1x1$, $stride3x3$)
     rn3_2 = ResNetNode2A(rn3_1, cMap3, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 
     cMap4 = 512
-    rn4_1 = ResNetNode2BInc(rn3_2, cMap4, cMap3, 2304, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
+    rn4_1 = ResNetNode2BInc(rn3_2, cMap4, cMap3, 2304, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst, $stride1x1$, $stride3x3$)
     rn4_2 = ResNetNode2A(rn4_1, cMap4, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn4_3 = ResNetNode2A(rn4_2, cMap4, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.cntk b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.cntk
@@ -18,9 +18,9 @@ stderr="$OutputDir$/ResNet_34"
 traceLevel=1
 numMBsToShowResult=500
 
-Proj64to128Filename = "$ConfigDir$/64to128.txt"
-Proj128to256Filename = "$ConfigDir$/128to256.txt"
-Proj256to512Filename = "$ConfigDir$/256to512.txt"
+# Strides for increasing layers. Defaults (paper) are 2 for 1x1 and 1 for 3x3.
+stride1x1=2
+stride3x3=1
 
 Train=[
     action="train"
@@ -78,8 +78,21 @@ Train=[
             jitterType="UniRatio"
             # Interpolation to use when scaling image to width x height size.
             # Possible values: nearest, linear, cubic, lanczos. Default: linear.
-            interpolations="Linear"
-            # Stores mean values for each pixel in OpenCV matrix XML format.
+            interpolations="cubic"
+            # Aspect ratio jitter radius. Default is 0 (disabled).
+            aspectRatioRadius=0:0.2
+            # Brightness, contrast and color jittering. Default is 0 (disabled).
+            # Using 0 in the first epoch so the network can process original images.
+            brightnessRadius=0:0.2
+            contrastRadius=0:0.2
+            saturationRadius=0:0.4
+            # Intensity jittering: enabled if file is specified and intensityStdDev > 0. 
+            # The file stores 1x3 vector (eigenvalues) and 3x3 matrix (eigenvectors) in OpenCV XML format.
+            intensityFile="$ConfigDir$/ImageNet1K_intensity.xml"
+            # StdDev for intensity jittering. Start from the second epoch.
+            intensityStdDev=0:0.1
+            # Mean subtraction: enabled if file is specified.
+            # The file stores mean values for each pixel in OpenCV matrix XML format.
             meanFile="$ConfigDir$/ImageNet1K_mean.xml"
         ]
         labels=[

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.ndl b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_34.ndl
@@ -46,21 +46,21 @@ DNN=[
     rn1_3 = ResNetNode2A(rn1_2, cMap1, 576, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 
     cMap2 = 128
-    rn2_1 = ResNetNode2BInc(rn1_3, cMap2, cMap1, 576, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
+    rn2_1 = ResNetNode2BInc(rn1_3, cMap2, cMap1, 576, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst, $stride1x1$, $stride3x3$)
     rn2_2 = ResNetNode2A(rn2_1, cMap2, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn2_3 = ResNetNode2A(rn2_2, cMap2, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn2_4 = ResNetNode2A(rn2_3, cMap2, 1152, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 
     cMap3 = 256
-    rn3_1 = ResNetNode2BInc(rn2_4, cMap3, cMap2, 1152, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
+    rn3_1 = ResNetNode2BInc(rn2_4, cMap3, cMap2, 1152, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst, $stride1x1$, $stride3x3$)
     rn3_2 = ResNetNode2A(rn3_1, cMap3, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn3_3 = ResNetNode2A(rn3_2, cMap3, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn3_4 = ResNetNode2A(rn3_3, cMap3, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn3_5 = ResNetNode2A(rn3_4, cMap3, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn3_6 = ResNetNode2A(rn3_5, cMap3, 2304, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 
     cMap4 = 512
-    rn4_1 = ResNetNode2BInc(rn3_6, cMap4, cMap3, 2304, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
+    rn4_1 = ResNetNode2BInc(rn3_6, cMap4, cMap3, 2304, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst, $stride1x1$, $stride3x3$)
     rn4_2 = ResNetNode2A(rn4_1, cMap4, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
     rn4_3 = ResNetNode2A(rn4_2, cMap4, 4608, kW, kH, convWScale, convBValue, scValue, bnTimeConst)
 

diff --git a/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_50.cntk b/Examples/Image/Miscellaneous/ImageNet/ResNet/ResNet_50.cntk
@@ -18,10 +18,9 @@ stderr="$OutputDir$/ResNet_50"
 traceLevel=1
 numMBsToShowResult=500
 
-Proj64to256Filename = "$ConfigDir$/64to256.txt"
-Proj256to512Filename = "$ConfigDir$/256to512.txt"
-Proj512to1024Filename = "$ConfigDir$/512to1024.txt"
-Proj1024to2048Filename = "$ConfigDir$/1024to2048.txt"
+# Strides for increasing layers. Defaults (paper) are 2 for 1x1 and 1 for 3x3.
+stride1x1=2
+stride3x3=1
 
 Train=[
     action="train"
@@ -79,8 +78,21 @@ Train=[
             jitterType="UniRatio"
             # Interpolation to use when scaling image to width x height size.
             # Possible values: nearest, linear, cubic, lanczos. Default: linear.
-            interpolations="Linear"
-            # Stores mean values for each pixel in OpenCV matrix XML format.
+            interpolations="cubic"
+            # Aspect ratio jitter radius. Default is 0 (disabled).
+            aspectRatioRadius=0:0.2
+            # Brightness, contrast and color jittering. Default is 0 (disabled).
+            # Using 0 in the first epoch so the network can process original images.
+            brightnessRadius=0:0.2
+            contrastRadius=0:0.2
+            saturationRadius=0:0.4
+            # Intensity jittering: enabled if file is specified and intensityStdDev > 0. 
+            # The file stores 1x3 vector (eigenvalues) and 3x3 matrix (eigenvectors) in OpenCV XML format.
+            intensityFile="$ConfigDir$/ImageNet1K_intensity.xml"
+            # StdDev for intensity jittering. Start from the second epoch.
+            intensityStdDev=0:0.1
+            # Mean subtraction: enabled if file is specified.
+            # The file stores mean values for each pixel in OpenCV matrix XML format.
             meanFile="$ConfigDir$/ImageNet1K_mean.xml"
         ]
         labels=[