Merge remote-tracking branch 'remotes/internal/release_1.0.3a'

gzmkl · Sep 5, 2017 · 6248378 · 6248378
2 parents 8012927 + f882f09
commit 6248378
Show file tree

Hide file tree

Showing 12 changed files with 646 additions and 4,811 deletions.
diff --git a/external/mkl/prepare_mkl.sh b/external/mkl/prepare_mkl.sh
@@ -74,10 +74,10 @@ echo $VERSION_LINE  # Return Version Line
 # MKL
 DST=`dirname $0`
 OMP=0 
-VERSION_MATCH=20170425
-ARCHIVE_BASENAME=mklml_lnx_2018.0.20170425.tgz
+VERSION_MATCH=20170720
+ARCHIVE_BASENAME=mklml_lnx_2018.0.20170720.tgz
 MKL_CONTENT_DIR=`echo $ARCHIVE_BASENAME | rev | cut -d "." -f 2- | rev`
-GITHUB_RELEASE_TAG=1.0.0
+GITHUB_RELEASE_TAG=1.0.2
 
 MKLURL="https://github.com/intel/caffe/releases/download/$GITHUB_RELEASE_TAG/$ARCHIVE_BASENAME"
 # there are diffrent MKL lib to be used for GCC and for ICC

diff --git a/mkldnn.commit b/mkldnn.commit
@@ -1 +1 @@
-171572a205c71f5bbb08657de5660c9d06cf2d8f
+b01e3a55a07be62172e713bcd2644c5176360212
diff --git a/models/intel_optimized_models/multinode/googlenet_16nodes/solver.prototxt b/models/intel_optimized_models/multinode/googlenet_16nodes/solver.prototxt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		171572a205c71f5bbb08657de5660c9d06cf2d8f
		b01e3a55a07be62172e713bcd2644c5176360212