This is an automated email from the ASF dual-hosted git repository.
bgawrych 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 40c7e09de5 [1.x][submodule] Upgrade oneDNN to the top of rls-v2.4
branch (#20989)
40c7e09de5 is described below
commit 40c7e09de5669d9f4f056b4cb94ca45378ecb726
Author: bartekkuncer <[email protected]>
AuthorDate: Fri Apr 8 11:47:12 2022 +0200
[1.x][submodule] Upgrade oneDNN to the top of rls-v2.4 branch (#20989)
---
3rdparty/mkldnn | 2 +-
src/operator/nn/mkldnn/mkldnn_convolution.cc | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index 145c4b5019..5818c40f07 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit 145c4b50196ac90ec1b946fb80cb5cef6e7d2d35
+Subproject commit 5818c40f07bdb6307f9bc64e929836fe036da644
diff --git a/src/operator/nn/mkldnn/mkldnn_convolution.cc
b/src/operator/nn/mkldnn/mkldnn_convolution.cc
index 78f95bd00b..6099a88d60 100644
--- a/src/operator/nn/mkldnn/mkldnn_convolution.cc
+++ b/src/operator/nn/mkldnn/mkldnn_convolution.cc
@@ -123,13 +123,7 @@
std::shared_ptr<mkldnn::convolution_forward::primitive_desc> GetConvFwdImpl(
conv_pd->dst_desc().get_size() != GetArraySize(output) ||
conv_pd->src_desc().get_size() != GetArraySize(data) ||
(!param.mkldnn_param.quantized &&
- conv_pd->weights_desc().get_size() != GetArraySize(weights)) ||
- // With the upgrade of MKLDNN to version 2.4+
- // tests/python/mkl/test_subgraph.py::test_pos_conv_add started
failing. Switching away
- // from blocking weights in order to temporarily fix the issue until
full fix arrives.
- // Tracking issue:
https://github.com/apache/incubator-mxnet/issues/20826.
- (param.mkldnn_param.quantized && conv_pd->weights_desc().dims()[1] <
4 &&
- conv_pd->weights_desc().data.padded_dims[1] !=
conv_pd->weights_desc().dims()[1])) {
+ conv_pd->weights_desc().get_size() != GetArraySize(weights))) {
// next_impl() will visit desc and engine, please make sure they are
still alive here.
CHECK(conv_pd->next_impl()) << "No convolution implementation for this
request.";
}
