[LPT] SplitTransformation WA for unsupported concat (openvinotoolkit#…

…5833) * [LPT] SplitTransformation WA for unsupported concat * [LPT][TESTS] added test-case with Split and unsupported Concat
yekruglov · Jun 7, 2021 · 0f1bb67 · 0f1bb67
1 parent 9b9dec7
commit 0f1bb67
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 17 deletions.
diff --git a/inference-engine/src/low_precision_transformations/src/split.cpp b/inference-engine/src/low_precision_transformations/src/split.cpp
@@ -130,7 +130,20 @@ bool SplitTransformation::isPrecisionPreserved(std::shared_ptr<Node> layer) cons
 }
 
 bool SplitTransformation::canBeTransformed(const TransformationContext& context, std::shared_ptr<Node> layer) const {
-    return (!NetworkHelper::getDequantization(layer).empty()) && LayerTransformation::canBeTransformed(context, layer);
+    if (!LayerTransformation::canBeTransformed(context, layer) || NetworkHelper::getDequantization(layer).empty()) {
+        return false;
+    }
+
+    const auto consumers = NetworkHelper::consumers(layer);
+    const auto concat = as_type_ptr<opset1::Concat>(consumers[0]);
+
+    // WA to avoid propagation of dequantization if after Split all consumers are the same unsupported Concat
+    if (concat && concat->get_axis() != 1ul) {
+        const size_t id = consumers[0]->get_instance_id();
+        return std::any_of(consumers.begin(), consumers.end(), [&](const std::shared_ptr<Node>& node) { return node->get_instance_id() != id; });
+    }
+
+    return true;
 }
 
 } // namespace low_precision

diff --git a/...ence-engine/tests/functional/inference_engine/lp_transformations/split_transformation.cpp b/...ence-engine/tests/functional/inference_engine/lp_transformations/split_transformation.cpp
@@ -42,6 +42,7 @@ class SplitTransformationTestValues {
     ngraph::pass::low_precision::LayerTransformation::Params params;
     Actual actual;
     Expected expected;
+    bool addUnsupportedConcat;
 };
 
 inline std::ostream& operator<<(std::ostream& os,
@@ -74,7 +75,8 @@ class SplitTransformation : public LayerTransformation, public testing::WithPara
             testValues.actual.precisionBeforeDequantization,
             testValues.actual.dequantization,
             testValues.splitedAxis,
-            testValues.numSplits);
+            testValues.numSplits,
+            testValues.addUnsupportedConcat);
 
         SimpleLowPrecisionTransformer transformer;
         transformer.add<ngraph::pass::low_precision::SplitTransformation, ngraph::opset1::Split>(testValues.params.setSupportAsymmetricQuantization(true));
@@ -88,7 +90,8 @@ class SplitTransformation : public LayerTransformation, public testing::WithPara
             testValues.expected.precisionAfterOperation,
             testValues.expected.dequantizationAfter,
             testValues.splitedAxis,
-            testValues.numSplits);
+            testValues.numSplits,
+            testValues.addUnsupportedConcat);
     }
 
     static std::string getTestCaseName(testing::TestParamInfo<SplitTransformationParams> obj) {
@@ -429,6 +432,22 @@ const std::vector<SplitTransformationTestValues> testValues = {
             }
         }
     },
+    // issue #56781: unsupported Concat after Split
+    {
+        ngraph::Shape({ 1, 4, 3, 3 }), std::int64_t{2}, size_t{3},
+        LayerTransformation::createParamsU8I8(),
+        {
+            ngraph::element::u8,
+            {{ngraph::element::f32}, {128.f}, {3.f}}
+        },
+        {
+            ngraph::element::u8,
+            {{ngraph::element::f32}, {128.f}, {3.f}},
+            ngraph::element::f32,
+            {}
+        },
+        true
+    },
     // no dequantization
     {
         ngraph::Shape({ 1, 3, 4, 4 }), std::int64_t{2}, size_t{2},

diff --git a/...tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/split_function.hpp b/...tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/split_function.hpp
@@ -25,7 +25,8 @@ class SplitFunction {
         const ngraph::element::Type precisionBeforeDequantization,
         const ngraph::builder::subgraph::DequantizationOperations& dequantization,
         const int64_t splitedAxis,
-        const size_t numSplits);
+        const size_t numSplits,
+        const bool addUnsupportedConcat = false);
 
     static std::shared_ptr<ngraph::Function> getOriginal(
         const ngraph::element::Type originalFunctionPrecision,
@@ -42,7 +43,8 @@ class SplitFunction {
         const ngraph::element::Type precisionAfterOperation,
         const std::vector<ngraph::builder::subgraph::DequantizationOperations>& dequantizationAfter,
         const int64_t splitedAxis,
-        const size_t numSplit);
+        const size_t numSplit,
+        const bool addUnsupportedConcat = false);
 };
 }  // namespace subgraph
 }  // namespace builder

