diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake index 9c9e1d18d90d6333b225e0b99e5d652c5c13d84a..884219d8dd81f30e17f7a86380947262014e402a 100644 --- a/cmake/external/mkldnn.cmake +++ b/cmake/external/mkldnn.cmake @@ -20,7 +20,7 @@ SET(MKLDNN_SOURCE_DIR ${THIRD_PARTY_PATH}/mkldnn/src/extern_mkldnn) SET(MKLDNN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/mkldnn) SET(MKLDNN_INC_DIR "${MKLDNN_INSTALL_DIR}/include" CACHE PATH "mkldnn include directory." FORCE) SET(MKLDNN_REPOSITORY ${GIT_URL}/oneapi-src/oneDNN.git) -SET(MKLDNN_TAG 361725600224f41b7347a1c6bee9b04d1e6c14d7) +SET(MKLDNN_TAG 72efa005effb49595933e033cc732f215ef0445a) # Introduce variables: # * CMAKE_INSTALL_LIBDIR @@ -115,8 +115,11 @@ if(WIN32) else(WIN32) SET(MKLDNN_SHARED_LIB ${MKLDNN_INSTALL_DIR}/libmkldnn.so.0) SET(MKLDNN_SHARED_LIB_1 ${MKLDNN_INSTALL_DIR}/libdnnl.so.1) + SET(MKLDNN_SHARED_LIB_2 ${MKLDNN_INSTALL_DIR}/libdnnl.so.2) ADD_CUSTOM_COMMAND(TARGET ${MKLDNN_PROJECT} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_LIB} ${MKLDNN_SHARED_LIB}) ADD_CUSTOM_COMMAND(TARGET ${MKLDNN_PROJECT} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_LIB} ${MKLDNN_SHARED_LIB_1}) + ADD_CUSTOM_COMMAND(TARGET ${MKLDNN_PROJECT} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_LIB} ${MKLDNN_SHARED_LIB_2}) endif(WIN32) diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index 2eddbc44ec95b82f75222e7445cc294376acdcf2..90410353d5efac6c2baf9fe9a581560fd9d09635 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -94,8 +94,8 @@ function(copy_part_of_thrid_party TARGET DST) DSTS ${dst_dir} ${dst_dir}/lib ${dst_dir}/lib) else() copy(${TARGET} - SRCS ${MKLDNN_INC_DIR} ${MKLDNN_SHARED_LIB} ${MKLDNN_SHARED_LIB_1} - DSTS ${dst_dir} ${dst_dir}/lib ${dst_dir}/lib) + SRCS ${MKLDNN_INC_DIR} ${MKLDNN_SHARED_LIB} ${MKLDNN_SHARED_LIB_1} ${MKLDNN_SHARED_LIB_2} + DSTS ${dst_dir} ${dst_dir}/lib ${dst_dir}/lib ${dst_dir}/lib) endif() endif() diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_flags_mkldnn_ops_on_off.py b/python/paddle/fluid/tests/unittests/mkldnn/test_flags_mkldnn_ops_on_off.py index 8052dc8f1e7b8211dff478fe43b584a29b8fac86..20459be0de1eb6fc3bf271315bd1afe53844636f 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_flags_mkldnn_ops_on_off.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/test_flags_mkldnn_ops_on_off.py @@ -32,8 +32,8 @@ class TestFlagsUseMkldnn(unittest.TestCase): self.env[str("FLAGS_use_mkldnn")] = str("1") self.relu_regex = b"^dnnl_verbose,exec,cpu,eltwise,.+alg:eltwise_relu alpha:0 beta:0,10x20x20" - self.ew_add_regex = b"^dnnl_verbose,exec,cpu,binary.+alg:binary_add,10x20x30:10x20x30 10x20x30" - self.matmul_regex = b"^dnnl_verbose,exec,cpu,matmul,.*b10m20n20k30" + self.ew_add_regex = b"^dnnl_verbose,exec,cpu,binary.+alg:binary_add,10x20x30:10x20x30" + self.matmul_regex = b"^dnnl_verbose,exec,cpu,matmul,.*10x20x30:10x30x20:10x20x20" def flags_use_mkl_dnn_common(self, e): cmd = self._python_interp diff --git a/python/setup.py.in b/python/setup.py.in index 9a1200fa90d4a684202ea3a1f2aebef7f6a27407..653b69a5aa75517b0d0fa86236bd9f8685712105 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -311,7 +311,8 @@ if '${WITH_MKLDNN}' == 'ON': shutil.copy('${MKLDNN_SHARED_LIB}', libs_path) if os.name != 'nt': shutil.copy('${MKLDNN_SHARED_LIB_1}', libs_path) - package_data['paddle.libs']+=['libmkldnn.so.0', 'libdnnl.so.1'] + shutil.copy('${MKLDNN_SHARED_LIB_2}', libs_path) + package_data['paddle.libs']+=['libmkldnn.so.0', 'libdnnl.so.1', 'libdnnl.so.2'] else: package_data['paddle.libs']+=['mkldnn.dll']