Merge branch 'release_1.0.1_rc1' of ssh://git-ccr-1.devtools.intel.com:29418/dl_framework-intel_caffe

Author: daisyden

Makefile

@@ -64,6 +64,9 @@ endif
 #################### MLSL ####################
 
 ifeq ($(USE_MLSL), 1)
+	RETURN_STRING=$(shell ./external/mlsl/prepare_mlsl.sh)
+	MLSL_ROOT=$(firstword $(RETURN_STRING))
+	MLSL_LDFLAGS=$(lastword $(RETURN_STRING))	
 	COMMON_FLAGS += -DUSE_MLSL=1
 	LIBRARIES += mlsl
 	INCLUDE_DIRS += $(MLSL_ROOT)/intel64/include

cmake/Dependencies.cmake

@@ -96,7 +96,17 @@ endif()
 
 # ---[ MLSL
 if(USE_MLSL)
-  set(MLSL_ROOT "$ENV{MLSL_ROOT}")
+  #--find mlsl in external/mkl
+  set(script_cmd "./external/mlsl/prepare_mlsl.sh" )
+  execute_process(COMMAND ${script_cmd}
+	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+	RESULT_VARIABLE script_result
+	OUTPUT_VARIABLE RETURN_STRING)
+  separate_arguments(RETURN_STRING)
+  list(GET RETURN_STRING 0 MLSL_ROOT_DIR)
+  list(GET RETURN_STRING 1 MLSL_LIBRARIES)
+  set(MLSL_ROOT "${MLSL_ROOT_DIR}")
+  #set(MLSL_ROOT "$ENV{MLSL_ROOT}")
   if(NOT MLSL_ROOT)
     message(FATAL_ERROR "Unable to find MLSL package installation directory!")
   endif()

docker/standalone/cpu-centos/Dockerfile

@@ -42,7 +42,7 @@ ENV CLONE_TAG=master
 RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/intel/caffe.git . && \
     for req in $(cat python/requirements.txt) pydot; do pip --no-cache-dir install $req; done && \
     mkdir build && cd build && \
-    cmake -DCPU_ONLY=1  -DUSE_MKL2017_AS_DEFAULT_ENGINE=1 -DCMAKE_BUILD_TYPE=Release .. && \
+    cmake -DCPU_ONLY=1 -DCMAKE_BUILD_TYPE=Release .. && \
     make all -j"$(nproc)"
 
 ENV PYCAFFE_ROOT $CAFFE_ROOT/python

docker/standalone/cpu-ubuntu/Dockerfile

@@ -31,7 +31,7 @@ ENV CLONE_TAG=master
 RUN git clone -b ${CLONE_TAG} --depth 1 https://github.com/intel/caffe.git . && \
     for req in $(cat python/requirements.txt) pydot; do pip install $req; done && \
     mkdir build && cd build && \
-    cmake -DCPU_ONLY=1 -DUSE_MKL2017_AS_DEFAULT_ENGINE=1 -DCMAKE_BUILD_TYPE=Release .. && \
+    cmake -DCPU_ONLY=1 -DCMAKE_BUILD_TYPE=Release .. && \
     make all -j"$(nproc)"
 
 ENV PYCAFFE_ROOT $CAFFE_ROOT/python