From a3e09d2e6d965701254436247588ce8c38eb1812 Mon Sep 17 00:00:00 2001 From: Bartosz Kuncer Date: Tue, 30 Nov 2021 11:48:17 +0100 Subject: [PATCH 1/3] Change oneDNN build flags names from DNNL_* to ONEDNN_* --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27fd9e62a844..181bf3175b92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,16 +312,16 @@ if(USE_ONEDNN) endif() function(load_onednn) - set(DNNL_BUILD_TESTS OFF CACHE INTERNAL "" FORCE) - set(DNNL_BUILD_EXAMPLES OFF CACHE INTERNAL "" FORCE) - set(DNNL_ARCH_OPT_FLAGS "" CACHE INTERNAL "" FORCE) - set(DNNL_ENABLE_JIT_PROFILING OFF CACHE INTERNAL "" FORCE) - set(DNNL_LIBRARY_TYPE STATIC CACHE INTERNAL "" FORCE) - set(DNNL_ENABLE_CONCURRENT_EXEC ON CACHE INTERNAL "" FORCE) - set(DNNL_ENABLE_PRIMITIVE_CACHE ON CACHE INTERNAL "" FORCE) + set(ONEDNN_BUILD_TESTS OFF CACHE INTERNAL "" FORCE) + set(ONEDNN_BUILD_EXAMPLES OFF CACHE INTERNAL "" FORCE) + set(ONEDNN_ARCH_OPT_FLAGS "" CACHE INTERNAL "" FORCE) + set(ONEDNN_ENABLE_JIT_PROFILING OFF CACHE INTERNAL "" FORCE) + set(ONEDNN_LIBRARY_TYPE STATIC CACHE INTERNAL "" FORCE) + set(ONEDNN_ENABLE_CONCURRENT_EXEC ON CACHE INTERNAL "" FORCE) + set(ONEDNN_ENABLE_PRIMITIVE_CACHE ON CACHE INTERNAL "" FORCE) if(NOT USE_OPENMP) - set(DNNL_CPU_RUNTIME SEQ CACHE INTERNAL "" FORCE) + set(ONEDNN_CPU_RUNTIME SEQ CACHE INTERNAL "" FORCE) endif() set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/onednn") From 2476637d141ffe86376e46ba55e43be99f8adcaf Mon Sep 17 00:00:00 2001 From: Bartosz Kuncer Date: Thu, 9 Dec 2021 15:38:42 +0100 Subject: [PATCH 2/3] [submodule] Upgrade oneDNN used on master to v2.5.1 As there is currently a bug regarding conv+sum fusion, some tests have been temporairly adjusted. --- 3rdparty/onednn | 2 +- tests/cpp/operator/dnnl_test.cc | 2 +- tests/python/dnnl/subgraphs/subgraph_common.py | 5 ++++- tools/dependencies/README.md | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/3rdparty/onednn b/3rdparty/onednn index f40443c41342..3d770ab0a5ea 160000 --- a/3rdparty/onednn +++ b/3rdparty/onednn @@ -1 +1 @@ -Subproject commit f40443c413429c29570acd6cf5e3d1343cf647b4 +Subproject commit 3d770ab0a5eaf2ed50cf9a92f065fea24541a4e9 diff --git a/tests/cpp/operator/dnnl_test.cc b/tests/cpp/operator/dnnl_test.cc index 99ed3c0a2486..510d3689e121 100644 --- a/tests/cpp/operator/dnnl_test.cc +++ b/tests/cpp/operator/dnnl_test.cc @@ -101,7 +101,7 @@ static void VerifyDefMem(const dnnl::memory& mem) { TEST(DNNL_UTIL_FUNC, MemFormat) { // Check whether the number of format is correct. - CHECK_EQ(dnnl_format_tag_last, 385); + CHECK_EQ(dnnl_format_tag_last, 503); CHECK_EQ(dnnl_nchw, 5); CHECK_EQ(dnnl_oihw, 5); } diff --git a/tests/python/dnnl/subgraphs/subgraph_common.py b/tests/python/dnnl/subgraphs/subgraph_common.py index 3ed526ca56d5..0c9e9001c4d0 100644 --- a/tests/python/dnnl/subgraphs/subgraph_common.py +++ b/tests/python/dnnl/subgraphs/subgraph_common.py @@ -42,7 +42,10 @@ } } -DATA_SHAPE=[(64, 4, 10, 10), (4, 3, 24, 24), (1, 16, 32, 32)] +DATA_SHAPE=[(64, 4, 10, 10), (4, 4, 24, 24), (1, 16, 32, 32)] +# Second shape has been temporairly changed from (4, 3, 24, 24) to (4, 4, 24, 24) due to +# a bug regarding conv+sum fuse with the amount of input channels < 4. It will be reverted +# as soon as the problem is fixed. Issue: https://jira.devtools.intel.com/browse/MM6-532. # Helpers class RELU6(nn.HybridBlock): diff --git a/tools/dependencies/README.md b/tools/dependencies/README.md index c765742cb227..3e1494ff8b02 100644 --- a/tools/dependencies/README.md +++ b/tools/dependencies/README.md @@ -57,7 +57,7 @@ The dependencies could be categorized by several groups: BLAS libraries, CPU-bas | Dependencies | MXNet Version | | :------------: |:-------------:| |OpenBLAS| 0.3.9 | -|oneDNN| 2.3.3 | +|oneDNN| 2.5.1 | |CUDA| 10.1 | |cuDNN| 7.5.1 | |NCCL| 2.4.2 | From 063879e63b23105f33a284fd0a625b98016c062a Mon Sep 17 00:00:00 2001 From: bartekkuncer Date: Tue, 18 Jan 2022 18:32:12 +0100 Subject: [PATCH 3/3] Replace internal link --- tests/python/dnnl/subgraphs/subgraph_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/dnnl/subgraphs/subgraph_common.py b/tests/python/dnnl/subgraphs/subgraph_common.py index 0c9e9001c4d0..37b14c830a7c 100644 --- a/tests/python/dnnl/subgraphs/subgraph_common.py +++ b/tests/python/dnnl/subgraphs/subgraph_common.py @@ -45,7 +45,7 @@ DATA_SHAPE=[(64, 4, 10, 10), (4, 4, 24, 24), (1, 16, 32, 32)] # Second shape has been temporairly changed from (4, 3, 24, 24) to (4, 4, 24, 24) due to # a bug regarding conv+sum fuse with the amount of input channels < 4. It will be reverted -# as soon as the problem is fixed. Issue: https://jira.devtools.intel.com/browse/MM6-532. +# as soon as the problem is fixed. Issue: https://github.com/apache/incubator-mxnet/issues/20826. # Helpers class RELU6(nn.HybridBlock):