[MXNET-74]Update mkldnn to the newest & Add clang build test with mkl…

…dnn. (apache#9918) * add clang test with mkldnn * update mkldnn * Update mkldnn to the newest & Add clang build test with mkldnn. apache#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
zheng-da · Jun 28, 2018 · 9cbbb90 · 9cbbb90
1 parent 4ece3a3
commit 9cbbb90
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 3 deletions.
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
diff --git 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
@@ -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_*
diff --git 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
@@ -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 {