Move legacy transformations and ops to legacy library (#2624)

* Initial movement

* Divided transformations to common and legacy

* Changed ngraph visibility to ie_api.h

* CommonTransformaitons to Internal

* New trasnformations location structure

* fixde typo; move convert_quantize_dequantize to common

* Added control_flow folder

inference-engine/src/cldnn_engine/cldnn_engine.cpp

@@ -26,12 +26,12 @@
 #include <ngraph/opsets/opset4.hpp>
 #include <ngraph/pass/manager.hpp>
 #include <generic_ie.hpp>
-#include <transformations/tensor_iterator_transformations/unroll_tensor_iterator.hpp>
+#include <transformations/control_flow/unroll_tensor_iterator.hpp>
 #include <transformations/common_optimizations/common_optimizations.hpp>
-#include <transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp>
-#include <transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp>
-#include <transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.hpp>
-#include <transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.hpp>
+#include <legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp>
+#include <legacy/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp>
+#include <transformations/opset_conversions/convert_opset2_to_opset1.hpp>
+#include <transformations/opset_conversions/convert_opset3_to_opset2.hpp>
 #include <transformations/init_node_info.hpp>
 #include <transformations/rt_info/fused_names_attribute.hpp>
 #include <legacy/convert_function_to_cnn_network.hpp>

inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp

@@ -21,12 +21,12 @@
 #include <string>
 
 #include <transformations/utils/utils.hpp>
-#include <transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp>
 #include <transformations/smart_reshape/smart_reshape.hpp>
 
-#include "ngraph_ops/eltwise.hpp"
-#include "exec_graph_info.hpp"
+#include <legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp>
 #include <legacy/ie_ngraph_utils.hpp>
+
+#include "exec_graph_info.hpp"
 #include "ie_itt.hpp"
 #include "network_serializer.hpp"
 #include "generic_ie.hpp"

inference-engine/src/legacy_api/include/legacy/ngraph_ops/crop_ie.hpp

@@ -7,14 +7,14 @@
 #include <memory>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API CropIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(CropIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"CropIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/eltwise.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
@@ -15,7 +15,7 @@ enum class ELTWISE_TYPE {Sum, Prod, Max, Sub, Min, Div};
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API Eltwise : public Op {
+class INFERENCE_ENGINE_API_CLASS(Eltwise) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"Eltwise", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/fully_connected.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/node.hpp"
 #include "ngraph/op/op.hpp"
@@ -16,7 +16,7 @@ namespace ngraph {
 namespace op {
 
 /// \brief Operator performing Matrix Multiplication.
-class TRANSFORMATIONS_API FullyConnected : public Op {
+class INFERENCE_ENGINE_API_CLASS(FullyConnected) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"FullyConnected", 0};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_ie.hpp

@@ -7,14 +7,14 @@
 #include <memory>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API GatherIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(GatherIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"GatherIE", 0};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/gather_tree_ie.hpp

@@ -7,14 +7,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API GatherTreeIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(GatherTreeIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"GatherTreeIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_cell_ie.hpp

@@ -8,14 +8,14 @@
 #include <string>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API GRUCellIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(GRUCellIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"GRUCellIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/gru_sequence_ie.hpp

@@ -8,14 +8,16 @@
 #include <string>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
+
+#include <ie_api.h>
 
 #include "ngraph/opsets/opset4.hpp"
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
-class TRANSFORMATIONS_API GRUSequenceIE : public ngraph::op::util::RNNCellBase {
+class INFERENCE_ENGINE_API_CLASS(GRUSequenceIE) : public ngraph::op::util::RNNCellBase {
 public:
     NGRAPH_RTTI_DECLARATION;
 

inference-engine/src/legacy_api/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp

@@ -7,14 +7,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API HardSigmoid_IE : public Op {
+class INFERENCE_ENGINE_API_CLASS(HardSigmoid_IE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"HardSigmoid_IE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/interp.hpp

@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
@@ -28,7 +28,7 @@ struct InterpolateIEAttrs {
     int pad_end = 0;
 };
 
-class TRANSFORMATIONS_API Interp : public Op {
+class INFERENCE_ENGINE_API_CLASS(Interp) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"Interp", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }
@@ -51,7 +51,7 @@ struct ResampleIEAttrs {
     std::string mode = "";
 };
 
-class TRANSFORMATIONS_API ResampleV2 : public Op {
+class INFERENCE_ENGINE_API_CLASS(ResampleV2) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"ResampleV2", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/lrn_ie.hpp

@@ -7,14 +7,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API LRN_IE : public Op {
+class INFERENCE_ENGINE_API_CLASS(LRN_IE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"LRN_IE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_cell_ie.hpp

@@ -8,14 +8,14 @@
 #include <string>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API LSTMCellIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(LSTMCellIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"LSTMCellIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/lstm_sequence_ie.hpp

@@ -8,14 +8,14 @@
 #include <string>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/opsets/opset4.hpp"
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
-class TRANSFORMATIONS_API LSTMSequenceIE : public ngraph::op::util::RNNCellBase {
+class INFERENCE_ENGINE_API_CLASS(LSTMSequenceIE) : public ngraph::op::util::RNNCellBase {
 public:
     NGRAPH_RTTI_DECLARATION;
 

inference-engine/src/legacy_api/include/legacy/ngraph_ops/nms_ie.hpp

@@ -7,14 +7,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API NonMaxSuppressionIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(NonMaxSuppressionIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"NonMaxSuppressionIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }
@@ -39,7 +39,7 @@ public:
     element::Type m_output_type;
 };
 
-class TRANSFORMATIONS_API NonMaxSuppressionIE2 : public NonMaxSuppressionIE {
+class INFERENCE_ENGINE_API_CLASS(NonMaxSuppressionIE2) : public NonMaxSuppressionIE {
 public:
     static constexpr NodeTypeInfo type_info{"NonMaxSuppressionIE", 2};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/normalize_ie.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/node.hpp"
 #include "ngraph/op/op.hpp"
@@ -14,7 +14,7 @@
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API NormalizeIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(NormalizeIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"NormalizeIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/onehot_ie.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/node.hpp"
 #include "ngraph/op/op.hpp"
@@ -16,7 +16,7 @@
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API OneHotIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(OneHotIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"OneHotIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/pad_ie.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/node.hpp"
 #include "ngraph/op/op.hpp"
@@ -16,7 +16,7 @@
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API PadIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(PadIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"PadIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/power.hpp

@@ -6,14 +6,14 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API PowerIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(PowerIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"PowerIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_clustered_ie.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/op/op.hpp>
 #include <ngraph/op/prior_box_clustered.hpp>
@@ -14,7 +14,7 @@
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API PriorBoxClusteredIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(PriorBoxClusteredIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"PriorBoxClusteredIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/prior_box_ie.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 #include "ngraph/op/prior_box.hpp"
@@ -14,7 +14,7 @@
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API PriorBoxIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(PriorBoxIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"PriorBoxIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/proposal_ie.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/op/proposal.hpp>
 #include "ngraph/op/op.hpp"
@@ -14,7 +14,7 @@
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API ProposalIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(ProposalIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"ProposalIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/relu_ie.hpp

@@ -6,14 +6,14 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API ReLUIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(ReLUIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"ReLUIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_cell_ie.hpp

@@ -8,14 +8,14 @@
 #include <string>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API RNNCellIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(RNNCellIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"RNNCellIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/rnn_sequence_ie.hpp

@@ -8,14 +8,14 @@
 #include <string>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/opsets/opset4.hpp"
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
-class TRANSFORMATIONS_API RNNSequenceIE : public ngraph::op::util::RNNCellBase {
+class INFERENCE_ENGINE_API_CLASS(RNNSequenceIE) : public ngraph::op::util::RNNCellBase {
 public:
     NGRAPH_RTTI_DECLARATION;
 

inference-engine/src/legacy_api/include/legacy/ngraph_ops/scaleshift.hpp

@@ -6,14 +6,14 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API ScaleShiftIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(ScaleShiftIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"ScaleShiftIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/selu_ie.hpp

@@ -6,14 +6,14 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API SeluIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(SeluIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"SeluIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/swish_ie.hpp

@@ -6,13 +6,13 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
-class TRANSFORMATIONS_API SwishIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(SwishIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"SwishIE", 1};
     const NodeTypeInfo &get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/tile_ie.hpp

@@ -6,14 +6,14 @@
 
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API TileIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(TileIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"TileIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/ngraph_ops/topk_ie.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include "ngraph/op/op.hpp"
 #include "ngraph/op/topk.hpp"
@@ -15,7 +15,7 @@
 namespace ngraph {
 namespace op {
 
-class TRANSFORMATIONS_API TopKIE : public Op {
+class INFERENCE_ENGINE_API_CLASS(TopKIE) : public Op {
 public:
     static constexpr NodeTypeInfo type_info{"TopKIE", 1};
     const NodeTypeInfo& get_type_info() const override { return type_info; }

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp

@@ -8,16 +8,16 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertLSTMCellMatcher;
-class TRANSFORMATIONS_API ConvertGRUCellMatcher;
-class TRANSFORMATIONS_API ConvertRNNCellMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertLSTMCellMatcher);
+class INFERENCE_ENGINE_API_CLASS(ConvertGRUCellMatcher);
+class INFERENCE_ENGINE_API_CLASS(ConvertRNNCellMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp

@@ -8,10 +8,10 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
-#include <ngraph_ops/gather_ie.hpp>
+#include <legacy/ngraph_ops/gather_ie.hpp>
 
 #include "ngraph/op/gather.hpp"
 #include "ngraph/op/constant.hpp"
@@ -22,7 +22,7 @@
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertGatherToGatherIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertGatherToGatherIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp

@@ -7,17 +7,17 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 #include <ngraph/op/gather_tree.hpp>
-#include <ngraph_ops/gather_tree_ie.hpp>
+#include <legacy/ngraph_ops/gather_tree_ie.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertGatherTreeToGatherTreeIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertGatherTreeToGatherTreeIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertHardSigmoidToLegacyMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertHardSigmoidToLegacyMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp

@@ -10,14 +10,14 @@
 #include <memory>
 #include <map>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertInterpolateToInterpOrResampleMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertInterpolateToInterpOrResampleMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertLRNToLegacyMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertLRNToLegacyMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp

@@ -11,16 +11,16 @@
 #include <sstream>
 #include <vector>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertMatMulToFCorGemm;
-class TRANSFORMATIONS_API ConvertMatMulToFC;
-class TRANSFORMATIONS_API ConvertMatMulToGemm;
+class INFERENCE_ENGINE_API_CLASS(ConvertMatMulToFCorGemm);
+class INFERENCE_ENGINE_API_CLASS(ConvertMatMulToFC);
+class INFERENCE_ENGINE_API_CLASS(ConvertMatMulToGemm);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp

@@ -7,14 +7,14 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertMulAddToScaleShiftOrPower;
+class INFERENCE_ENGINE_API_CLASS(ConvertMulAddToScaleShiftOrPower);
 
 }  // namespace pass
 }  // namespace ngraph
@@ -44,5 +44,5 @@ enum class CONVERSION_RESULT {
  *      NONE - default return value
  */
 
-TRANSFORMATIONS_API CONVERSION_RESULT
+INFERENCE_ENGINE_API_CPP(CONVERSION_RESULT)
 check_constant(const std::shared_ptr<ngraph::op::Constant> & constant, const ngraph::PartialShape & shape);

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_mul_or_add_finally.hpp

@@ -7,25 +7,25 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 #include <ngraph/opsets/opset1.hpp>
 #include <ngraph/rt_info.hpp>
 
-#include "ngraph_ops/scaleshift.hpp"
-#include "ngraph_ops/eltwise.hpp"
-#include "ngraph_ops/power.hpp"
+#include "legacy/ngraph_ops/scaleshift.hpp"
+#include "legacy/ngraph_ops/eltwise.hpp"
+#include "legacy/ngraph_ops/power.hpp"
 
 #include "transformations/utils/utils.hpp"
 
-#include "transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp"
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertMulOrAddFinally;
+class INFERENCE_ENGINE_API_CLASS(ConvertMulOrAddFinally);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp

@@ -7,14 +7,14 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-    class TRANSFORMATIONS_API ConvertNMS4ToLegacyMatcher;
+    class INFERENCE_ENGINE_API_CLASS(ConvertNMS4ToLegacyMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_nms_to_nms_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertNMSToNMSIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertNMSToNMSIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_normalizel2_to_normalize_ie.hpp

@@ -7,7 +7,7 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
@@ -15,8 +15,8 @@
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertNormalizeL2WithMulToNormalizeIE;
-class TRANSFORMATIONS_API ConvertNormalizeL2ToLegacyMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertNormalizeL2WithMulToNormalizeIE);
+class INFERENCE_ENGINE_API_CLASS(ConvertNormalizeL2ToLegacyMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_one_hot_to_one_hot_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertOneHotToOneHotIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertOneHotToOneHotIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp

@@ -7,7 +7,7 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
@@ -15,7 +15,7 @@
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertOpSet1ToLegacy;
+class INFERENCE_ENGINE_API_CLASS(ConvertOpSet1ToLegacy);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_pad_to_pad_ie.hpp

@@ -8,10 +8,10 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
-#include <ngraph_ops/pad_ie.hpp>
+#include <legacy/ngraph_ops/pad_ie.hpp>
 
 #include "ngraph/op/lrn.hpp"
 #include "ngraph/op/constant.hpp"
@@ -19,7 +19,7 @@
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertPadToLegacyMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertPadToLegacyMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_power_to_power_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertPowerToPowerIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertPowerToPowerIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prelu_to_relu_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertPReLUToReLUIE;
+class INFERENCE_ENGINE_API_CLASS(ConvertPReLUToReLUIE);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp

@@ -7,14 +7,14 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertPriorBox;
+class INFERENCE_ENGINE_API_CLASS(ConvertPriorBox);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_proposal_to_proposal_ie.hpp

@@ -7,15 +7,15 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertProposalToLegacyMatcher;
-class TRANSFORMATIONS_API ConvertProposal4ToLegacyMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertProposalToLegacyMatcher);
+class INFERENCE_ENGINE_API_CLASS(ConvertProposal4ToLegacyMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_selu_to_selu_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertSeluToSeluIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertSeluToSeluIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sequences_to_sequences_ie.hpp

@@ -8,16 +8,16 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertLSTMSequenceMatcher;
-class TRANSFORMATIONS_API ConvertGRUSequenceMatcher;
-class TRANSFORMATIONS_API ConvertRNNSequenceMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertLSTMSequenceMatcher);
+class INFERENCE_ENGINE_API_CLASS(ConvertGRUSequenceMatcher);
+class INFERENCE_ENGINE_API_CLASS(ConvertRNNSequenceMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_sqrt_to_power_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertSqrtToPowerIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertSqrtToPowerIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_strided_slice_to_crop.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <algorithm>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertStridedSliceToCropMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertStridedSliceToCropMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_swish_to_swish_ie.hpp

@@ -8,13 +8,13 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
-    class TRANSFORMATIONS_API ConvertSwishToSwishIEMatcher;
+    class INFERENCE_ENGINE_API_CLASS(ConvertSwishToSwishIEMatcher);
 }  // namespace pass
 }  // namespace ngraph
 

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_tile_to_ie_tile.hpp

@@ -7,14 +7,14 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertTileToLegacyMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertTileToLegacyMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/convert_topk_to_topk_ie.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ConvertTopKToTopKIEMatcher;
+class INFERENCE_ENGINE_API_CLASS(ConvertTopKToTopKIEMatcher);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/fc_bias_fusion.hpp

@@ -7,9 +7,9 @@
 #include <functional>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
-#include <ngraph_ops/fully_connected.hpp>
+#include <legacy/ngraph_ops/fully_connected.hpp>
 #include <ngraph/graph_util.hpp>
 #include <ngraph/op/add.hpp>
 #include <ngraph/pattern/matcher.hpp>
@@ -25,7 +25,7 @@
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API FullyConnectedBiasFusion;
+class INFERENCE_ENGINE_API_CLASS(FullyConnectedBiasFusion);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_1d_ops.hpp

@@ -7,17 +7,17 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API Reshape1DOps;
-class TRANSFORMATIONS_API Reshape1DConvolution;
-class TRANSFORMATIONS_API Reshape1DAvgPool;
-class TRANSFORMATIONS_API Reshape1DMaxPool;
+class INFERENCE_ENGINE_API_CLASS(Reshape1DOps);
+class INFERENCE_ENGINE_API_CLASS(Reshape1DConvolution);
+class INFERENCE_ENGINE_API_CLASS(Reshape1DAvgPool);
+class INFERENCE_ENGINE_API_CLASS(Reshape1DMaxPool);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fc_fusion.hpp

@@ -8,7 +8,7 @@
 #include <memory>
 #include <numeric>
 
-#include <ngraph_ops/fully_connected.hpp>
+#include <legacy/ngraph_ops/fully_connected.hpp>
 #include <ngraph/graph_util.hpp>
 #include <ngraph/pattern/matcher.hpp>
 #include <ngraph/pattern/op/label.hpp>

inference-engine/src/legacy_api/include/legacy/transformations/convert_opset1_to_legacy/reshape_fully_connected.hpp

@@ -7,7 +7,7 @@
 #include <vector>
 #include <memory>
 
-#include <transformations_visibility.hpp>
+#include <ie_api.h>
 
 #include <ngraph/pass/graph_rewrite.hpp>
 
@@ -15,7 +15,7 @@
 namespace ngraph {
 namespace pass {
 
-class TRANSFORMATIONS_API ReshapeFullyConnected;
+class INFERENCE_ENGINE_API_CLASS(ReshapeFullyConnected);
 
 }  // namespace pass
 }  // namespace ngraph

inference-engine/src/legacy_api/src/cnn_network_impl.cpp

@@ -21,10 +21,10 @@
 #include "cnn_network_ngraph_impl.hpp"
 #include <transformations/init_node_info.hpp>
 #include <transformations/common_optimizations/common_optimizations.hpp>
-#include <transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp>
-#include <transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp>
-#include <transformations/convert_opset2_to_opset1/convert_opset2_to_opset1.hpp>
-#include <transformations/convert_opset3_to_opset2/convert_opset3_to_opset2.hpp>
+#include <transformations/opset_conversions/convert_opset2_to_opset1.hpp>
+#include <transformations/opset_conversions/convert_opset3_to_opset2.hpp>
+#include <legacy/transformations/convert_opset1_to_legacy/convert_opset1_to_legacy.hpp>
+#include <legacy/transformations/convert_opset1_to_legacy/convert_prior_to_ie_prior.hpp>
 
 #include "legacy/convert_function_to_cnn_network.hpp"
 #include "legacy/graph_tools.hpp"

inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp

@@ -10,33 +10,33 @@
 #include <cnn_network_ngraph_impl.hpp>
 #include "ngraph_ops/convolution_ie.hpp"
 #include "ngraph_ops/deconvolution_ie.hpp"
-#include "ngraph_ops/eltwise.hpp"
-#include "ngraph_ops/fully_connected.hpp"
-#include "ngraph_ops/gather_ie.hpp"
-#include "ngraph_ops/gather_tree_ie.hpp"
-#include "ngraph_ops/gru_cell_ie.hpp"
-#include "ngraph_ops/interp.hpp"
-#include "ngraph_ops/lrn_ie.hpp"
-#include "ngraph_ops/lstm_cell_ie.hpp"
-#include "ngraph_ops/normalize_ie.hpp"
-#include "ngraph_ops/pad_ie.hpp"
-#include "ngraph_ops/onehot_ie.hpp"
-#include "ngraph_ops/power.hpp"
-#include "ngraph_ops/prior_box_clustered_ie.hpp"
-#include "ngraph_ops/prior_box_ie.hpp"
-#include "ngraph_ops/proposal_ie.hpp"
-#include "ngraph_ops/relu_ie.hpp"
-#include "ngraph_ops/scaleshift.hpp"
-#include "ngraph_ops/tile_ie.hpp"
-#include "ngraph_ops/hard_sigmoid_ie.hpp"
-#include "ngraph_ops/nms_ie.hpp"
-#include "ngraph_ops/crop_ie.hpp"
-#include "ngraph_ops/selu_ie.hpp"
-#include "ngraph_ops/rnn_cell_ie.hpp"
-#include "ngraph_ops/topk_ie.hpp"
-#include "ngraph_ops/rnn_sequence_ie.hpp"
-#include "ngraph_ops/lstm_sequence_ie.hpp"
-#include "ngraph_ops/gru_sequence_ie.hpp"
+#include "legacy/ngraph_ops/eltwise.hpp"
+#include "legacy/ngraph_ops/fully_connected.hpp"
+#include "legacy/ngraph_ops/gather_ie.hpp"
+#include "legacy/ngraph_ops/gather_tree_ie.hpp"
+#include "legacy/ngraph_ops/gru_cell_ie.hpp"
+#include "legacy/ngraph_ops/interp.hpp"
+#include "legacy/ngraph_ops/lrn_ie.hpp"
+#include "legacy/ngraph_ops/lstm_cell_ie.hpp"
+#include "legacy/ngraph_ops/normalize_ie.hpp"
+#include "legacy/ngraph_ops/pad_ie.hpp"
+#include "legacy/ngraph_ops/onehot_ie.hpp"
+#include "legacy/ngraph_ops/power.hpp"
+#include "legacy/ngraph_ops/prior_box_clustered_ie.hpp"
+#include "legacy/ngraph_ops/prior_box_ie.hpp"
+#include "legacy/ngraph_ops/proposal_ie.hpp"
+#include "legacy/ngraph_ops/relu_ie.hpp"
+#include "legacy/ngraph_ops/scaleshift.hpp"
+#include "legacy/ngraph_ops/tile_ie.hpp"
+#include "legacy/ngraph_ops/hard_sigmoid_ie.hpp"
+#include "legacy/ngraph_ops/nms_ie.hpp"
+#include "legacy/ngraph_ops/crop_ie.hpp"
+#include "legacy/ngraph_ops/selu_ie.hpp"
+#include "legacy/ngraph_ops/rnn_cell_ie.hpp"
+#include "legacy/ngraph_ops/topk_ie.hpp"
+#include "legacy/ngraph_ops/rnn_sequence_ie.hpp"
+#include "legacy/ngraph_ops/lstm_sequence_ie.hpp"
+#include "legacy/ngraph_ops/gru_sequence_ie.hpp"
 #include "generic_ie.hpp"
 #include "exec_graph_info.hpp"
 

inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.cpp

@@ -8,33 +8,33 @@
 #include <sstream>
 #include <utility>
 
-#include "ngraph_ops/crop_ie.hpp"
+#include "legacy/ngraph_ops/crop_ie.hpp"
 #include "ngraph_ops/convolution_ie.hpp"
 #include "ngraph_ops/deconvolution_ie.hpp"
-#include "ngraph_ops/eltwise.hpp"
-#include "ngraph_ops/fully_connected.hpp"
-#include "ngraph_ops/gather_ie.hpp"
-#include "ngraph_ops/gather_tree_ie.hpp"
-#include "ngraph_ops/gru_cell_ie.hpp"
-#include "ngraph_ops/interp.hpp"
-#include "ngraph_ops/lrn_ie.hpp"
-#include <ngraph_ops/lstm_cell_ie.hpp>
+#include "legacy/ngraph_ops/eltwise.hpp"
+#include "legacy/ngraph_ops/fully_connected.hpp"
+#include "legacy/ngraph_ops/gather_ie.hpp"
+#include "legacy/ngraph_ops/gather_tree_ie.hpp"
+#include "legacy/ngraph_ops/gru_cell_ie.hpp"
+#include "legacy/ngraph_ops/interp.hpp"
+#include "legacy/ngraph_ops/lrn_ie.hpp"
+#include "legacy/ngraph_ops/lstm_cell_ie.hpp"
 #include <transformations/rt_info/primitives_priority_attribute.hpp>
-#include "ngraph_ops/normalize_ie.hpp"
-#include "ngraph_ops/nms_ie.hpp"
-#include "ngraph_ops/onehot_ie.hpp"
-#include "ngraph_ops/pad_ie.hpp"
-#include "ngraph_ops/power.hpp"
-#include "ngraph_ops/prior_box_clustered_ie.hpp"
-#include "ngraph_ops/prior_box_ie.hpp"
-#include "ngraph_ops/proposal_ie.hpp"
-#include "ngraph_ops/relu_ie.hpp"
-#include "ngraph_ops/selu_ie.hpp"
-#include "ngraph_ops/scaleshift.hpp"
-#include "ngraph_ops/tile_ie.hpp"
-#include "ngraph_ops/topk_ie.hpp"
-#include "ngraph_ops/rnn_cell_ie.hpp"
-#include "ngraph_ops/hard_sigmoid_ie.hpp"
+#include "legacy/ngraph_ops/normalize_ie.hpp"
+#include "legacy/ngraph_ops/nms_ie.hpp"
+#include "legacy/ngraph_ops/onehot_ie.hpp"
+#include "legacy/ngraph_ops/pad_ie.hpp"
+#include "legacy/ngraph_ops/power.hpp"
+#include "legacy/ngraph_ops/prior_box_clustered_ie.hpp"
+#include "legacy/ngraph_ops/prior_box_ie.hpp"
+#include "legacy/ngraph_ops/proposal_ie.hpp"
+#include "legacy/ngraph_ops/relu_ie.hpp"
+#include "legacy/ngraph_ops/selu_ie.hpp"
+#include "legacy/ngraph_ops/scaleshift.hpp"
+#include "legacy/ngraph_ops/tile_ie.hpp"
+#include "legacy/ngraph_ops/topk_ie.hpp"
+#include "legacy/ngraph_ops/rnn_cell_ie.hpp"
+#include "legacy/ngraph_ops/hard_sigmoid_ie.hpp"
 #include "generic_ie.hpp"
 #include "exec_graph_info.hpp"
 

inference-engine/src/legacy_api/src/ngraph_ops/crop_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/crop_ie.hpp"
+#include "legacy/ngraph_ops/crop_ie.hpp"
 
 #include <algorithm>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/eltwise.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/eltwise.hpp"
+#include "legacy/ngraph_ops/eltwise.hpp"
 
 #include <algorithm>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/fully_connected.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/fully_connected.hpp"
+#include "legacy/ngraph_ops/fully_connected.hpp"
 
 #include <memory>
 #include <numeric>

inference-engine/src/legacy_api/src/ngraph_ops/gather_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/gather_ie.hpp"
+#include "legacy/ngraph_ops/gather_ie.hpp"
 
 #include <algorithm>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/gather_tree_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/gather_tree_ie.hpp"
+#include "legacy/ngraph_ops/gather_tree_ie.hpp"
 
 #include <memory>
 #include <string>

inference-engine/src/legacy_api/src/ngraph_ops/gru_cell_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/gru_cell_ie.hpp"
+#include "legacy/ngraph_ops/gru_cell_ie.hpp"
 
 #include <memory>
 #include <string>

inference-engine/src/legacy_api/src/ngraph_ops/gru_sequence_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/gru_sequence_ie.hpp"
+#include "legacy/ngraph_ops/gru_sequence_ie.hpp"
 #include "ngraph/op/util/recurrent_sequence.hpp"
 
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/hard_sigmoid_ie.cpp

@@ -5,7 +5,7 @@
 #include <memory>
 #include <string>
 
-#include "ngraph_ops/hard_sigmoid_ie.hpp"
+#include "legacy/ngraph_ops/hard_sigmoid_ie.hpp"
 
 #include "ngraph/op/hard_sigmoid.hpp"
 #include "ngraph/op/constant.hpp"

inference-engine/src/legacy_api/src/ngraph_ops/interp.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/interp.hpp"
+#include "legacy/ngraph_ops/interp.hpp"
 
 #include <limits>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/lrn_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/lrn_ie.hpp"
+#include "legacy/ngraph_ops/lrn_ie.hpp"
 
 #include <memory>
 #include <string>

inference-engine/src/legacy_api/src/ngraph_ops/lstm_cell_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/lstm_cell_ie.hpp"
+#include "legacy/ngraph_ops/lstm_cell_ie.hpp"
 
 #include <memory>
 #include <string>

inference-engine/src/legacy_api/src/ngraph_ops/lstm_sequence_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/lstm_sequence_ie.hpp"
+#include "legacy/ngraph_ops/lstm_sequence_ie.hpp"
 #include "ngraph/op/util/recurrent_sequence.hpp"
 
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/nms_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/nms_ie.hpp"
+#include "legacy/ngraph_ops/nms_ie.hpp"
 
 #include <memory>
 

inference-engine/src/legacy_api/src/ngraph_ops/normalize_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/normalize_ie.hpp"
+#include "legacy/ngraph_ops/normalize_ie.hpp"
 
 #include <memory>
 #include <string>

inference-engine/src/legacy_api/src/ngraph_ops/onehot_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/onehot_ie.hpp"
+#include "legacy/ngraph_ops/onehot_ie.hpp"
 
 #include <memory>
 

inference-engine/src/legacy_api/src/ngraph_ops/pad_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/pad_ie.hpp"
+#include "legacy/ngraph_ops/pad_ie.hpp"
 
 #include <assert.h>
 

inference-engine/src/legacy_api/src/ngraph_ops/power.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/power.hpp"
+#include "legacy/ngraph_ops/power.hpp"
 
 #include <memory>
 

inference-engine/src/legacy_api/src/ngraph_ops/prior_box_clustered_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/prior_box_clustered_ie.hpp"
+#include "legacy/ngraph_ops/prior_box_clustered_ie.hpp"
 
 #include <memory>
 

inference-engine/src/legacy_api/src/ngraph_ops/prior_box_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/prior_box_ie.hpp"
+#include "legacy/ngraph_ops/prior_box_ie.hpp"
 
 #include <memory>
 

inference-engine/src/legacy_api/src/ngraph_ops/proposal_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/proposal_ie.hpp"
+#include "legacy/ngraph_ops/proposal_ie.hpp"
 
 #include <memory>
 

inference-engine/src/legacy_api/src/ngraph_ops/relu_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/relu_ie.hpp"
+#include "legacy/ngraph_ops/relu_ie.hpp"
 
 #include <algorithm>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/rnn_cell_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/rnn_cell_ie.hpp"
+#include "legacy/ngraph_ops/rnn_cell_ie.hpp"
 
 #include <memory>
 #include <string>

inference-engine/src/legacy_api/src/ngraph_ops/rnn_sequence_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/rnn_sequence_ie.hpp"
+#include "legacy/ngraph_ops/rnn_sequence_ie.hpp"
 #include "ngraph/op/util/recurrent_sequence.hpp"
 
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/scaleshift.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/scaleshift.hpp"
+#include "legacy/ngraph_ops/scaleshift.hpp"
 
 #include <memory>
 

inference-engine/src/legacy_api/src/ngraph_ops/selu_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/selu_ie.hpp"
+#include "legacy/ngraph_ops/selu_ie.hpp"
 
 #include <algorithm>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/swish_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/swish_ie.hpp"
+#include "legacy/ngraph_ops/swish_ie.hpp"
 
 #include <algorithm>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/tile_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/tile_ie.hpp"
+#include "legacy/ngraph_ops/tile_ie.hpp"
 
 #include <algorithm>
 #include <memory>

inference-engine/src/legacy_api/src/ngraph_ops/topk_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ngraph_ops/topk_ie.hpp"
+#include "legacy/ngraph_ops/topk_ie.hpp"
 
 #include <memory>
 #include <string>

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_cells_to_cells_ie.hpp"
 
 #include <memory>
 #include <vector>
@@ -14,9 +14,9 @@
 #include <ngraph/pattern/op/wrap_type.hpp>
 #include <ngraph/op/util/rnn_cell_base.hpp>
 
-#include <ngraph_ops/lstm_cell_ie.hpp>
-#include <ngraph_ops/gru_cell_ie.hpp>
-#include <ngraph_ops/rnn_cell_ie.hpp>
+#include "legacy/ngraph_ops/lstm_cell_ie.hpp"
+#include "legacy/ngraph_ops/gru_cell_ie.hpp"
+#include "legacy/ngraph_ops/rnn_cell_ie.hpp"
 
 NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertLSTMCellMatcher, "ConvertLSTMCellMatcher", 0);
 

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_gather_to_gather_ie.hpp"
 
 #include <memory>
 #include <vector>

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_gathertree_to_gathertree_ie.hpp"
 
 #include <memory>
 #include <vector>

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_hard_sigmoid_to_hard_sigmoid_ie.hpp"
 
 #include <memory>
 #include <vector>
@@ -11,7 +11,7 @@
 #include <ngraph/rt_info.hpp>
 
 #include <transformations/utils/utils.hpp>
-#include <ngraph_ops/hard_sigmoid_ie.hpp>
+#include <legacy/ngraph_ops/hard_sigmoid_ie.hpp>
 
 NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertHardSigmoidToLegacyMatcher, "ConvertHardSigmoidToLegacyMatcher", 0);
 

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_interpolate_to_interp_or_resample.hpp"
 
 #include <memory>
 #include <vector>
@@ -13,7 +13,7 @@
 #include <ngraph/opsets/opset1.hpp>
 #include <ngraph/rt_info.hpp>
 
-#include <ngraph_ops/interp.hpp>
+#include <legacy/ngraph_ops/interp.hpp>
 
 NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertInterpolateToInterpOrResampleMatcher, "ConvertInterpolateToInterpOrResampleMatcher", 0);
 

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_lrn_to_lrn_ie.hpp"
 
 #include <memory>
 #include <vector>
@@ -11,7 +11,7 @@
 #include <ngraph/opsets/opset1.hpp>
 #include <ngraph/rt_info.hpp>
 
-#include <ngraph_ops/lrn_ie.hpp>
+#include <legacy/ngraph_ops/lrn_ie.hpp>
 
 NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertLRNToLegacyMatcher, "ConvertLRNToLegacyMatcher", 0);
 

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_matmul_to_fc_or_gemm.hpp"
 
 #include <algorithm>
 #include <utility>
@@ -14,7 +14,7 @@
 #include <ngraph/opsets/opset1.hpp>
 #include <ngraph/rt_info.hpp>
 
-#include <ngraph_ops/fully_connected.hpp>
+#include <legacy/ngraph_ops/fully_connected.hpp>
 #include <transformations/utils/utils.hpp>
 
 NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertMatMulToFC, "ConvertMatMulToFC", 0);

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_mul_add_to_scaleshift_or_power.hpp"
 
 #include <memory>
 #include <vector>
@@ -13,8 +13,8 @@
 
 #include "transformations/utils/utils.hpp"
 
-#include "ngraph_ops/power.hpp"
-#include "ngraph_ops/scaleshift.hpp"
+#include "legacy/ngraph_ops/power.hpp"
+#include "legacy/ngraph_ops/scaleshift.hpp"
 
 CONVERSION_RESULT check_constant(const std::shared_ptr<ngraph::opset1::Constant>& constant,
                                  const ngraph::PartialShape& shape) {

inference-engine/src/legacy_api/src/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.cpp

@@ -8,11 +8,11 @@
 #include <ngraph/graph_util.hpp>
 #include <ngraph/opsets/opset1.hpp>
 #include <ngraph/opsets/opset4.hpp>
-#include <ngraph_ops/nms_ie.hpp>
+#include <legacy/ngraph_ops/nms_ie.hpp>
 #include <ngraph/rt_info.hpp>
 #include <transformations/utils/utils.hpp>
 
-#include "transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp"
+#include "legacy/transformations/convert_opset1_to_legacy/convert_nms_4_to_legacy.hpp"
 
 NGRAPH_RTTI_DEFINITION(ngraph::pass::ConvertNMS4ToLegacyMatcher, "ConvertNMS4ToLegacyMatcher", 0);