Made 1bit support an optionally configurable build option for CNTK wh…

…ich is off by default

Makefile

@@ -452,6 +452,16 @@ $(IMAGEREADER): $(IMAGEREADER_OBJ) | $(CNTKMATH_LIB)
 	$(CXX) $(LDFLAGS) -shared $(patsubst %,-L%, $(LIBDIR) $(LIBPATH)) $(patsubst %,$(RPATH)%, $(ORIGINDIR) $(LIBPATH)) -o $@ $^ -l$(CNTKMATH) -lopencv_core -lopencv_imgproc -lopencv_imgcodecs
 endif
 
+########################################
+# 1bit SGD setup
+########################################
+
+ifeq ("$(CNTK_ENABLE_1BitSGD)","true")
+  INCLUDEPATH += $(SOURCEDIR)/1BitSGD
+
+  CPPFLAGS += -DQUANTIZED_GRADIENT_AGGREGATION
+endif
+
 ########################################
 # cntk
 ########################################

configure

@@ -41,6 +41,9 @@ opencv_path=
 opencv_check=include/opencv2/opencv.hpp
 mathlib=
 
+default_use_1bitsgd=no
+enable_1bitsgd=$default_use_1bitsgd
+
 # List from best to worst choice
 default_path_list="/usr /usr/local /opt /opt/local"
 
@@ -168,6 +171,7 @@ function show_help ()
     echo "  -h|--help this help"
     echo "  --with-build-top=directory build directory $(show_default $build_top)"
     echo "  --add directory add directory to library search path"
+    echo "  --1bitsgd[=(yes|no)] use 1Bit SGD $(show_default $(default_use_1bitsgd))"
     echo "  --cuda[=(yes|no)] use cuda GPU $(show_default $(default_use_cuda))"
     echo "  --with-cuda[=directory] $(show_default $(find_cuda))"
     echo "  --with-cub[=directory] $(show_default $(find_cub))"
@@ -213,6 +217,17 @@ do
             fi
             default_path_list="$optarg $default_path_list"
             ;;
+        --1bitsgd*)
+            if test x$optarg = xyes || test x$optarg = xno
+            then
+                enable_1bitsgd=$optarg
+            else
+                echo "Invalid value for --1bitsgd $optarg"
+                show_help
+                exit
+            fi
+            ;;
+
         --cuda*)
             if test x$optarg = xyes || test x$optarg = xno
             then
@@ -528,6 +543,9 @@ fi
 if test x$opencv_path != x ; then
     echo OPENCV_PATH=$opencv_path >> $config
 fi
+if test $enable_1bitsgd = yes ; then
+    echo CNTK_ENABLE_1BitSGD=true >> $config
+fi
 
 # If we are not in the configure directory, generate a trampoline Makefile
 makefile=$build_top/Makefile