Update 3rdparty/mkldnn to v1.2.2 (apache#17313)

* fix cpp test * update to dnnl v1.2-rc * pin rls-v1.2 * build dnnl with DNNL_ENABLE_CONCURRENT_EXEC=ON * update rls-v1.2 * update to formal 1.2 release * try patch * fix rnn * pin rls-v1.2 * dnnl v1.2.1 * dnnl v1.2.2
MoisesHer · Apr 10, 2020 · fb45102 · fb45102
1 parent 246726b
commit fb45102
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,7 +16,6 @@
 [submodule "3rdparty/mkldnn"]
 	path = 3rdparty/mkldnn
 	url = https://github.com/intel/mkl-dnn.git
-	branch = master
 [submodule "3rdparty/tvm"]
 	path = 3rdparty/tvm
 	url = https://github.com/apache/incubator-tvm.git

diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -284,6 +284,7 @@ if(USE_MKLDNN)
   set(MKLDNN_ARCH_OPT_FLAGS "" CACHE INTERNAL "" FORCE)
   set(MKLDNN_ENABLE_JIT_PROFILING OFF CACHE INTERNAL "" FORCE)
   set(MKLDNN_LIBRARY_TYPE STATIC CACHE INTERNAL "" FORCE)
+  set(DNNL_ENABLE_CONCURRENT_EXEC ON CACHE INTERNAL "" FORCE)
 
   if(NOT USE_OPENMP)
       set(MKLDNN_CPU_RUNTIME SEQ CACHE INTERNAL "" FORCE)

diff --git a/mkldnn.mk b/mkldnn.mk
@@ -31,6 +31,7 @@ mkldnn_FLAGS += -DMKLDNN_BUILD_TESTS=OFF
 mkldnn_FLAGS += -DMKLDNN_BUILD_EXAMPLES=OFF
 mkldnn_FLAGS += -DMKLDNN_ENABLE_JIT_PROFILING=OFF
 mkldnn_FLAGS += -DMKLDNN_LIBRARY_TYPE=STATIC
+mkldnn_FLAGS += -DDNNL_ENABLE_CONCURRENT_EXEC=ON
 
 ifneq ($(USE_OPENMP), 1)
 	mkldnn_FLAGS += -DMKLDNN_CPU_RUNTIME=SEQ

diff --git a/tests/cpp/operator/mkldnn_test.cc b/tests/cpp/operator/mkldnn_test.cc
@@ -100,7 +100,7 @@ static void VerifyDefMem(const mkldnn::memory &mem) {
 
 TEST(MKLDNN_UTIL_FUNC, MemFormat) {
   // Check whether the number of format is correct.
-  CHECK_EQ(mkldnn_format_tag_last, 131);
+  CHECK_EQ(mkldnn_format_tag_last, 152);
   CHECK_EQ(mkldnn_nchw, 5);
   CHECK_EQ(mkldnn_oihw, 5);
 }