IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CPU] cleanup after oneDNN v2.3 migration (#7933)

Browse Source
This commit is contained in:
Anton Voronov 2021-10-20 13:23:25 +03:00 committed by GitHub
parent 9f64f77a3c
commit 8280a1a045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inference-engine/src/mkldnn_plugin/nodes/mkldnn_conv_node.cpp
View File

@ -494,6 +494,7 @@ void MKLDNNConvolutionNode::createPrimitive() {
mkldnn::primitive_attr attr; mkldnn::primitive_attr attr;
addZeroPoints(attr); addZeroPoints(attr);
// todo: [AV] delete "false" to use binary mechanism
if (false && getSelectedPrimitiveDescriptor()->getImplementationType() == jit_gemm) { if (false && getSelectedPrimitiveDescriptor()->getImplementationType() == jit_gemm) {
setPostOps(attr, true, true); setPostOps(attr, true, true);
} else { } else {
@ -512,6 +513,7 @@ void MKLDNNConvolutionNode::createPrimitive() {
else else
primArgs = {{DNNL_ARG_SRC, src}, {DNNL_ARG_WEIGHTS, getWeights()}, {DNNL_ARG_DST, dst}}; 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(); // auto post_ops = attr.get_post_ops();
// int idx = 0; // int idx = 0;
// for (int i = 0; i < post_ops.len(); i++) { // for (int i = 0; i < post_ops.len(); i++) {

6
inference-engine/src/mkldnn_plugin/nodes/mkldnn_eltwise_node.cpp
View File

@ -1753,16 +1753,10 @@ void MKLDNNEltwiseNode::appendPostOps(mkldnn::post_ops& ops, bool initAsBinary,
case EltwiseSubtract: case EltwiseSubtract:
appendBinary(mkldnn::algorithm::binary_add, shiftsMemory, shifts); appendBinary(mkldnn::algorithm::binary_add, shiftsMemory, shifts);
break; break;
//
// appendBinary(mkldnn::algorithm::binary_sub, shiftsMemory, shifts);
// break;
case EltwiseMultiply: case EltwiseMultiply:
case EltwiseDivide: case EltwiseDivide:
appendBinary(mkldnn::algorithm::binary_mul, scalesMemory, scales); appendBinary(mkldnn::algorithm::binary_mul, scalesMemory, scales);
break; break;
//
// appendBinary(mkldnn::algorithm::binary_div, scalesMemory, scales);
// break;
case EltwiseMulAdd: case EltwiseMulAdd:
case EltwisePowerStatic: case EltwisePowerStatic:
appendBinary(mkldnn::algorithm::binary_mul, scalesMemory, scales); appendBinary(mkldnn::algorithm::binary_mul, scalesMemory, scales);

2
inference-engine/thirdparty/mkl-dnn vendored

@ -1 +1 @@
Subproject commit 3e530d9132e461510390a0b2130aa9b938d8809c Subproject commit 9f3ad6538d0ffb998588c1a51336a683db3568b1