[CPU] Deconvolution int8 support (openvinotoolkit#5565)

yekruglov · Jun 7, 2021 · 9c30c6d · 9c30c6d
1 parent c815bf6
commit 9c30c6d
Show file tree

Hide file tree

Showing 8 changed files with 217 additions and 54 deletions.
diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_descriptor.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_descriptor.cpp
@@ -35,6 +35,18 @@ MKLDNNDescriptor::operator std::shared_ptr<mkldnn::convolution_forward::desc>()
     return typeDesc->getPtr();
 }
 
+MKLDNNDescriptor::MKLDNNDescriptor(std::shared_ptr<mkldnn::deconvolution_forward::desc> desc) {
+    this->desc.reset(new DescFwdImpl<mkldnn::deconvolution_forward::desc>(desc));
+}
+
+MKLDNNDescriptor::operator std::shared_ptr<mkldnn::deconvolution_forward::desc>() {
+    auto typeDesc = std::dynamic_pointer_cast<DescFwdImpl<mkldnn::deconvolution_forward::desc>>(desc);
+    if (typeDesc == nullptr) {
+        IE_THROW() << "Cannot cast descriptor!";
+    }
+    return typeDesc->getPtr();
+}
+
 MKLDNNDescriptor::MKLDNNDescriptor(std::shared_ptr<mkldnn::convolution_backward_data::desc> desc,
                                    std::shared_ptr<mkldnn::convolution_forward::primitive_desc> prim) {
     this->desc.reset(

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_descriptor.h b/inference-engine/src/mkldnn_plugin/mkldnn_descriptor.h
@@ -15,6 +15,10 @@ class MKLDNNDescriptor {
 
     MKLDNNDescriptor(std::shared_ptr<mkldnn::convolution_backward_data::desc> desc,
                      std::shared_ptr<mkldnn::convolution_forward::primitive_desc> prim);
+
+    explicit MKLDNNDescriptor(std::shared_ptr<mkldnn::deconvolution_forward::desc> desc);
+    operator std::shared_ptr<mkldnn::deconvolution_forward::desc>();
+
     operator std::shared_ptr<mkldnn::convolution_backward_data::desc>();
     operator std::shared_ptr<mkldnn::convolution_forward::primitive_desc>();
 

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp
@@ -313,6 +313,7 @@ void MKLDNNGraph::InitGraph() {
     SortTopologically();
 
     InitDescriptors();
+    RemoveDroppedEdges();
 
     InitOptimalPrimitiveDescriptors();
 

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_plugin.cpp
@@ -334,7 +334,8 @@ static void Transformation(CNNNetwork& clonedNetwork, const Config& conf) {
                 LayerTransformation::Params(params).setPrecisionsOnActivations({ ngraph::element::u8 }).setSupportAsymmetricQuantization(true))
             .addStandaloneCleanup<MultiplyToGroupConvolutionTransformation, ngraph::opset1::Multiply>(
                 LayerTransformation::Params(params).setPrecisionsOnActivations({ ngraph::element::u8 }))
-            .remove<ConvolutionBackpropDataTransformation, ngraph::opset1::ConvolutionBackpropData>());
+            .add<ConvolutionBackpropDataTransformation, ngraph::opset1::ConvolutionBackpropData>(
+                    LayerTransformation::Params(params).setSupportAsymmetricQuantization(false)));
 
         transformer.transform(nGraphFunc);
     }

diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.cpp
diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.h b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_deconv_node.h
@@ -41,10 +41,12 @@ class MKLDNNDeconvolutionNode : public MKLDNNNode {
 private:
     bool withGroups = false;
     bool isDW = false;
+    bool isInt8 = false;
     size_t groupNum = 1;
     size_t outDepth;
     size_t IC;
     size_t OC;
+    std::vector<ptrdiff_t> kernel;
     std::vector<ptrdiff_t> stride;
     std::vector<ptrdiff_t> dilation;
     std::vector<ptrdiff_t> paddingL;
@@ -57,6 +59,9 @@ class MKLDNNDeconvolutionNode : public MKLDNNNode {
     void setPostOps(mkldnn::primitive_attr &attr);
 
     std::string errorPrefix;
+
+    bool canBeExecutedInInt8();
+    InferenceEngine::Blob::Ptr createWeiBlobAsIO(InferenceEngine::SizeVector dims);
 };
 
 }  // namespace MKLDNNPlugin

diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp
@@ -52,6 +52,7 @@ std::vector<std::string> disabledTestPatterns() {
         R"(.*ClampLayerTest.*netPrc=U64.*)",
         // TODO: 42538. Unexpected application crush
         R"(.*CoreThreadingTestsWithIterations\.smoke_LoadNetwork.t.*)",
+        R"(.*CoreThreadingTestsWithIterations\.smoke_LoadNetworkAccuracy.*AUTO.*)",
 
         // incorrect reference implementation
         R"(.*NormalizeL2LayerTest.*axes=\(\).*)",

diff --git a/inference-engine/thirdparty/mkl-dnn b/inference-engine/thirdparty/mkl-dnn
+1 −1		src/cpu/cpu_deconvolution_list.cpp
+11 −1		src/cpu/cpu_reorder.cpp
+9 −1		src/cpu/simple_reorder.hpp
+1 −0		src/cpu/x64/jit_avx512_core_x8s8s32x_deconvolution.cpp