[incubator-mxnet] branch v1.x updated: [1.x][submodule] Upgrade oneDNN to v2.3 (#20270)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhasheng pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/v1.x by this push:
     new 56f8289  [1.x][submodule] Upgrade oneDNN to v2.3 (#20270)
56f8289 is described below

commit 56f828982697bfaedf51d116902597d42abcf52d
Author: bartekkuncer <ba...@intel.com>
AuthorDate: Tue Jul 13 15:33:04 2021 +0200

    [1.x][submodule] Upgrade oneDNN to v2.3 (#20270)
---
 3rdparty/mkldnn                              | 2 +-
 src/operator/nn/mkldnn/mkldnn_convolution.cc | 3 +--
 tests/cpp/operator/mkldnn_test.cc            | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index 83ebc40..593e0de 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit 83ebc40d86bc54f0f23e947235e53570eeacf254
+Subproject commit 593e0de6267d2575f3e4c9e9818f0f11253d093a
diff --git a/src/operator/nn/mkldnn/mkldnn_convolution.cc b/src/operator/nn/mkldnn/mkldnn_convolution.cc
index 3d361ea..b042bd2 100644
--- a/src/operator/nn/mkldnn/mkldnn_convolution.cc
+++ b/src/operator/nn/mkldnn/mkldnn_convolution.cc
@@ -430,8 +430,7 @@ void MKLDNNConvolutionForwardFullFeature(const MKLDNNConvFullParam &param, const
       weight.MKLDNNDataReorderAsync(fwd->GetPd().weights_desc());
       weight_mem = GetWeights(weight, fwd->GetPd().weights_desc(), param.conv_param.num_group);
     } else {
-      weight_mem = weight.GetMKLDNNData();
-      CHECK(weight_mem->get_desc() == fwd->GetPd().weights_desc());
+      weight_mem = weight.GetMKLDNNDataReorder(fwd->GetPd().weights_desc());
     }
   }
   mkldnn_output_t out_mem;
diff --git a/tests/cpp/operator/mkldnn_test.cc b/tests/cpp/operator/mkldnn_test.cc
index 816979b..0a49845 100644
--- a/tests/cpp/operator/mkldnn_test.cc
+++ b/tests/cpp/operator/mkldnn_test.cc
@@ -100,7 +100,7 @@ static void VerifyDefMem(const mkldnn::memory &mem) {
 
 TEST(MKLDNN_UTIL_FUNC, MemFormat) {
   // Check whether the number of format is correct.
-  CHECK_EQ(mkldnn_format_tag_last, 222);
+  CHECK_EQ(mkldnn_format_tag_last, 385);
   CHECK_EQ(mkldnn_nchw, 5);
   CHECK_EQ(mkldnn_oihw, 5);
 }