From 8280a1a045056656b97e1437338354e3a7ddf317 Mon Sep 17 00:00:00 2001
From: Anton Voronov <anton.voronov@intel.com>
Date: Wed, 20 Oct 2021 13:23:25 +0300
Subject: [PATCH] [CPU] cleanup after oneDNN v2.3 migration (#7933)

---
 .../src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp            | 2 ++
 .../src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp         | 6 ------
 inference-engine/thirdparty/mkl-dnn                         | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp
index aee0b8971dd..121d7c63c5b 100644
--- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp
+++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp
@@ -494,6 +494,7 @@ void MKLDNNConvolutionNode::createPrimitive() {
 
     mkldnn::primitive_attr attr;
     addZeroPoints(attr);
+    // todo: [AV] delete "false" to use binary mechanism
     if (false && getSelectedPrimitiveDescriptor()->getImplementationType() == jit_gemm) {
         setPostOps(attr, true, true);
     } else {
@@ -512,6 +513,7 @@ void MKLDNNConvolutionNode::createPrimitive() {
     else
         primArgs = {{DNNL_ARG_SRC, src}, {DNNL_ARG_WEIGHTS, getWeights()}, {DNNL_ARG_DST, dst}};
 
+// todo: [AV] uncomment to use binary mechanism
 //    auto post_ops = attr.get_post_ops();
 //    int idx = 0;
 //    for (int i = 0; i < post_ops.len(); i++) {
diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp
index 8f4e35471f5..32a707209b4 100644
--- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp
+++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp
@@ -1753,16 +1753,10 @@ void MKLDNNEltwiseNode::appendPostOps(mkldnn::post_ops& ops, bool initAsBinary,
                 case EltwiseSubtract:
                     appendBinary(mkldnn::algorithm::binary_add, shiftsMemory, shifts);
                     break;
-//
-//                    appendBinary(mkldnn::algorithm::binary_sub, shiftsMemory, shifts);
-//                    break;
                 case EltwiseMultiply:
                 case EltwiseDivide:
                     appendBinary(mkldnn::algorithm::binary_mul, scalesMemory, scales);
                     break;
-//
-//                    appendBinary(mkldnn::algorithm::binary_div, scalesMemory, scales);
-//                    break;
                 case EltwiseMulAdd:
                 case EltwisePowerStatic:
                     appendBinary(mkldnn::algorithm::binary_mul, scalesMemory, scales);
diff --git a/inference-engine/thirdparty/mkl-dnn b/inference-engine/thirdparty/mkl-dnn
index 3e530d9132e..9f3ad6538d0 160000
--- a/inference-engine/thirdparty/mkl-dnn
+++ b/inference-engine/thirdparty/mkl-dnn
@@ -1 +1 @@
-Subproject commit 3e530d9132e461510390a0b2130aa9b938d8809c
+Subproject commit 9f3ad6538d0ffb998588c1a51336a683db3568b1