marcoabreu closed pull request #10736: [MXNET-367] update mkldnn to v0.14 and disable building test examples URL: https://github.com/apache/incubator-mxnet/pull/10736
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index b4137dfc88e..0e7ca738866 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 253cf95c6ce..3689aad65cf 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 12e5df7ffe1..b702b06e849 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 828cfe107ed..d210d64573a 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) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
