Fix inconsistent naming for CIFAR download script

MikalaiDrabovich · Aug 29, 2016 · a8135e1 · a8135e1
1 parent 89d3ca5
commit a8135e1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/CNTK.sln b/CNTK.sln
@@ -487,8 +487,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CIFAR-10", "CIFAR-10", "{77
 		Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl
 		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\CIFAR_convert.py = Examples\Image\Miscellaneous\CIFAR-10\CIFAR_convert.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\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\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

diff --git a/Examples/Image/Miscellaneous/CIFAR-10/CifarDownload.py b/Examples/Image/Miscellaneous/CIFAR-10/CifarDownload.py
@@ -61,7 +61,7 @@ def loadData(src, outFmt):
     return (trn, tst)
 
 def usage():
-    print ('Usage: CIFAR_convert.py [-f <format>] \n  where format can be either cudnn or legacy. Default is cudnn.')
+    print ('Usage: CifarDownload.py [-f <format>] \n  where format can be either cudnn or legacy. Default is cudnn.')
 
 def parseCmdOpt(argv):
     if len(argv) == 0:

diff --git a/...scellaneous/CIFAR-10/CIFAR_convert_py3.py → ...scellaneous/CIFAR-10/CifarDownload_py3.py b/...scellaneous/CIFAR-10/CIFAR_convert_py3.py → ...scellaneous/CIFAR-10/CifarDownload_py3.py
@@ -61,7 +61,7 @@ def loadData(src, outFmt):
     return (trn, tst)
 
 def usage():
-    print ('Usage: CIFAR_convert.py [-f <format>] \n  where format can be either cudnn or legacy. Default is cudnn.')
+    print ('Usage: CifarDownload_py3.py [-f <format>] \n  where format can be either cudnn or legacy. Default is cudnn.')
 
 def parseCmdOpt(argv):
     if len(argv) == 0:

diff --git a/Tools/docker/CNTK-CPUOnly-Image/Dockerfile b/Tools/docker/CNTK-CPUOnly-Image/Dockerfile
@@ -103,7 +103,7 @@ RUN SCIPY_VERSION=0.18.0 && \
 # Install Kaldi
 ENV KALDI_VERSION=c024e8aa
 ENV KALDI_PATH /usr/local/kaldi-$KALDI_VERSION
-    
+
 RUN mv /bin/sh /bin/sh.orig && \
    ln -s -f /bin/bash /bin/sh && \
    mkdir $KALDI_PATH && \
@@ -136,7 +136,7 @@ RUN git clone --depth=1 -b master https://github.com/Microsoft/CNTK.git . && \
     make -j"$(nproc)" all
 
 RUN cd Examples/Image/Miscellaneous/CIFAR-10 && \
-    python CIFAR_convert.py && \
+    python CifarDownload.py && \
     python CifarConverter.py cifar-10-batches-py && \
     cd ../../../..
 

diff --git a/Tools/docker/CNTK-GPU-Image/Dockerfile b/Tools/docker/CNTK-GPU-Image/Dockerfile
@@ -144,7 +144,7 @@ RUN git clone --depth=1 -b master https://github.com/Microsoft/CNTK.git . && \
     make -j"$(nproc)" all
 
 RUN cd Examples/Image/Miscellaneous/CIFAR-10 && \
-    python CIFAR_convert.py && \
+    python CifarDownload.py && \
     python CifarConverter.py cifar-10-batches-py && \
     cd ../../../..