This is an automated email from the ASF dual-hosted git repository.
marcoabreu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 3c7afcc [MXNET-367] update mkldnn to v0.14 and disable building test
examples (#10736)
3c7afcc is described below
commit 3c7afccb2fca31cc9b555d86506e0c10f18c41a0
Author: Ashok Emani <[email protected]>
AuthorDate: Thu May 3 20:26:53 2018 -0700
[MXNET-367] update mkldnn to v0.14 and disable building test examples
(#10736)
* update mkldnn to v0.14 and disable building test examples
* update mkldnn to v0.14 release
* use git submodule tagging for mkldnn
* update mklml to latest version
---
3rdparty/mkldnn | 2 +-
ci/docker/install/ubuntu_mklml.sh | 4 ++--
prepare_mkl.sh | 6 +++---
prepare_mkldnn.sh | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index b4137df..0e7ca73 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit b4137dfc88e3bf5c6b62e833121802eb8c6696da
+Subproject commit 0e7ca738866d22cc700aa33b8de120b938f910d0
diff --git a/ci/docker/install/ubuntu_mklml.sh
b/ci/docker/install/ubuntu_mklml.sh
index 253cf95..3689aad 100755
--- a/ci/docker/install/ubuntu_mklml.sh
+++ b/ci/docker/install/ubuntu_mklml.sh
@@ -21,5 +21,5 @@
# the whole docker cache for the image
set -ex
-wget --no-check-certificate -O /tmp/mklml.tgz
https://github.com/intel/mkl-dnn/releases/download/v0.12/mklml_lnx_2018.0.1.20171227.tgz
-tar -zxvf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*
\ No newline at end of file
+wget --no-check-certificate -O /tmp/mklml.tgz
https://github.com/intel/mkl-dnn/releases/download/v0.14/mklml_lnx_2018.0.3.20180406.tgz
+tar -zxvf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*
diff --git a/prepare_mkl.sh b/prepare_mkl.sh
index 12e5df7..b702b06 100755
--- a/prepare_mkl.sh
+++ b/prepare_mkl.sh
@@ -58,16 +58,16 @@ MXNET_ROOT=`dirname $0`
USE_MKLML=0
# NOTE: if you update the following line, please also update the dockerfile at
# tests/ci_build/Dockerfile.mkl
-VERSION_MATCH=20171227
+VERSION_MATCH=20180406
PLATFORM=$(uname)
if [ $PLATFORM == "Darwin" ]; then
INFIX=mac
elif [ $PLATFORM == "Linux" ]; then
INFIX=lnx
fi
-ARCHIVE_BASENAME=mklml_${INFIX}_2018.0.1.${VERSION_MATCH}.tgz
+ARCHIVE_BASENAME=mklml_${INFIX}_2018.0.3.${VERSION_MATCH}.tgz
MKL_CONTENT_DIR=`echo $ARCHIVE_BASENAME | rev | cut -d "." -f 2- | rev`
-MKLURL="https://github.com/01org/mkl-dnn/releases/download/v0.12/$ARCHIVE_BASENAME";
+MKLURL="https://github.com/intel/mkl-dnn/releases/download/v0.14/$ARCHIVE_BASENAME";
# there are diffrent MKL lib to be used for GCC and for ICC
reg='^[0-9]+$'
VERSION_LINE=`GetVersionName $MKLROOT`
diff --git a/prepare_mkldnn.sh b/prepare_mkldnn.sh
index 828cfe1..d210d64 100755
--- a/prepare_mkldnn.sh
+++ b/prepare_mkldnn.sh
@@ -93,7 +93,7 @@ if [ ! -f $MKLDNN_LIBFILE ]; then
echo "Building MKLDNN ..." >&2
cd $MXNET_ROOTDIR
g++ --version >&2
- cmake $MKLDNN_ROOTDIR -DCMAKE_INSTALL_PREFIX=$MKLDNN_INSTALLDIR
-B$MKLDNN_BUILDDIR -DARCH_OPT_FLAGS="-mtune=generic" >&2
+ cmake $MKLDNN_ROOTDIR -DCMAKE_INSTALL_PREFIX=$MKLDNN_INSTALLDIR
-B$MKLDNN_BUILDDIR -DARCH_OPT_FLAGS="-mtune=generic" -DWITH_TEST=OFF
-DWITH_EXAMPLE=OFF >&2
NUM_PROC=1
if [[ ! -z $(command -v nproc) ]]; then
NUM_PROC=$(nproc)
--
To stop receiving notification emails like this one, please contact
[email protected].
