diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn index f7c41dc7b547..416caf84f3a3 160000 --- a/3rdparty/mkldnn +++ b/3rdparty/mkldnn @@ -1 +1 @@ -Subproject commit f7c41dc7b5471ad8bf7905e459bbed27f9094caa +Subproject commit 416caf84f3a3d4465220521400a5aa062e927e12 diff --git a/CMakeLists.txt b/CMakeLists.txt index c1b722c655ff..52fc59a0e498 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -276,6 +276,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() 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); }