From 615e8a20f6f4c72a8a28271eabe6ea5d942f58b9 Mon Sep 17 00:00:00 2001 From: Jacek Czaja Date: Tue, 11 Aug 2020 06:56:05 +0200 Subject: [PATCH] - oneDNN update 1.3 -> 1.5 (#25202) * - introducing oneDNN 1.6 test=develop * - onednn 1.5 test=develop * - oneDNN 1.5 test=develop * - oneDNN 1.5 bugfix test=develop --- cmake/external/mkldnn.cmake | 2 +- .../fluid/tests/unittests/mkldnn/test_matmul_mkldnn_op.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake index 9f3606138d..ae870b766f 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 https://github.com/intel/mkl-dnn.git) -SET(MKLDNN_TAG fb95345126ade4c54f5507e580a5f5da8d30a515) +SET(MKLDNN_TAG 1ea812f4f5aa1bd989372a23ab50d0f0f81ee677) # Introduce variables: # * CMAKE_INSTALL_LIBDIR diff --git a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_mkldnn_op.py b/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_mkldnn_op.py index bd8842da03..11b453125d 100644 --- a/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_mkldnn_op.py +++ b/python/paddle/fluid/tests/unittests/mkldnn/test_matmul_mkldnn_op.py @@ -105,8 +105,11 @@ class TestDnnlMatMulOpInt8NoScales(TestDnnlMatMulOp): class TestDnnlMatMulOpInt8(TestDnnlMatMulOp): + # Due to limitation in int8 matmul implementation + # on older platforms (BDW, SKX) we needed to reduce + # range from [-127, 127] to [-63, 63] def quantize(self, tensor): - scale = 127. / np.abs(np.amax(tensor)) + scale = 63. / np.abs(np.amax(tensor)) quantized = np.round(scale * tensor).astype("int8") return scale, quantized -- GitLab