You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by jx...@apache.org on 2017/12/28 22:14:14 UTC
[incubator-mxnet] branch master updated: Update mkl (#9218)
This is an automated email from the ASF dual-hosted git repository.
jxie 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 d0388d0 Update mkl (#9218)
d0388d0 is described below
commit d0388d00d5959d96341129a40ab21264476dfda6
Author: Young Jin Kim <yo...@intel.com>
AuthorDate: Thu Dec 28 14:14:10 2017 -0800
Update mkl (#9218)
* Update MKLML to the 1227 build. Fixed a memory leak problem.
* Fix the file path
* Use one version number inside the script file
---
prepare_mkl.sh | 6 +++---
tests/ci_build/Dockerfile.build_cuda | 2 +-
tests/ci_build/Dockerfile.cpu_mklml | 2 +-
tests/ci_build/Dockerfile.gpu_mklml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/prepare_mkl.sh b/prepare_mkl.sh
index e048f59..a9d659f 100755
--- a/prepare_mkl.sh
+++ b/prepare_mkl.sh
@@ -75,16 +75,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=20170908
+VERSION_MATCH=20171227
PLATFORM=$(uname)
if [ $PLATFORM == "Darwin" ]; then
INFIX=mac
elif [ $PLATFORM == "Linux" ]; then
INFIX=lnx
fi
-ARCHIVE_BASENAME=mklml_${INFIX}_2018.0.20170908.tgz
+ARCHIVE_BASENAME=mklml_${INFIX}_2018.0.1.${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.10/$ARCHIVE_BASENAME"
+MKLURL="https://github.com/01org/mkl-dnn/releases/download/v0.11/$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/tests/ci_build/Dockerfile.build_cuda b/tests/ci_build/Dockerfile.build_cuda
index 5fccec7..9084cca 100644
--- a/tests/ci_build/Dockerfile.build_cuda
+++ b/tests/ci_build/Dockerfile.build_cuda
@@ -20,7 +20,7 @@ COPY install/ubuntu_install_nvidia.sh /install/
RUN /install/ubuntu_install_nvidia.sh
# Add MKLML libraries
-RUN wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_lnx_2018.0.1.20171007.tgz
+RUN wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_lnx_2018.0.1.20171227.tgz
RUN tar -zxvf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
diff --git a/tests/ci_build/Dockerfile.cpu_mklml b/tests/ci_build/Dockerfile.cpu_mklml
index faa7864..39ce77c 100644
--- a/tests/ci_build/Dockerfile.cpu_mklml
+++ b/tests/ci_build/Dockerfile.cpu_mklml
@@ -12,7 +12,7 @@ COPY install/ubuntu_install_perl.sh /install/
RUN /install/ubuntu_install_perl.sh
# Add MKLML library, compatiable with Ubuntu16.04
-RUN wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_lnx_2018.0.1.20171007.tgz
+RUN wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_lnx_2018.0.1.20171227.tgz
RUN tar -zxvf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
diff --git a/tests/ci_build/Dockerfile.gpu_mklml b/tests/ci_build/Dockerfile.gpu_mklml
index 2c3564c..7b5715f 100644
--- a/tests/ci_build/Dockerfile.gpu_mklml
+++ b/tests/ci_build/Dockerfile.gpu_mklml
@@ -12,7 +12,7 @@ COPY install/ubuntu_install_scala.sh /install/
RUN /install/ubuntu_install_scala.sh
# Add MKLML library, compatible with Ubuntu16.04
-RUN wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_lnx_2018.0.1.20171007.tgz
+RUN wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.11/mklml_lnx_2018.0.1.20171227.tgz
RUN tar -zxvf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
--
To stop receiving notification emails like this one, please contact
['"commits@mxnet.apache.org" <co...@mxnet.apache.org>'].