Fix references to renamed CifarDownload.py and mnist_convert.py scripts

Related: #928.

CNTK.sln

@@ -459,11 +459,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MNIST", "MNIST", "{FA33A61E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Miscellaneous", "Miscellaneous", "{F99E1E80-50D8-421C-AD94-8ED0DF08C355}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AdditionalFiles", "AdditionalFiles", "{ED57E827-B28F-4BEE-BFB7-398EF8D83357}"
-	ProjectSection(SolutionItems) = preProject
-		Examples\Image\MNIST\AdditionalFiles\mnist_convert.py = Examples\Image\MNIST\AdditionalFiles\mnist_convert.py
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{6E5A252C-ACCE-42E0-9819-FF4DEF6D739E}"
 	ProjectSection(SolutionItems) = preProject
 		Examples\Image\MNIST\Config\01_OneHidden.ndl = Examples\Image\MNIST\Config\01_OneHidden.ndl
@@ -490,10 +485,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CIFAR-10", "CIFAR-10", "{77
 		Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56_ndl_deprecated.cntk
 		Examples\Image\Miscellaneous\CIFAR-10\16to32.txt = Examples\Image\Miscellaneous\CIFAR-10\16to32.txt
 		Examples\Image\Miscellaneous\CIFAR-10\32to64.txt = Examples\Image\Miscellaneous\CIFAR-10\32to64.txt
-		Examples\Image\Miscellaneous\CIFAR-10\CifarConverter.py = Examples\Image\Miscellaneous\CIFAR-10\CifarConverter.py
-		Examples\Image\Miscellaneous\CIFAR-10\CifarConverter_py3.py = Examples\Image\Miscellaneous\CIFAR-10\CifarConverter_py3.py
-		Examples\Image\Miscellaneous\CIFAR-10\CifarDownload.py = Examples\Image\Miscellaneous\CIFAR-10\CifarDownload.py
-		Examples\Image\Miscellaneous\CIFAR-10\CifarDownload_py3.py = Examples\Image\Miscellaneous\CIFAR-10\CifarDownload_py3.py
 		Examples\Image\Miscellaneous\CIFAR-10\labelsmap.txt = Examples\Image\Miscellaneous\CIFAR-10\labelsmap.txt
 		Examples\Image\Miscellaneous\CIFAR-10\Macros.ndl = Examples\Image\Miscellaneous\CIFAR-10\Macros.ndl
 		Examples\Image\Miscellaneous\CIFAR-10\readme.txt = Examples\Image\Miscellaneous\CIFAR-10\readme.txt
@@ -2314,7 +2305,6 @@ Global
 		{2A1F0FB0-2304-4F35-87B3-66230C6E58F0} = {811924DE-2F12-4EA0-BE58-E57BEF3B74D1}
 		{FA33A61E-95C7-4049-8111-22058CE361A3} = {9BDFA4BE-790E-408F-915B-5979BB5078C6}
 		{F99E1E80-50D8-421C-AD94-8ED0DF08C355} = {9BDFA4BE-790E-408F-915B-5979BB5078C6}
-		{ED57E827-B28F-4BEE-BFB7-398EF8D83357} = {FA33A61E-95C7-4049-8111-22058CE361A3}
 		{6E5A252C-ACCE-42E0-9819-FF4DEF6D739E} = {FA33A61E-95C7-4049-8111-22058CE361A3}
 		{77125562-3BF2-45D2-9B73-72CA8E03C78C} = {F99E1E80-50D8-421C-AD94-8ED0DF08C355}
 		{EF710C5A-E616-442A-889D-C997D39AF2E1} = {F99E1E80-50D8-421C-AD94-8ED0DF08C355}

Tools/docker/CNTK-CPUOnly-Image/Dockerfile

@@ -135,13 +135,12 @@ RUN git clone --depth=1 -b master https://github.com/Microsoft/CNTK.git . && \
     ../../../configure --with-mkl=/usr/local/CNTKCustomMKL --with-kaldi=${KALDI_PATH} && \
     make -j"$(nproc)" all
 
-RUN cd Examples/Image/Miscellaneous/CIFAR-10 && \
+RUN cd Examples/Image/DataSets/CIFAR-10 && \
-    python CifarDownload.py && \
+    python install_cifar10.py && \
-    python CifarConverter.py cifar-10-batches-py && \
     cd ../../../..
 
-RUN cd Examples/Image/MNIST/AdditionalFiles && \
+RUN cd Examples/Image/DataSets/MNIST && \
-    python mnist_convert.py && \
+    python install_mnist.py && \
     cd ../../../..
 
 ENV PATH=/cntk/build/cpu/release/bin:$PATH

Tools/docker/CNTK-GPU-Image/Dockerfile

@@ -143,13 +143,12 @@ RUN git clone --depth=1 -b master https://github.com/Microsoft/CNTK.git . && \
     ../../../configure $CONFIGURE_OPTS --with-mkl=/usr/local/CNTKCustomMKL && \
     make -j"$(nproc)" all
 
-RUN cd Examples/Image/Miscellaneous/CIFAR-10 && \
+RUN cd Examples/Image/DataSets/CIFAR-10 && \
-    python CifarDownload.py && \
+    python install_cifar10.py && \
-    python CifarConverter.py cifar-10-batches-py && \
     cd ../../../..
 
-RUN cd Examples/Image/MNIST/AdditionalFiles && \
+RUN cd Examples/Image/DataSets/MNIST && \
-    python mnist_convert.py && \
+    python install_mnist.py && \
     cd ../../../..
 
 ENV PATH=/cntk/build/gpu/release/bin:/usr/local/mpi/bin:$PATH

bindings/python/examples/CifarConvNet/CifarConvNet.py

@@ -36,9 +36,8 @@ num_classes  = 10
 #
 def create_reader(map_file, mean_file, train):
     if not os.path.exists(map_file) or not os.path.exists(mean_file):
-        cifar_py3 = "" if sys.version_info.major < 3 else "_py3"
+        raise RuntimeError("File '%s' or '%s' does not exist. Please run install_cifar10.py from Examples/Image/DataSets/CIFAR-10 to fetch them" %
-        raise RuntimeError("File '%s' or '%s' does not exist. Please run CifarDownload%s.py and CifarConverter%s.py from CIFAR-10 to fetch them" %
+                           (map_file, mean_file))
-                           (map_file, mean_file, cifar_py3, cifar_py3))
 
     # transformation pipeline for the features has jitter/crop only when training
     transforms = []

bindings/python/examples/CifarResNet/CifarResNet.py

@@ -41,9 +41,8 @@ num_classes  = 10
 #
 def create_reader(map_file, mean_file, train, distributed_communicator=None):
     if not os.path.exists(map_file) or not os.path.exists(mean_file):
-        cifar_py3 = "" if sys.version_info.major < 3 else "_py3"
+        raise RuntimeError("File '%s' or '%s' does not exist. Please run install_cifar10.py from Examples/Image/DataSets/CIFAR-10 to fetch them" %
-        raise RuntimeError("File '%s' or '%s' does not exist. Please run CifarDownload%s.py and CifarConverter%s.py from CIFAR-10 to fetch them" %
+                           (map_file, mean_file))
-                           (map_file, mean_file, cifar_py3, cifar_py3))
 
     # transformation pipeline for the features has jitter/crop only when training
     transforms = []

bindings/python/tutorials/CNTK_201B_CIFAR-10_ImageHandsOn.ipynb

@@ -243,7 +243,6 @@
     "#\n",
     "def create_reader(map_file, mean_file, train):\n",
     "    if not os.path.exists(map_file) or not os.path.exists(mean_file):\n",
-    "        cifar_py3 = \"\" if sys.version_info.major < 3 else \"_py3\"\n",
     "        raise RuntimeError(\"This tutorials depends 201A tutorials, please run 201A first.\")\n",
     "\n",
     "    # transformation pipeline for the features has jitter/crop only when training\n",