From 3f62b42cc611d2d2110b447a4031ee5535fc0784 Mon Sep 17 00:00:00 2001 From: Tao Lv Date: Tue, 28 Jul 2020 08:18:18 +0800 Subject: [PATCH 1/6] upgrade to oneDNN v1.6 release branch --- 3rdparty/mkldnn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index f7c41dc7b547..b3540a8fc975 160000 --- a/3rdparty/mkldnn +++ b/3rdparty/mkldnn @@ -1 +1 @@ -Subproject commit f7c41dc7b5471ad8bf7905e459bbed27f9094caa +Subproject commit b3540a8fc97534e142eb070e225ef33dfcbca1c7 From f7a04144280e0d3e96783dc6c042d36d6e8e5b3a Mon Sep 17 00:00:00 2001 From: Tao Lv Date: Sat, 1 Aug 2020 19:34:24 +0800 Subject: [PATCH 2/6] oneDNN v1.6 --- 3rdparty/mkldnn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index b3540a8fc975..416caf84f3a3 160000 --- a/3rdparty/mkldnn +++ b/3rdparty/mkldnn @@ -1 +1 @@ -Subproject commit b3540a8fc97534e142eb070e225ef33dfcbca1c7 +Subproject commit 416caf84f3a3d4465220521400a5aa062e927e12 From df7a9e490f2234c2df49881c0e2255645255c4b4 Mon Sep 17 00:00:00 2001 From: Tao Lv Date: Sat, 1 Aug 2020 19:35:58 +0800 Subject: [PATCH 3/6] fix cpp test --- tests/cpp/operator/mkldnn_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cpp/operator/mkldnn_test.cc b/tests/cpp/operator/mkldnn_test.cc index 73b9d93e0752..2e34f7bdbbee 100644 --- 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, 168); + CHECK_EQ(mkldnn_format_tag_last, 205); CHECK_EQ(mkldnn_nchw, 5); CHECK_EQ(mkldnn_oihw, 5); } From 5365d832eec4629b08268edba9d497bed536b416 Mon Sep 17 00:00:00 2001 From: Tao Lv Date: Fri, 7 Aug 2020 10:23:18 +0800 Subject: [PATCH 4/6] build oneDNN with c++11 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 189afd23b1f2..c2eeff28e72d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,6 +278,7 @@ if(USE_MKLDNN) include_directories(${PROJECT_BINARY_DIR}/3rdparty/mkldnn/include) add_definitions(-DMXNET_USE_MKLDNN=1) list(APPEND mxnet_LINKER_LIBS dnnl) + target_compile_features(dnnl PUBLIC cxx_std_11) # build oneDNN with c++11 set_target_properties(dnnl PROPERTIES CXX_CLANG_TIDY "") # don't lint 3rdparty dependency endif() From c0596e1d8d24b42c4568c501ee51d948ab6ae0bf Mon Sep 17 00:00:00 2001 From: Tao Lv Date: Wed, 16 Sep 2020 00:08:03 +0800 Subject: [PATCH 5/6] Revert "build oneDNN with c++11" This reverts commit 5365d832eec4629b08268edba9d497bed536b416. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2eeff28e72d..189afd23b1f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,7 +278,6 @@ if(USE_MKLDNN) include_directories(${PROJECT_BINARY_DIR}/3rdparty/mkldnn/include) add_definitions(-DMXNET_USE_MKLDNN=1) list(APPEND mxnet_LINKER_LIBS dnnl) - target_compile_features(dnnl PUBLIC cxx_std_11) # build oneDNN with c++11 set_target_properties(dnnl PROPERTIES CXX_CLANG_TIDY "") # don't lint 3rdparty dependency endif() From 3b421aa6aa92f7daee895c091ac854b3d9336e66 Mon Sep 17 00:00:00 2001 From: Tao Lv Date: Wed, 16 Sep 2020 00:08:51 +0800 Subject: [PATCH 6/6] oneDNN v1.6.3 --- 3rdparty/mkldnn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index 416caf84f3a3..5ef631a030a6 160000 --- a/3rdparty/mkldnn +++ b/3rdparty/mkldnn @@ -1 +1 @@ -Subproject commit 416caf84f3a3d4465220521400a5aa062e927e12 +Subproject commit 5ef631a030a6f73131c77892041042805a06064f