You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ma...@apache.org on 2018/03/14 14:38:50 UTC
[incubator-mxnet] branch master updated: [MXNET-74]Update mkldnn to
the newest & Add clang build test with mkldnn. (#9918)
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 f202f10 [MXNET-74]Update mkldnn to the newest & Add clang build test with mkldnn. (#9918)
f202f10 is described below
commit f202f108d1d11997e26d50c4b57d7421dcb09332
Author: XinyuChen <xi...@intel.com>
AuthorDate: Wed Mar 14 22:38:45 2018 +0800
[MXNET-74]Update mkldnn to the newest & Add clang build test with mkldnn. (#9918)
* add clang test with mkldnn
* update mkldnn
* Update mkldnn to the newest & Add clang build test with mkldnn. #9918
* update all dockerfiles in order to use the correct mkl version
* fix bugs in mkldnn_base
* update mklml link and modify dockerfiles
* delete blank line
* no changes, just retrigger.
* no changes, just retriggering
* put mklml in a single run file
* debug mklml run file
* debug mklml script
* add mkldnn clang test
* give each build task its own unique workspace
* change lib name
---
3rdparty/mkldnn | 2 +-
Jenkinsfile | 18 ++++++++++++++++++
ci/docker/install/ubuntu_mklml.sh | 2 +-
ci/docker/runtime_functions.sh | 26 ++++++++++++++++++++++++++
src/operator/nn/mkldnn/mkldnn_base.cc | 3 ++-
5 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index 283c4a8..464c268 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit 283c4a8c24b4e1dea05fbc7941594a7375babad1
+Subproject commit 464c268e544bae26f9b85a2acb9122c766a4c396
diff --git a/Jenkinsfile b/Jenkinsfile
index 2bac346..e43b6f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -175,6 +175,24 @@ try {
}
}
},
+ 'CPU: Clang 3.9 MKLDNN': {
+ node('mxnetlinux-cpu') {
+ ws('workspace/build-cpu-mkldnn-clang39') {
+ init_git()
+ sh "ci/build.py --build --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_clang39_mkldnn"
+ pack_lib('mkldnn_cpu_clang3', mx_mkldnn_lib)
+ }
+ }
+ },
+ 'CPU: Clang 5 MKLDNN': {
+ node('mxnetlinux-cpu') {
+ ws('workspace/build-cpu-mkldnn-clang50') {
+ init_git()
+ sh "ci/build.py --build --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_clang50_mkldnn"
+ pack_lib('mkldnn_cpu_clang5', mx_mkldnn_lib)
+ }
+ }
+ },
'CPU: MKLDNN': {
node('mxnetlinux-cpu') {
ws('workspace/build-mkldnn-cpu') {
diff --git a/ci/docker/install/ubuntu_mklml.sh b/ci/docker/install/ubuntu_mklml.sh
index 4f68fa7..253cf95 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/01org/mkl-dnn/releases/download/v0.12/mklml_lnx_2018.0.1.20171227.tgz
+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
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 89ea44f..14a256d 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -205,6 +205,32 @@ build_ubuntu_cpu_clang50() {
-j$(nproc)
}
+build_ubuntu_cpu_clang39_mkldnn() {
+ set -ex
+ make \
+ USE_PROFILER=1 \
+ USE_CPP_PACKAGE=1 \
+ USE_BLAS=openblas \
+ USE_MKLDNN=1 \
+ USE_OPENMP=0 \
+ CXX=clang++-3.9 \
+ CC=clang-3.9 \
+ -j$(nproc)
+}
+
+build_ubuntu_cpu_clang50_mkldnn() {
+ set -ex
+ make \
+ USE_PROFILER=1 \
+ USE_CPP_PACKAGE=1 \
+ USE_BLAS=openblas \
+ USE_MKLDNN=1 \
+ USE_OPENMP=1 \
+ CXX=clang++-5.0 \
+ CC=clang-5.0 \
+ -j$(nproc)
+}
+
build_ubuntu_cpu_mkldnn() {
set -ex
make \
diff --git a/src/operator/nn/mkldnn/mkldnn_base.cc b/src/operator/nn/mkldnn/mkldnn_base.cc
index edc3482..820cca1 100644
--- a/src/operator/nn/mkldnn/mkldnn_base.cc
+++ b/src/operator/nn/mkldnn/mkldnn_base.cc
@@ -237,13 +237,14 @@ mkldnn_memory_format_t GetDefaultFormat(mkldnn::memory::desc desc) {
case mkldnn_gOIhw16o16i:
case mkldnn_gIOhw16o16i:
case mkldnn_gOihw8o:
+ case mkldnn_Goihw8g:
case mkldnn_gOihw16o:
case mkldnn_gOhwi8o:
case mkldnn_gOhwi16o:
case mkldnn_gOhIw16o4i:
return mkldnn_goihw;
default:
- LOG(FATAL) << "Unknown MKLDNN format for 4 dimensions: " << desc.data.format;
+ LOG(FATAL) << "Unknown MKLDNN format for 5 dimensions: " << desc.data.format;
return mkldnn_format_undef;
}
} else {
--
To stop receiving notification emails like this one, please contact
marcoabreu@apache.org.