Merge branch 'fiskio-master' into fiskio2

Tools/docker/CNTK-GPU-1bit-Image/Dockerfile

@@ -1,5 +1,27 @@
 FROM nvidia/cuda:7.5-cudnn5-devel
 
+ARG ENABLE_1BIT_SGD
+
+ENV MSG1BIT "\
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\
+You are attempting to build the Image of CNTK with 1-bit Stochastic Gradient\n\
+Descent (1bit-SGD) enabled. Before proceeding further please ensure you     \n\ 
+understand the license difference between CNTK and 1bit-SGD. See            \n\
+https://github.com/Microsoft/CNTK/wiki/Enabling-1bit-SGD#license-difference-between-cntk-and-1bit-sgd\n\
+\n\
+To build the Image pass the following parameter to Docker:\n\
+\n\
+  --build-arg ENABLE_1BIT_SGD=true\n\
+\n\
+Example:\n\
+\n\
+  docker build -t cntk --build-arg ENABLE_1BIT_SGD=true ./CNTK-GPU-1bit-Image\n\
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\
+\n\
+"
+
+RUN test x$ENABLE_1BIT_SGD = "xtrue" || (echo $MSG1BIT; exit 1)
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
         autotools-dev \
         build-essential \
@@ -170,6 +192,10 @@ RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/linu
 
 ENV PATH /root/anaconda3/envs/cntk-py34/bin/:$PATH
 
+ENV TMP_LD_LIBRARY_PATH = $LD_LIBRARY_PATH
+
+ENV LD_LIBRARY_PATH=/usr/local/cuda-7.5/lib64/stubs/:$TMP_LD_LIBRARY_PATH
+
 WORKDIR /cntk
 
 # Build CNTK
@@ -204,4 +230,4 @@ RUN cd Examples/Image/DataSets/MNIST && \
 ENV PATH=/cntk/build/gpu/release/bin:/usr/local/mpi/bin:$PATH
 
 ENV PYTHONPATH /cntk/bindings/python:$PYTHONPATH
-ENV LD_LIBRARY_PATH /cntk/bindings/python/cntk/libs:$LD_LIBRARY_PATH
+ENV LD_LIBRARY_PATH /cntk/bindings/python/cntk/libs:$TMP_LD_LIBRARY_PATH

Tools/docker/CNTK-GPU-Image/Dockerfile

@@ -170,6 +170,10 @@ RUN wget -q https://raw.githubusercontent.com/Microsoft/CNTK/master/Scripts/linu
 
 ENV PATH /root/anaconda3/envs/cntk-py34/bin/:$PATH
 
+ENV TMP_LD_LIBRARY_PATH = $LD_LIBRARY_PATH
+
+ENV LD_LIBRARY_PATH=/usr/local/cuda-7.5/lib64/stubs/:$TMP_LD_LIBRARY_PATH
+
 WORKDIR /cntk
 
 # Build CNTK
@@ -203,4 +207,4 @@ RUN cd Examples/Image/DataSets/MNIST && \
 ENV PATH=/cntk/build/gpu/release/bin:/usr/local/mpi/bin:$PATH
 
 ENV PYTHONPATH /cntk/bindings/python:$PYTHONPATH
-ENV LD_LIBRARY_PATH /cntk/bindings/python/cntk/libs:$LD_LIBRARY_PATH
+ENV LD_LIBRARY_PATH /cntk/bindings/python/cntk/libs:$TMP_LD_LIBRARY_PATH

Tools/docker/README.md

@@ -0,0 +1,8 @@
+# CNTK Dockerfiles
+
+The Dockerfiles provided here can be used to build CNTK on machines with only CPU, or with GPU with or without 1bit-SGD.
+If you plan to use the 1bit-SGD version, please make sure you understand the 
+[license difference between CNTK and 1bit-SGD](https://github.com/Microsoft/CNTK/wiki/Enabling-1bit-SGD).
+
+See also [this page](https://github.com/Microsoft/CNTK/wiki/CNTK-Docker-Containers) 
+that provides general instructions on getting things working with docker.