From 35b96d489f2cfa5e98990bf2a616cde6dadba7bf Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Tue, 29 Mar 2022 14:19:09 +0200 Subject: [PATCH] Update of oneDNN to 2.5 (#39426) * - update of oneDNN to 2.5 * - changes to UT testing onednn verbose * - Update of oneDNN to 2.5.3 * - update onednn to 2.5.4 --- cmake/external/mkldnn.cmake | 2 +- .../tests/unittests/mkldnn/test_flags_mkldnn_ops_on_off.py | 6 +++--- .../fluid/tests/unittests/mkldnn/test_flags_use_mkldnn.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake index 913b97fddd..29625b2b52 100644 --- a/cmake/external/mkldnn.cmake +++ b/cmake/external/mkldnn.cmake @@ -19,7 +19,7 @@ SET(MKLDNN_PREFIX_DIR ${THIRD_PARTY_PATH}/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 145c4b50196ac90ec1b946fb80cb5cef6e7d2d35) +SET(MKLDNN_TAG 9a35435c18722ff17a48fb60bceac42bfdf78754) # Introduce variables: 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 084053acb8..4e52b7b08c 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 @@ -31,9 +31,9 @@ class TestFlagsUseMkldnn(unittest.TestCase): self.env[str("DNNL_VERBOSE")] = str("1") 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" - self.matmul_regex = b"^dnnl_verbose,exec,cpu,matmul,.*10x20x30:10x30x20:10x20x20" + self.relu_regex = b"^onednn_verbose,exec,cpu,eltwise,.+alg:eltwise_relu alpha:0 beta:0,10x20x20" + self.ew_add_regex = b"^onednn_verbose,exec,cpu,binary.+alg:binary_add,10x20x30:10x20x30" + self.matmul_regex = b"^onednn_verbose,exec,cpu,matmul,.*10x20x30:10x30x20:10x20x20" def flags_use_mkl_dnn_common(self, e): cmd = self._python_interp diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_flags_use_mkldnn.py b/python/paddle/fluid/tests/unittests/mkldnn/test_flags_use_mkldnn.py index 3593c54a7f..0974d6357f 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_flags_use_mkldnn.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/test_flags_use_mkldnn.py @@ -32,7 +32,7 @@ class TestFlagsUseMkldnn(unittest.TestCase): self.env[str("DNNL_VERBOSE")] = str("1") self.env[str("FLAGS_use_mkldnn")] = str("1") - self.relu_regex = b"^dnnl_verbose,exec,cpu,eltwise,.+alg:eltwise_relu alpha:0 beta:0,10x20x30" + self.relu_regex = b"^onednn_verbose,exec,cpu,eltwise,.+alg:eltwise_relu alpha:0 beta:0,10x20x30" def _print_when_false(self, cond, out, err): if not cond: -- GitLab