diff --git a/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/split_function.cpp b/inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/src/split_function.cpp
@@ -23,7 +23,8 @@ std::shared_ptr<ngraph::Function> SplitFunction::getOriginal(
     const ngraph::element::Type precisionBeforeDequantization,
     const ngraph::builder::subgraph::DequantizationOperations& dequantization,
     const int64_t splitedAxis,
-    const size_t numSplits) {
+    const size_t numSplits,
+    const bool addUnsupportedConcat) {
     const std::shared_ptr<op::v0::Parameter> input = std::make_shared<ngraph::opset1::Parameter>(
         precisionBeforeDequantization,
         ngraph::Shape(inputShape));
@@ -35,8 +36,14 @@ std::shared_ptr<ngraph::Function> SplitFunction::getOriginal(
     const std::shared_ptr<Node> split = std::make_shared<ngraph::opset1::Split>(dequantizationOp, constant, numSplits);
 
     ngraph::ResultVector results;
-    for (size_t i = 0; i < numSplits; ++i) {
-        results.push_back(std::make_shared<ngraph::opset1::Result>(split->output(i)));
+
+    if (addUnsupportedConcat) {
+        const auto concat = std::make_shared<opset1::Concat>(split->outputs(), 2ul);
+        results.push_back(std::make_shared<opset1::Result>(concat));
+    } else {
+        for (size_t i = 0; i < numSplits; ++i) {
+            results.push_back(std::make_shared<ngraph::opset1::Result>(split->output(i)));
+        }
     }
     return std::make_shared<ngraph::Function>(results, ngraph::ParameterVector{ input }, "SplitFunction");
 }
@@ -77,7 +84,8 @@ std::shared_ptr<ngraph::Function> SplitFunction::getReference(
     const ngraph::element::Type precisionAfterOperation,
     const std::vector<ngraph::builder::subgraph::DequantizationOperations>& dequantizationAfter,
     const int64_t splitedAxis,
-    const size_t numSplit) {
+    const size_t numSplit,
+    const bool addUnsupportedConcat) {
     const std::shared_ptr<op::v0::Parameter> input = std::make_shared<ngraph::opset1::Parameter>(
         inputPrecision,
         ngraph::Shape(inputShape));
@@ -89,17 +97,23 @@ std::shared_ptr<ngraph::Function> SplitFunction::getReference(
     split = std::make_shared<ngraph::opset1::Split>(deqBefore, constant, numSplit);
 
     ngraph::ResultVector results;
-    for (size_t i = 0; i < numSplit; ++i) {
-        if (!dequantizationAfter.empty()) {
-            auto dequantizationStructure = dequantizationAfter[i];
-            if (!dequantizationStructure.multiply.empty()) {
-                dequantizationStructure.multiply.outPrecision = precision;
+    if (addUnsupportedConcat) {
+        const auto concat = std::make_shared<opset1::Concat>(split->outputs(), 2ul);
+        results.push_back(std::make_shared<opset1::Result>(concat));
+    } else {
+        for (size_t i = 0; i < numSplit; ++i) {
+            if (!dequantizationAfter.empty()) {
+                auto dequantizationStructure = dequantizationAfter[i];
+                if (!dequantizationStructure.multiply.empty()) {
+                    dequantizationStructure.multiply.outPrecision = precision;
+                }
+                results.push_back(std::make_shared<ngraph::opset1::Result>(makeDequantization(split->output(i), dequantizationAfter[i])));
+            } else {
+                results.push_back(std::make_shared<ngraph::opset1::Result>(split->output(i)));
             }
-            results.push_back(std::make_shared<ngraph::opset1::Result>(makeDequantization(split->output(i), dequantizationAfter[i])));
-        } else {
-            results.push_back(std::make_shared<ngraph::opset1::Result>(split->output(i)));
         }
     }
+
     return std::make_shared<ngraph::Function>(results, ngraph::ParameterVector{ input }, "SplitTransformation");
 }