未验证 提交 f3b0f8db 编写于 作者: L lidanqing 提交者: GitHub

cherry-pick #30295 and #31347: Upgrade oneDNN 2.2 (#31270)

* Wojtuss/upgrade one dnn 2.0 (#30295)

* upgrade oneDNN version to 2.0 master branch

* - Added workarounds for new lib onednn change

* fix regex
Co-authored-by: NJacek Czaja <jacek.czaja@intel.com>

* update to oneDNN 2.2
Co-authored-by: NWojciech Uss <wojciech.uss@intel.com>
Co-authored-by: NJacek Czaja <jacek.czaja@intel.com>
上级 ffa88c31
......@@ -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)
......@@ -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()
......
......@@ -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
......
......@@ -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']
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册