Removed StridedSlice to StridedSliceIE transformation (openvinotoolki…

…t#661)
azhogov · Jun 1, 2020 · 66f854c · 66f854c
1 parent bfba84e
commit 66f854c
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 315 deletions.
diff --git a/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp b/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp
@@ -34,7 +34,6 @@
 #include "ngraph_ops/nms_ie.hpp"
 #include "ngraph_ops/crop_ie.hpp"
 #include "ngraph_ops/selu_ie.hpp"
-#include "ngraph_ops/strided_slice_ie.hpp"
 #include "ngraph_ops/rnn_cell_ie.hpp"
 #include "ngraph_ops/topk_ie.hpp"
 #include "generic_ie.hpp"
@@ -555,7 +554,6 @@ std::shared_ptr<CNNNetworkImpl> convertFunctionToICNNNetwork(const std::shared_p
                 std::make_shared<Builder::NodeConverter<::ngraph::op::v1::Split>>(),
                 std::make_shared<Builder::NodeConverter<::ngraph::op::VariadicSplit>>(),
                 std::make_shared<Builder::NodeConverter<::ngraph::op::v1::StridedSlice>>(),
-                std::make_shared<Builder::NodeConverter<::ngraph::op::StridedSliceIE>>(),
                 std::make_shared<Builder::NodeConverter<::ngraph::op::Squeeze>>(),
                 std::make_shared<Builder::NodeConverter<::ngraph::op::Sqrt>>(),
                 std::make_shared<Builder::NodeConverter<::ngraph::op::Subtract>>(),

diff --git a/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.cpp b/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.cpp
@@ -42,7 +42,6 @@
 #include "ngraph_ops/scaleshift.hpp"
 #include "ngraph_ops/tile_ie.hpp"
 #include "ngraph_ops/topk_ie.hpp"
-#include "ngraph_ops/strided_slice_ie.hpp"
 #include "ngraph_ops/rnn_cell_ie.hpp"
 #include "ngraph_ops/hard_sigmoid_ie.hpp"
 #include "generic_ie.hpp"
@@ -2114,17 +2113,10 @@ CNNLayer::Ptr NodeConverter<ngraph::op::Sqrt>::createLayer(const std::shared_ptr
 template <>
 CNNLayer::Ptr NodeConverter<ngraph::op::v1::StridedSlice>::createLayer(
         const std::shared_ptr<ngraph::Node>& layer) const {
-    THROW_IE_EXCEPTION << "StridedSlice operation has a form that is not supported." << layer->get_friendly_name()
-                       << " should be converted to StridedSliceIE operation";
-}
-
-template <>
-CNNLayer::Ptr NodeConverter<ngraph::op::StridedSliceIE>::createLayer(
-        const std::shared_ptr<ngraph::Node>& layer) const {
     LayerParams params = {layer->get_friendly_name(), "StridedSlice",
                           details::convertPrecision(layer->get_output_element_type(0))};
     auto res = std::make_shared<InferenceEngine::StridedSliceLayer>(params);
-    auto castedLayer = std::dynamic_pointer_cast<ngraph::op::StridedSliceIE>(layer);
+    auto castedLayer = std::dynamic_pointer_cast<ngraph::op::v1::StridedSlice>(layer);
     if (castedLayer == nullptr) THROW_IE_EXCEPTION << "Cannot get " << params.type << " layer " << params.name;
 
     std::string value;

diff --git a/inference-engine/src/transformations/include/ngraph_ops/strided_slice_ie.hpp b/inference-engine/src/transformations/include/ngraph_ops/strided_slice_ie.hpp
diff --git a/...mations/include/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy_tbl.hpp b/...mations/include/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy_tbl.hpp
@@ -53,7 +53,6 @@ NGRAPH_PASS(ConvertHardSigmoidToHardSigmoidIE, ::ngraph::pass)
 NGRAPH_PASS(ConvertCellsToCellsIE, ::ngraph::pass)
 NGRAPH_PASS(ConvertInterpolateToInterpOrResample, ::ngraph::pass)
 NGRAPH_PASS(ConvertStridedSliceToCrop, ::ngraph::pass)
-NGRAPH_PASS(ConvertStridedSliceToStridedSliceIE, ::ngraph::pass)
 NGRAPH_PASS(ConvertPowerToPowerIE, ::ngraph::pass)
 NGRAPH_PASS(ConvertSqrtToPowerIE, ::ngraph::pass)
 NGRAPH_PASS(ConvertPReLUToReLUIE, ::ngraph::pass)

diff --git a/...de/transformations/convert_opset1_to_legacy/convert_strided_slice_to_strided_slice_ie.hpp b/...de/transformations/convert_opset1_to_legacy/convert_strided_slice_to_strided_slice_ie.hpp
diff --git a/inference-engine/src/transformations/src/ngraph_ops/strided_slice_ie.cpp b/inference-engine/src/transformations/src/ngraph_ops/strided_slice_ie.cpp
diff --git a/...transformations/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp b/...transformations/src/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.cpp
@@ -44,7 +44,6 @@
 #include <transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp>
 #include <transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp>
 #include <transformations/pull_transpose_through_fq.hpp>
-#include <transformations/convert_opset1_to_legacy/convert_strided_slice_to_strided_slice_ie.hpp>
 #include <transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp>
 
 #include <ngraph/pass/constant_folding.hpp>

diff --git a/...rc/transformations/convert_opset1_to_legacy/convert_strided_slice_to_strided_slice_ie.cpp b/...rc/transformations/convert_opset1_to_legacy/convert_strided_slice_to_strided_slice_ie.cpp
diff --git a/...ctional/inference_engine/transformations/convert_stridedslice_to_stridedslice_ie_test.cpp b/...ctional/inference_engine/transformations/convert_stridedslice_to_stridedslice_ie_test.cpp