diff --git a/src/common/legacy/include/legacy/ngraph_ops/convolution_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/convolution_ie.hpp index 9407a32f180..27633c8496a 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/convolution_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/convolution_ie.hpp @@ -17,7 +17,6 @@ namespace op { class ConvolutionIE : public Op { public: OPENVINO_OP("ConvolutionIE", "util"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a batched convolution operation. ConvolutionIE() = default; /// \brief Constructs a batched convolution operation. diff --git a/src/common/legacy/include/legacy/ngraph_ops/crop_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/crop_ie.hpp index 275041ed94d..cbd0aeabdcd 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/crop_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/crop_ie.hpp @@ -17,7 +17,6 @@ namespace op { class CropIE : public Op { public: OPENVINO_OP("CropIE", "legacy"); - BWDCMP_RTTI_DECLARATION; CropIE(const Output& data1, std::vector axes, diff --git a/src/common/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp index 170bb322699..bd4a109c766 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/deconvolution_ie.hpp @@ -17,7 +17,6 @@ namespace op { class DeconvolutionIE : public Op { public: OPENVINO_OP("DeconvolutionIE", "util"); - BWDCMP_RTTI_DECLARATION; DeconvolutionIE() = default; diff --git a/src/common/legacy/include/legacy/ngraph_ops/eltwise.hpp b/src/common/legacy/include/legacy/ngraph_ops/eltwise.hpp index e5467e7a78d..6c744792cf5 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/eltwise.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/eltwise.hpp @@ -4,27 +4,26 @@ #pragma once -#include - #include +#include + #include "ngraph/op/op.hpp" -enum class ELTWISE_TYPE {Sum, Prod, Max, Sub, Min, Div}; +enum class ELTWISE_TYPE { Sum, Prod, Max, Sub, Min, Div }; namespace ngraph { namespace op { class Eltwise : public Op { public: OPENVINO_OP("Eltwise", "legacy"); - BWDCMP_RTTI_DECLARATION; Eltwise(const Output& data1, const Output& data2, const ELTWISE_TYPE eltwise_type, const element::Type output_type = element::undefined); - bool visit_attributes(AttributeVisitor &visitor) override; + bool visit_attributes(AttributeVisitor& visitor) override; void validate_and_infer_types() override; @@ -33,27 +32,25 @@ public: ELTWISE_TYPE eltwise_type; private: - ELTWISE_TYPE type_from_string(const std::string &eltwise_type) const { return as_enum(eltwise_type); } + ELTWISE_TYPE type_from_string(const std::string& eltwise_type) const { + return as_enum(eltwise_type); + } element::Type m_output_type; }; -} // namespace op +} // namespace op -std::ostream &operator<<(std::ostream &s, const ELTWISE_TYPE &type); -} // namespace ngraph +std::ostream& operator<<(std::ostream& s, const ELTWISE_TYPE& type); +} // namespace ngraph namespace ov { template <> -class AttributeAdapter - : public EnumAttributeAdapterBase { +class AttributeAdapter : public EnumAttributeAdapterBase { public: - AttributeAdapter(ELTWISE_TYPE &value) - : EnumAttributeAdapterBase(value) {} + AttributeAdapter(ELTWISE_TYPE& value) : EnumAttributeAdapterBase(value) {} - static constexpr DiscreteTypeInfo type_info{"AttributeAdapter", - 1}; - const DiscreteTypeInfo &get_type_info() const override { return type_info; } + OPENVINO_RTTI("AttributeAdapter"); }; } // namespace ov diff --git a/src/common/legacy/include/legacy/ngraph_ops/fully_connected.hpp b/src/common/legacy/include/legacy/ngraph_ops/fully_connected.hpp index 7fc7208d484..5e3c1968170 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/fully_connected.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/fully_connected.hpp @@ -18,7 +18,6 @@ namespace op { class FullyConnected : public Op { public: OPENVINO_OP("FullyConnected", "legacy"); - BWDCMP_RTTI_DECLARATION; FullyConnected() = default; /// \brief Constructs an FullyConnected operation. /// diff --git a/src/common/legacy/include/legacy/ngraph_ops/gather_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/gather_ie.hpp index 5553375fa0d..a87761bb945 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/gather_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/gather_ie.hpp @@ -17,7 +17,6 @@ namespace op { class GatherIE : public Op { public: OPENVINO_OP("GatherIE", "legacy"); - BWDCMP_RTTI_DECLARATION; GatherIE() = default; GatherIE(const Output& params, const Output& indices, int64_t axis); diff --git a/src/common/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp index a9eaccc8e9d..d586fa8b8a0 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/gather_tree_ie.hpp @@ -17,7 +17,6 @@ namespace op { class GatherTreeIE : public Op { public: OPENVINO_OP("GatherTreeIE", "legacy"); - BWDCMP_RTTI_DECLARATION; GatherTreeIE() = default; /// \param step_ids Tensor of shape [MAX_TIME, BATCH_SIZE, BEAM_WIDTH] with /// indices from per each step diff --git a/src/common/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp index 0956de46eb1..62b8859ff92 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/gru_cell_ie.hpp @@ -18,7 +18,6 @@ namespace op { class GRUCellIE : public Op { public: OPENVINO_OP("GRUCellIE", "legacy"); - BWDCMP_RTTI_DECLARATION; GRUCellIE(const Output &X, const Output &H_t, diff --git a/src/common/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp index 1a26eaf5b22..11c1041dd50 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/gru_sequence_ie.hpp @@ -20,7 +20,6 @@ namespace op { class GRUSequenceIE : public ngraph::op::util::RNNCellBase { public: OPENVINO_OP("GRUSequenceIE", "legacy"); - BWDCMP_RTTI_DECLARATION; GRUSequenceIE(const Output &X, const Output &H_t, diff --git a/src/common/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp index e7f212dd205..2fd19e41bab 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/hard_sigmoid_ie.hpp @@ -17,7 +17,6 @@ namespace op { class HardSigmoid_IE : public Op { public: OPENVINO_OP("HardSigmoid_IE", "legacy"); - BWDCMP_RTTI_DECLARATION; HardSigmoid_IE() = default; diff --git a/src/common/legacy/include/legacy/ngraph_ops/interp.hpp b/src/common/legacy/include/legacy/ngraph_ops/interp.hpp index fc15a4f594a..583d2057c51 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/interp.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/interp.hpp @@ -31,7 +31,6 @@ struct InterpolateIEAttrs { class Interp : public Op { public: OPENVINO_OP("Interp", "legacy"); - BWDCMP_RTTI_DECLARATION; Interp(const Output& image, const InterpolateIEAttrs& attrs); @@ -56,7 +55,6 @@ struct ResampleIEAttrs { class ResampleV2 : public Op { public: OPENVINO_OP("ResampleV2", "legacy"); - BWDCMP_RTTI_DECLARATION; ResampleV2(const Output& image, const Output& output_shape, diff --git a/src/common/legacy/include/legacy/ngraph_ops/lrn_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/lrn_ie.hpp index b0f38bd2cc0..353353763a7 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/lrn_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/lrn_ie.hpp @@ -17,7 +17,6 @@ namespace op { class LRN_IE : public Op { public: OPENVINO_OP("LRN_IE", "legacy"); - BWDCMP_RTTI_DECLARATION; LRN_IE() = default; diff --git a/src/common/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp index e0b50e222b6..e0ecf8dac6c 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/lstm_cell_ie.hpp @@ -18,7 +18,6 @@ namespace op { class LSTMCellIE : public Op { public: OPENVINO_OP("LSTMCellIE", "legacy"); - BWDCMP_RTTI_DECLARATION; LSTMCellIE(const Output &X, const Output &H_t, diff --git a/src/common/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp index 3e4862c98db..2e4f2e578fd 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/lstm_sequence_ie.hpp @@ -18,7 +18,6 @@ namespace op { class LSTMSequenceIE : public ngraph::op::util::RNNCellBase { public: OPENVINO_OP("LSTMSequenceIE", "legacy"); - BWDCMP_RTTI_DECLARATION; LSTMSequenceIE() = delete; diff --git a/src/common/legacy/include/legacy/ngraph_ops/nms_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/nms_ie.hpp index 4e64e97f392..6c7d45f481b 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/nms_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/nms_ie.hpp @@ -24,7 +24,6 @@ class NonMaxSuppressionIE3; class ngraph::op::NonMaxSuppressionIE : public Op { public: OPENVINO_OP("NonMaxSuppressionIE", "legacy"); - BWDCMP_RTTI_DECLARATION; NonMaxSuppressionIE(const Output& boxes, const Output& scores, @@ -49,7 +48,6 @@ public: class ngraph::op::NonMaxSuppressionIE2 : public NonMaxSuppressionIE { public: OPENVINO_OP("NonMaxSuppressionIE2", "legacy"); - BWDCMP_RTTI_DECLARATION; NonMaxSuppressionIE2(const Output& boxes, const Output& scores, @@ -68,7 +66,6 @@ public: class ngraph::op::NonMaxSuppressionIE3 : public Op { public: OPENVINO_OP("NonMaxSuppressionIE3", "legacy"); - BWDCMP_RTTI_DECLARATION; NonMaxSuppressionIE3(const Output& boxes, const Output& scores, diff --git a/src/common/legacy/include/legacy/ngraph_ops/normalize_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/normalize_ie.hpp index cb38a1e26b0..e12e19a8f11 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/normalize_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/normalize_ie.hpp @@ -17,7 +17,6 @@ namespace op { class NormalizeIE : public Op { public: OPENVINO_OP("NormalizeIE", "legacy"); - BWDCMP_RTTI_DECLARATION; NormalizeIE() = default; diff --git a/src/common/legacy/include/legacy/ngraph_ops/onehot_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/onehot_ie.hpp index 86003814612..db7178ed013 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/onehot_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/onehot_ie.hpp @@ -24,7 +24,6 @@ class OneHotIE; class ngraph::op::OneHotIE : public Op { public: OPENVINO_OP("OneHotIE", "legacy"); - BWDCMP_RTTI_DECLARATION; explicit OneHotIE(const Output& input, int axis, int depth, float on_value, float off_value, element::Type type); diff --git a/src/common/legacy/include/legacy/ngraph_ops/pad_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/pad_ie.hpp index e0e64402fc2..a08585d761d 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/pad_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/pad_ie.hpp @@ -19,7 +19,6 @@ namespace op { class PadIE : public Op { public: OPENVINO_OP("PadIE", "legacy"); - BWDCMP_RTTI_DECLARATION; explicit PadIE(const std::shared_ptr& pad); diff --git a/src/common/legacy/include/legacy/ngraph_ops/power.hpp b/src/common/legacy/include/legacy/ngraph_ops/power.hpp index 1e2d3ec3d1c..4145858382f 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/power.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/power.hpp @@ -16,7 +16,6 @@ namespace op { class PowerIE : public Op { public: OPENVINO_OP("PowerIE", "legacy"); - BWDCMP_RTTI_DECLARATION; PowerIE() = default; PowerIE(const Output& data_batch, const float power, const float scale, const float shift, const element::Type output_type = element::undefined); diff --git a/src/common/legacy/include/legacy/ngraph_ops/proposal_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/proposal_ie.hpp index b8d3df7eccc..af05afdb672 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/proposal_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/proposal_ie.hpp @@ -17,7 +17,6 @@ namespace op { class ProposalIE : public Op { public: OPENVINO_OP("ProposalIE", "legacy"); - BWDCMP_RTTI_DECLARATION; // \brief Constructs a Proposal operation // diff --git a/src/common/legacy/include/legacy/ngraph_ops/relu_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/relu_ie.hpp index a114399865e..5edb3ab800f 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/relu_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/relu_ie.hpp @@ -16,7 +16,6 @@ namespace op { class ReLUIE : public Op { public: OPENVINO_OP("ReLUIE", "legacy"); - BWDCMP_RTTI_DECLARATION; ReLUIE(const Output & data, const float & negative_slope, const element::Type output_type); diff --git a/src/common/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp index 8c1dd158c36..0bed5436fc3 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/rnn_cell_ie.hpp @@ -18,7 +18,6 @@ namespace op { class RNNCellIE : public Op { public: OPENVINO_OP("RNNCellIE", "legacy"); - BWDCMP_RTTI_DECLARATION; RNNCellIE(const Output &X, const Output &H_t, diff --git a/src/common/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp index 0e24461dd55..9df182289fd 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/rnn_sequence_ie.hpp @@ -18,7 +18,6 @@ namespace op { class RNNSequenceIE : public ngraph::op::util::RNNCellBase { public: OPENVINO_OP("RNNSequenceIE", "legacy"); - BWDCMP_RTTI_DECLARATION; RNNSequenceIE(const Output &X, const Output &H_t, diff --git a/src/common/legacy/include/legacy/ngraph_ops/scaleshift.hpp b/src/common/legacy/include/legacy/ngraph_ops/scaleshift.hpp index 90c809e3698..11b85ed1af3 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/scaleshift.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/scaleshift.hpp @@ -16,7 +16,6 @@ namespace op { class ScaleShiftIE : public Op { public: OPENVINO_OP("ScaleShiftIE", "legacy"); - BWDCMP_RTTI_DECLARATION; ScaleShiftIE(const Output& data_batch, const Output& weights, diff --git a/src/common/legacy/include/legacy/ngraph_ops/selu_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/selu_ie.hpp index b30f5eece01..bedb01ba07c 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/selu_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/selu_ie.hpp @@ -16,7 +16,6 @@ namespace op { class SeluIE : public Op { public: OPENVINO_OP("SeluIE", "legacy"); - BWDCMP_RTTI_DECLARATION; SeluIE(const Output & input, const float alpha, diff --git a/src/common/legacy/include/legacy/ngraph_ops/swish_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/swish_ie.hpp index 9acf5e47d1c..336a5f32b5c 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/swish_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/swish_ie.hpp @@ -15,7 +15,6 @@ namespace op { class SwishIE : public Op { public: OPENVINO_OP("SwishIE", "legacy"); - BWDCMP_RTTI_DECLARATION; explicit SwishIE(const Output &input, float alpha = 1.0); diff --git a/src/common/legacy/include/legacy/ngraph_ops/tile_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/tile_ie.hpp index 6c15b69d6c3..3b4726b70cd 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/tile_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/tile_ie.hpp @@ -16,7 +16,6 @@ namespace op { class TileIE : public Op { public: OPENVINO_OP("TileIE", "legacy"); - BWDCMP_RTTI_DECLARATION; TileIE(const Output& data1, const int64_t axis, diff --git a/src/common/legacy/include/legacy/ngraph_ops/topk_ie.hpp b/src/common/legacy/include/legacy/ngraph_ops/topk_ie.hpp index 84e66de6212..fc515780a33 100644 --- a/src/common/legacy/include/legacy/ngraph_ops/topk_ie.hpp +++ b/src/common/legacy/include/legacy/ngraph_ops/topk_ie.hpp @@ -18,7 +18,6 @@ namespace op { class TopKIE : public Op { public: OPENVINO_OP("TopKIE", "legacy"); - BWDCMP_RTTI_DECLARATION; TopKIE(const Output& data, const Output& k, diff --git a/src/common/legacy/src/ngraph_ops/convolution_ie.cpp b/src/common/legacy/src/ngraph_ops/convolution_ie.cpp index 16760aa2743..b9e36ac2f79 100644 --- a/src/common/legacy/src/ngraph_ops/convolution_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/convolution_ie.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::ConvolutionIE); - op::ConvolutionIE::ConvolutionIE(const Output& data_batch, const Output& filters, const Strides& strides, diff --git a/src/common/legacy/src/ngraph_ops/crop_ie.cpp b/src/common/legacy/src/ngraph_ops/crop_ie.cpp index 0395d52aba7..b05a15abb0c 100644 --- a/src/common/legacy/src/ngraph_ops/crop_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/crop_ie.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::CropIE); - op::CropIE::CropIE(const Output& data, std::vector axes, std::vector dim, std::vector offset) : Op({data}), axes(axes), dim(dim), offset(offset) { diff --git a/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp b/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp index 4f307f204bf..def0890f6f7 100644 --- a/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp @@ -17,8 +17,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::DeconvolutionIE); - op::DeconvolutionIE::DeconvolutionIE(const Output& data, const Output& filters, const Strides& strides, diff --git a/src/common/legacy/src/ngraph_ops/eltwise.cpp b/src/common/legacy/src/ngraph_ops/eltwise.cpp index 248de3f3d8d..c74df5d2479 100644 --- a/src/common/legacy/src/ngraph_ops/eltwise.cpp +++ b/src/common/legacy/src/ngraph_ops/eltwise.cpp @@ -13,10 +13,13 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::Eltwise); - -op::Eltwise::Eltwise(const Output& data1, const Output& data2, const ELTWISE_TYPE eltwise_type, const element::Type output_type) - : Op({data1, data2}), eltwise_type(eltwise_type), m_output_type(output_type) { +op::Eltwise::Eltwise(const Output& data1, + const Output& data2, + const ELTWISE_TYPE eltwise_type, + const element::Type output_type) + : Op({data1, data2}), + eltwise_type(eltwise_type), + m_output_type(output_type) { constructor_validate_and_infer_types(); } @@ -35,14 +38,17 @@ void op::Eltwise::validate_and_infer_types() { element::Type et_result; if (m_output_type == element::undefined) { - NODE_VALIDATION_CHECK(this, element::Type::merge(et_result, data1_et, data2_et), - "Element types for first and second do not match :", data1_et, " and ", data2_et); + NODE_VALIDATION_CHECK(this, + element::Type::merge(et_result, data1_et, data2_et), + "Element types for first and second do not match :", + data1_et, + " and ", + data2_et); } else { et_result = m_output_type; } - if (get_input_partial_shape(0).rank().is_dynamic() || - get_input_partial_shape(1).rank().is_dynamic()) { + if (get_input_partial_shape(0).rank().is_dynamic() || get_input_partial_shape(1).rank().is_dynamic()) { set_output_type(0, et_result, PartialShape::dynamic()); return; } @@ -65,8 +71,10 @@ void op::Eltwise::validate_and_infer_types() { *output_shape_it = *shape2_it; } - if (shape1_it != shape1.rend()) ++shape1_it; - if (shape2_it != shape2.rend()) ++shape2_it; + if (shape1_it != shape1.rend()) + ++shape1_it; + if (shape2_it != shape2.rend()) + ++shape2_it; ++output_shape_it; if (output_shape_it == output_shape.rend()) { break; @@ -76,26 +84,24 @@ void op::Eltwise::validate_and_infer_types() { set_output_type(0, et_result, output_shape); } -bool op::Eltwise::visit_attributes(AttributeVisitor &visitor) { - visitor.on_attribute("operation", eltwise_type); - return true; +bool op::Eltwise::visit_attributes(AttributeVisitor& visitor) { + visitor.on_attribute("operation", eltwise_type); + return true; } -std::ostream &ngraph::operator<<(std::ostream &s, const ELTWISE_TYPE &type) { - return s << as_string(type); +std::ostream& ngraph::operator<<(std::ostream& s, const ELTWISE_TYPE& type) { + return s << as_string(type); } namespace ov { -template <> EnumNames &EnumNames::get() { - static auto enum_names = - EnumNames("ELTWISE_TYPE", {{"sum", ELTWISE_TYPE::Sum}, - {"prod", ELTWISE_TYPE::Prod}, - {"max", ELTWISE_TYPE::Max}, - {"sub", ELTWISE_TYPE::Sub}, - {"min", ELTWISE_TYPE::Min}, - {"div", ELTWISE_TYPE::Div}}); - return enum_names; +template <> +EnumNames& EnumNames::get() { + static auto enum_names = EnumNames("ELTWISE_TYPE", + {{"sum", ELTWISE_TYPE::Sum}, + {"prod", ELTWISE_TYPE::Prod}, + {"max", ELTWISE_TYPE::Max}, + {"sub", ELTWISE_TYPE::Sub}, + {"min", ELTWISE_TYPE::Min}, + {"div", ELTWISE_TYPE::Div}}); + return enum_names; } - -constexpr DiscreteTypeInfo AttributeAdapter::type_info; - -} // namespace ov +} // namespace ov diff --git a/src/common/legacy/src/ngraph_ops/fully_connected.cpp b/src/common/legacy/src/ngraph_ops/fully_connected.cpp index 3b03de8b9bf..613c506a965 100644 --- a/src/common/legacy/src/ngraph_ops/fully_connected.cpp +++ b/src/common/legacy/src/ngraph_ops/fully_connected.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::FullyConnected); - op::FullyConnected::FullyConnected( const Output& A, const Output& B, diff --git a/src/common/legacy/src/ngraph_ops/gather_ie.cpp b/src/common/legacy/src/ngraph_ops/gather_ie.cpp index 068ac3b121e..1e78644d20e 100644 --- a/src/common/legacy/src/ngraph_ops/gather_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/gather_ie.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::GatherIE); - op::GatherIE::GatherIE(const Output& params, const Output& indices, int64_t axis) : Op({params, indices}) , m_axis(axis) { diff --git a/src/common/legacy/src/ngraph_ops/gather_tree_ie.cpp b/src/common/legacy/src/ngraph_ops/gather_tree_ie.cpp index f8910ddf814..e21930e5b07 100644 --- a/src/common/legacy/src/ngraph_ops/gather_tree_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/gather_tree_ie.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::GatherTreeIE); - op::GatherTreeIE::GatherTreeIE(const Output& step_ids, const Output& parent_idx, const Output& max_seq_len, diff --git a/src/common/legacy/src/ngraph_ops/gru_cell_ie.cpp b/src/common/legacy/src/ngraph_ops/gru_cell_ie.cpp index 84c587c648f..87c34e8b6ed 100644 --- a/src/common/legacy/src/ngraph_ops/gru_cell_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/gru_cell_ie.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::GRUCellIE); - op::GRUCellIE::GRUCellIE(const Output& X, const Output& H_t, const Output& WR, const Output& B, std::size_t hidden_size, const std::vector& activations, const std::vector& activations_alpha, diff --git a/src/common/legacy/src/ngraph_ops/gru_sequence_ie.cpp b/src/common/legacy/src/ngraph_ops/gru_sequence_ie.cpp index ab14f3f0cc7..98e47a247bb 100644 --- a/src/common/legacy/src/ngraph_ops/gru_sequence_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/gru_sequence_ie.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::GRUSequenceIE); - op::GRUSequenceIE::GRUSequenceIE(const Output& X, const Output& H_t, const Output& seq_lengths, diff --git a/src/common/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp b/src/common/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp index 3169e68857e..c6e8b33bdb0 100644 --- a/src/common/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/hard_sigmoid_ie.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::HardSigmoid_IE); - op::HardSigmoid_IE::HardSigmoid_IE(const ngraph::Output &arg, float alpha, float beta) diff --git a/src/common/legacy/src/ngraph_ops/interp.cpp b/src/common/legacy/src/ngraph_ops/interp.cpp index 61308d9b592..25e949f3764 100755 --- a/src/common/legacy/src/ngraph_ops/interp.cpp +++ b/src/common/legacy/src/ngraph_ops/interp.cpp @@ -12,9 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::Interp); -BWDCMP_RTTI_DEFINITION(op::ResampleV2); - op::Interp::Interp(const Output& image, const InterpolateIEAttrs& attrs) : Op({image}), m_attrs(attrs) { constructor_validate_and_infer_types(); diff --git a/src/common/legacy/src/ngraph_ops/lrn_ie.cpp b/src/common/legacy/src/ngraph_ops/lrn_ie.cpp index 94007a855fe..1622d94fd3d 100644 --- a/src/common/legacy/src/ngraph_ops/lrn_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/lrn_ie.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::LRN_IE); - op::LRN_IE::LRN_IE(const ngraph::Output& arg, double alpha, double beta, double bias, size_t size, std::string region) : Op({arg}), m_alpha(alpha), m_beta(beta), m_bias(bias), m_size(size), m_region(region) { diff --git a/src/common/legacy/src/ngraph_ops/lstm_cell_ie.cpp b/src/common/legacy/src/ngraph_ops/lstm_cell_ie.cpp index a95eb719541..18d38b50b3a 100644 --- a/src/common/legacy/src/ngraph_ops/lstm_cell_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/lstm_cell_ie.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::LSTMCellIE); - op::LSTMCellIE::LSTMCellIE(const Output& X, const Output& H_t, const Output& C_t, const Output& WR, const Output& B, std::size_t hidden_size, const std::vector& activations, const std::vector& activations_alpha, diff --git a/src/common/legacy/src/ngraph_ops/lstm_sequence_ie.cpp b/src/common/legacy/src/ngraph_ops/lstm_sequence_ie.cpp index 3036f1a35ba..78cfb5f3449 100644 --- a/src/common/legacy/src/ngraph_ops/lstm_sequence_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/lstm_sequence_ie.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::LSTMSequenceIE); - op::LSTMSequenceIE::LSTMSequenceIE(const Output &X, const Output &H_t, const Output &C_t, diff --git a/src/common/legacy/src/ngraph_ops/nms_ie.cpp b/src/common/legacy/src/ngraph_ops/nms_ie.cpp index f83ae60b72a..1e86df41414 100644 --- a/src/common/legacy/src/ngraph_ops/nms_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/nms_ie.cpp @@ -12,10 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::NonMaxSuppressionIE); -BWDCMP_RTTI_DEFINITION(op::NonMaxSuppressionIE2); -BWDCMP_RTTI_DEFINITION(op::NonMaxSuppressionIE3); - op::NonMaxSuppressionIE::NonMaxSuppressionIE(const Output &boxes, const Output &scores, const Output &max_output_boxes_per_class, diff --git a/src/common/legacy/src/ngraph_ops/normalize_ie.cpp b/src/common/legacy/src/ngraph_ops/normalize_ie.cpp index 66bfdae1ad6..5d527b9a664 100644 --- a/src/common/legacy/src/ngraph_ops/normalize_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/normalize_ie.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::NormalizeIE); - op::NormalizeIE::NormalizeIE(const Output& data, const Output& weights, float eps, bool across_spatial, bool channel_shared, const ngraph::element::Type output_type) : Op({data, weights}), m_eps(eps), m_across_spatial(across_spatial), m_channel_shared(channel_shared), m_output_type(output_type) { diff --git a/src/common/legacy/src/ngraph_ops/onehot_ie.cpp b/src/common/legacy/src/ngraph_ops/onehot_ie.cpp index 3590e13894a..548646e5667 100644 --- a/src/common/legacy/src/ngraph_ops/onehot_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/onehot_ie.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::OneHotIE); - op::OneHotIE::OneHotIE(const Output& input, int axis, int depth, float on_value, float off_value, element::Type type) : Op({input}), m_type(type), m_axis(axis), m_depth(depth), m_off_value(off_value), m_on_value(on_value) { constructor_validate_and_infer_types(); diff --git a/src/common/legacy/src/ngraph_ops/pad_ie.cpp b/src/common/legacy/src/ngraph_ops/pad_ie.cpp index ddd8ba57bb0..6417455fedd 100644 --- a/src/common/legacy/src/ngraph_ops/pad_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/pad_ie.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::PadIE); - op::PadIE::PadIE(const std::shared_ptr& pad) : Op({pad->input(0).get_source_output()}), m_pad_mode(pad->get_pad_mode()), diff --git a/src/common/legacy/src/ngraph_ops/power.cpp b/src/common/legacy/src/ngraph_ops/power.cpp index 755ce111282..b1f3fa99e6c 100644 --- a/src/common/legacy/src/ngraph_ops/power.cpp +++ b/src/common/legacy/src/ngraph_ops/power.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::PowerIE); - op::PowerIE::PowerIE(const Output& data_batch, const float power, const float scale, const float shift, const element::Type output_type) : Op({data_batch}), scale(scale), power(power), shift(shift), m_output_type(output_type) { constructor_validate_and_infer_types(); diff --git a/src/common/legacy/src/ngraph_ops/proposal_ie.cpp b/src/common/legacy/src/ngraph_ops/proposal_ie.cpp index 1609a921671..31f844a6ca4 100644 --- a/src/common/legacy/src/ngraph_ops/proposal_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/proposal_ie.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::ProposalIE); - op::ProposalIE::ProposalIE(const Output& class_probs, const Output& class_bbox_deltas, const Output& image_shape, const ProposalAttrs& attrs) : Op({class_probs, class_bbox_deltas, image_shape}), m_attrs(attrs) { diff --git a/src/common/legacy/src/ngraph_ops/relu_ie.cpp b/src/common/legacy/src/ngraph_ops/relu_ie.cpp index 8ab36a5e76c..924bf517d66 100644 --- a/src/common/legacy/src/ngraph_ops/relu_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/relu_ie.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::ReLUIE); - op::ReLUIE::ReLUIE(const Output& data, const float& negative_slope, const element::Type output_type) : Op(OutputVector {data}), m_negative_slope(negative_slope), m_output_type(output_type) { constructor_validate_and_infer_types(); diff --git a/src/common/legacy/src/ngraph_ops/rnn_cell_ie.cpp b/src/common/legacy/src/ngraph_ops/rnn_cell_ie.cpp index a55702f3a24..519ed912f14 100644 --- a/src/common/legacy/src/ngraph_ops/rnn_cell_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/rnn_cell_ie.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::RNNCellIE); - op::RNNCellIE::RNNCellIE(const Output& X, const Output& H_t, const Output& WR, const Output& B, std::size_t hidden_size, const std::vector& activations, const std::vector& activations_alpha, diff --git a/src/common/legacy/src/ngraph_ops/rnn_sequence_ie.cpp b/src/common/legacy/src/ngraph_ops/rnn_sequence_ie.cpp index fa5df12c19d..801f3128aab 100644 --- a/src/common/legacy/src/ngraph_ops/rnn_sequence_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/rnn_sequence_ie.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::RNNSequenceIE); - op::RNNSequenceIE::RNNSequenceIE(const Output& X, const Output& H_t, const Output& seq_lengths, // actually not supported diff --git a/src/common/legacy/src/ngraph_ops/scaleshift.cpp b/src/common/legacy/src/ngraph_ops/scaleshift.cpp index e5f806e9fbf..853163a3479 100644 --- a/src/common/legacy/src/ngraph_ops/scaleshift.cpp +++ b/src/common/legacy/src/ngraph_ops/scaleshift.cpp @@ -26,8 +26,6 @@ inline element::Type getMaxBitwidth(const std::vector& types) { return maxType; } -BWDCMP_RTTI_DEFINITION(op::ScaleShiftIE); - op::ScaleShiftIE::ScaleShiftIE(const Output& data_batch, const Output& weights, const Output& bias, const element::Type output_type) : Op({data_batch, weights, bias}), output_type(output_type) { if (this->output_type == element::undefined) { diff --git a/src/common/legacy/src/ngraph_ops/selu_ie.cpp b/src/common/legacy/src/ngraph_ops/selu_ie.cpp index 541501f8bb2..26e8077daea 100644 --- a/src/common/legacy/src/ngraph_ops/selu_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/selu_ie.cpp @@ -13,7 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::SeluIE); op::SeluIE::SeluIE(const Output & input, const float alpha, const float gamma) diff --git a/src/common/legacy/src/ngraph_ops/swish_ie.cpp b/src/common/legacy/src/ngraph_ops/swish_ie.cpp index 0dc5195f7e5..6be0dd7a1d4 100644 --- a/src/common/legacy/src/ngraph_ops/swish_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/swish_ie.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::SwishIE); - op::SwishIE::SwishIE(const Output & input, const float alpha) : Op({input}), m_alpha(alpha) { constructor_validate_and_infer_types(); diff --git a/src/common/legacy/src/ngraph_ops/tile_ie.cpp b/src/common/legacy/src/ngraph_ops/tile_ie.cpp index e383b9ee9d7..22d0f19833f 100644 --- a/src/common/legacy/src/ngraph_ops/tile_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/tile_ie.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::TileIE); - op::TileIE::TileIE(const Output& data1, const int64_t axis, const int64_t tiles) : Op({data1}), axis(axis), tiles(tiles) { constructor_validate_and_infer_types(); diff --git a/src/common/legacy/src/ngraph_ops/topk_ie.cpp b/src/common/legacy/src/ngraph_ops/topk_ie.cpp index c94b8980f52..fff26b38566 100644 --- a/src/common/legacy/src/ngraph_ops/topk_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/topk_ie.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::TopKIE); - op::TopKIE::TopKIE(const ngraph::Output &data, const ngraph::Output &k, const int64_t axis, const ngraph::op::TopKMode mode, const ngraph::op::TopKSortType sort, const element::Type& index_element_type) : Op({data, k}), m_axis(axis), m_mode(mode), m_sort_type(sort), m_index_element_type(index_element_type) { diff --git a/src/common/snippets/include/snippets/op/convert_saturation.hpp b/src/common/snippets/include/snippets/op/convert_saturation.hpp index da0b05283f7..ef31e1e3470 100644 --- a/src/common/snippets/include/snippets/op/convert_saturation.hpp +++ b/src/common/snippets/include/snippets/op/convert_saturation.hpp @@ -24,7 +24,6 @@ namespace op { class ConvertSaturation : public ov::op::v0::Convert { public: OPENVINO_OP("ConvertSaturation", "SnippetsOpset", ov::op::v0::Convert); - BWDCMP_RTTI_DECLARATION; ConvertSaturation(const Output& x, const ov::element::Type& destination_type); ConvertSaturation() = default; diff --git a/src/common/snippets/include/snippets/op/convert_truncation.hpp b/src/common/snippets/include/snippets/op/convert_truncation.hpp index 4d1ffe7b7c5..cf7bc0d84ae 100644 --- a/src/common/snippets/include/snippets/op/convert_truncation.hpp +++ b/src/common/snippets/include/snippets/op/convert_truncation.hpp @@ -23,7 +23,6 @@ namespace op { class ConvertTruncation : public ov::op::v0::Convert { public: OPENVINO_OP("ConvertTruncation", "SnippetsOpset", ov::op::v0::Convert); - BWDCMP_RTTI_DECLARATION; ConvertTruncation(const Output& x, const ov::element::Type& destination_type); ConvertTruncation() = default; diff --git a/src/common/snippets/src/op/convert_saturation.cpp b/src/common/snippets/src/op/convert_saturation.cpp index 9300352d076..ecc26bcff03 100644 --- a/src/common/snippets/src/op/convert_saturation.cpp +++ b/src/common/snippets/src/op/convert_saturation.cpp @@ -9,8 +9,6 @@ #include "ngraph/runtime/host_tensor.hpp" -BWDCMP_RTTI_DEFINITION(ngraph::snippets::op::ConvertSaturation); - ngraph::snippets::op::ConvertSaturation::ConvertSaturation(const Output& x, const ov::element::Type& destination_type) : ov::op::v0::Convert({x}, destination_type) { } diff --git a/src/common/snippets/src/op/convert_truncation.cpp b/src/common/snippets/src/op/convert_truncation.cpp index ca852d89f87..a009dc7d561 100644 --- a/src/common/snippets/src/op/convert_truncation.cpp +++ b/src/common/snippets/src/op/convert_truncation.cpp @@ -8,9 +8,6 @@ #include "ngraph/runtime/host_tensor.hpp" - -BWDCMP_RTTI_DEFINITION(ngraph::snippets::op::ConvertTruncation); - ngraph::snippets::op::ConvertTruncation::ConvertTruncation(const Output& x, const ov::element::Type& destination_type) : ov::op::v0::Convert({x}, destination_type) { } diff --git a/src/common/transformations/include/ov_ops/augru_cell.hpp b/src/common/transformations/include/ov_ops/augru_cell.hpp index ad46ded88ac..4564297ae99 100644 --- a/src/common/transformations/include/ov_ops/augru_cell.hpp +++ b/src/common/transformations/include/ov_ops/augru_cell.hpp @@ -22,7 +22,6 @@ namespace internal { class TRANSFORMATIONS_API AUGRUCell : public ov::op::util::RNNCellBase { public: OPENVINO_OP("AUGRUCell", "ie_internal_opset", ov::op::util::RNNCellBase); - BWDCMP_RTTI_DECLARATION; AUGRUCell(); AUGRUCell(const Output& X, diff --git a/src/common/transformations/include/ov_ops/augru_sequence.hpp b/src/common/transformations/include/ov_ops/augru_sequence.hpp index 151c343dafa..d02bd7258a1 100644 --- a/src/common/transformations/include/ov_ops/augru_sequence.hpp +++ b/src/common/transformations/include/ov_ops/augru_sequence.hpp @@ -21,7 +21,6 @@ namespace internal { class TRANSFORMATIONS_API AUGRUSequence : public ov::op::util::RNNCellBase { public: OPENVINO_OP("AUGRUSequence", "ie_internal_opset", ov::op::util::RNNCellBase); - BWDCMP_RTTI_DECLARATION; AUGRUSequence(); AUGRUSequence(const Output& X, diff --git a/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp b/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp index 2208c0ba9ed..36758456230 100644 --- a/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp +++ b/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp @@ -20,7 +20,6 @@ class TRANSFORMATIONS_API GenerateProposalsIEInternal : public op::v9::GenerateP public: OPENVINO_OP("GenerateProposalsIEInternal", "ie_internal_opset"); - BWDCMP_RTTI_DECLARATION; GenerateProposalsIEInternal() = default; diff --git a/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp b/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp index 22cd34e3fe4..c91b8e746cf 100644 --- a/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp +++ b/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp @@ -16,7 +16,6 @@ namespace internal { class TRANSFORMATIONS_API MulticlassNmsIEInternal : public opset9::MulticlassNms { public: OPENVINO_OP("MulticlassNmsIEInternal", "ie_internal_opset", opset9::MulticlassNms); - BWDCMP_RTTI_DECLARATION; MulticlassNmsIEInternal() = default; diff --git a/src/common/transformations/include/ov_ops/nms_ie_internal.hpp b/src/common/transformations/include/ov_ops/nms_ie_internal.hpp index a70a3a0b985..5ee9ba25937 100644 --- a/src/common/transformations/include/ov_ops/nms_ie_internal.hpp +++ b/src/common/transformations/include/ov_ops/nms_ie_internal.hpp @@ -18,7 +18,6 @@ namespace internal { class TRANSFORMATIONS_API NonMaxSuppressionIEInternal : public Op { public: OPENVINO_OP("NonMaxSuppressionIEInternal", "ie_internal_opset"); - BWDCMP_RTTI_DECLARATION; NonMaxSuppressionIEInternal() = default; diff --git a/src/common/transformations/src/ov_ops/augru_cell.cpp b/src/common/transformations/src/ov_ops/augru_cell.cpp index 06f22828946..3df438b54b5 100644 --- a/src/common/transformations/src/ov_ops/augru_cell.cpp +++ b/src/common/transformations/src/ov_ops/augru_cell.cpp @@ -11,8 +11,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::internal::AUGRUCell); - ov::op::internal::AUGRUCell::AUGRUCell() : m_linear_before_reset(false) { m_activations = {"sigmoid", "tanh"}; m_activation_f = get_activation_function(0); diff --git a/src/common/transformations/src/ov_ops/augru_sequence.cpp b/src/common/transformations/src/ov_ops/augru_sequence.cpp index cb2dd01566f..a05e350283a 100644 --- a/src/common/transformations/src/ov_ops/augru_sequence.cpp +++ b/src/common/transformations/src/ov_ops/augru_sequence.cpp @@ -10,8 +10,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::internal::AUGRUSequence); - ov::op::internal::AUGRUSequence::AUGRUSequence() : m_direction(op::RecurrentSequenceDirection::FORWARD), m_linear_before_reset(false) {} diff --git a/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp b/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp index 64a3964e27f..43634c0f847 100644 --- a/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ov; -BWDCMP_RTTI_DEFINITION(op::internal::GenerateProposalsIEInternal); - op::internal::GenerateProposalsIEInternal::GenerateProposalsIEInternal(const Output& im_info, const Output& anchors, const Output& deltas, diff --git a/src/common/transformations/src/ov_ops/multiclass_nms_ie_internal.cpp b/src/common/transformations/src/ov_ops/multiclass_nms_ie_internal.cpp index 43c3dd7b09b..dd632cb2108 100644 --- a/src/common/transformations/src/ov_ops/multiclass_nms_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/multiclass_nms_ie_internal.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ov; -BWDCMP_RTTI_DEFINITION(op::internal::MulticlassNmsIEInternal); - op::internal::MulticlassNmsIEInternal::MulticlassNmsIEInternal(const Output& boxes, const Output& scores, const op::util::MulticlassNmsBase::Attributes& attrs) diff --git a/src/common/transformations/src/ov_ops/nms_ie_internal.cpp b/src/common/transformations/src/ov_ops/nms_ie_internal.cpp index bb5883a6d91..c3707c73d74 100644 --- a/src/common/transformations/src/ov_ops/nms_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/nms_ie_internal.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ov; -BWDCMP_RTTI_DEFINITION(op::internal::NonMaxSuppressionIEInternal); - op::internal::NonMaxSuppressionIEInternal::NonMaxSuppressionIEInternal(const Output& boxes, const Output& scores, const Output& max_output_boxes_per_class, diff --git a/src/common/transformations/tests/utils/compare_functions_test.cpp b/src/common/transformations/tests/utils/compare_functions_test.cpp index 8555ab1658b..509f389fce1 100644 --- a/src/common/transformations/tests/utils/compare_functions_test.cpp +++ b/src/common/transformations/tests/utils/compare_functions_test.cpp @@ -609,15 +609,8 @@ public: AttributeAdapter(TestDummyDataTypeTransformationTests_NO_NGRAPH_NAME_COLISION& value) : DirectValueAccessor(value) {} - static constexpr DiscreteTypeInfo type_info{"TestDummyDataTypeTransformationTests_NO_NGRAPH_NAME_COLISION", static_cast(0)}; - - const DiscreteTypeInfo& get_type_info() const override { - return type_info; - } + OPENVINO_RTTI("TestDummyDataTypeTransformationTests_NO_NGRAPH_NAME_COLISION"); }; - -constexpr DiscreteTypeInfo AttributeAdapter::type_info; - } // namespace ov TEST(TransformationTests, DummyOpNegativeNotSupportedType) { @@ -651,8 +644,8 @@ TEST(TransformationTests, DifferentPrecisionVersusAttributes) { { // check precision only const auto fc = FunctionsComparator::no_default() - .enable(FunctionsComparator::NODES) - .enable(FunctionsComparator::PRECISIONS); + .enable(FunctionsComparator::NODES) + .enable(FunctionsComparator::PRECISIONS); const auto res = fc.compare(f1, f2); EXPECT_FALSE(res.valid); EXPECT_THAT(res.message, HasSubstr("Different element type detected")); diff --git a/src/core/docs/operation_enabling_flow.md b/src/core/docs/operation_enabling_flow.md index 8286806b5e4..f4021288d7b 100644 --- a/src/core/docs/operation_enabling_flow.md +++ b/src/core/docs/operation_enabling_flow.md @@ -9,14 +9,6 @@ ```cpp OPENVINO_OP("", "opset_name", /* Not needed if operation is inherited from ov::Op */); ``` - If operation is inherited from Operation with `BWDCMP_RTTI_DECLARATION` please add next declaration to header file: - ```cpp - BWDCMP_RTTI_DECLARATION; - ``` - * In `*.cpp` if operation is inherited from Operation with `BWDCMP_RTTI_DECLARATION` please add: - ```cpp - BWDCMP_RTTI_DEFINITION(op::vX::); - ``` * To support conditional compilation add following for each Operation method in `*.cpp` file: ```cpp OV_OP_SCOPE(__); diff --git a/src/core/include/ngraph/compatibility.hpp b/src/core/include/ngraph/compatibility.hpp deleted file mode 100644 index 1b2687f79c0..00000000000 --- a/src/core/include/ngraph/compatibility.hpp +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (C) 2018-2022 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include - -#include "ngraph/deprecated.hpp" - -namespace ngraph { - -// If operation has type_info, use it to add operation to opset -template -class HasTypeInfoMember { - template - static std::false_type check(...); - NGRAPH_SUPPRESS_DEPRECATED_START - template - static auto check(int) -> decltype(std::declval().type_info, std::true_type{}); - using type = decltype(check(0)); - NGRAPH_SUPPRESS_DEPRECATED_END -public: - static constexpr bool value = type::value; -}; - -} // namespace ngraph diff --git a/src/core/include/ngraph/distributed.hpp b/src/core/include/ngraph/distributed.hpp index 373bf3d6cb6..1dd083ba8f4 100644 --- a/src/core/include/ngraph/distributed.hpp +++ b/src/core/include/ngraph/distributed.hpp @@ -37,7 +37,6 @@ public: AttributeAdapter(ngraph::reduction::Type& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/ngraph/factory.hpp b/src/core/include/ngraph/factory.hpp index f6cb32370ce..264139bd740 100644 --- a/src/core/include/ngraph/factory.hpp +++ b/src/core/include/ngraph/factory.hpp @@ -8,7 +8,6 @@ #include #include -#include "ngraph/compatibility.hpp" #include "ngraph/deprecated.hpp" #include "ngraph/ngraph_visibility.hpp" @@ -37,19 +36,11 @@ public: } /// \brief Register a custom factory for DERIVED_TYPE - template ::value, bool>::type = true> + template void register_factory(Factory factory) { register_factory(DERIVED_TYPE::get_type_info_static(), factory); } - template ::value, bool>::type = true> - void register_factory(Factory factory) { - NGRAPH_SUPPRESS_DEPRECATED_START - register_factory(DERIVED_TYPE::type_info, factory); - NGRAPH_SUPPRESS_DEPRECATED_END - } - /// \brief Register the defualt constructor factory for DERIVED_TYPE template void register_factory() { @@ -63,19 +54,11 @@ public: } /// \brief Check to see if DERIVED_TYPE has a registered factory - template ::value, bool>::type = true> + template bool has_factory() { return has_factory(DERIVED_TYPE::get_type_info_static()); } - template ::value, bool>::type = true> - bool has_factory() { - NGRAPH_SUPPRESS_DEPRECATED_START - return has_factory(DERIVED_TYPE::type_info); - NGRAPH_SUPPRESS_DEPRECATED_END - } - /// \brief Create an instance for type_info BASE_TYPE* create(const typename BASE_TYPE::type_info_t& type_info) const { std::lock_guard guard(get_registry_mutex()); @@ -84,19 +67,11 @@ public: } /// \brief Create an instance using factory for DERIVED_TYPE - template ::value, bool>::type = true> + template BASE_TYPE* create() const { return create(DERIVED_TYPE::get_type_info_static()); } - template ::value, bool>::type = true> - BASE_TYPE* create() const { - NGRAPH_SUPPRESS_DEPRECATED_START - return create(DERIVED_TYPE::type_info); - NGRAPH_SUPPRESS_DEPRECATED_END - } - protected: FactoryMap m_factory_map; }; diff --git a/src/core/include/ngraph/node.hpp b/src/core/include/ngraph/node.hpp index 42f1c2ec63c..ba60eb5f38a 100644 --- a/src/core/include/ngraph/node.hpp +++ b/src/core/include/ngraph/node.hpp @@ -150,8 +150,7 @@ using ov::check_new_args_count; # define _NGRAPH_RTTI_DEFINITION_COMMON(CLASS) \ const ::ngraph::Node::type_info_t& CLASS::get_type_info() const { \ return get_type_info_static(); \ - } \ - const ::ngraph::Node::type_info_t CLASS::type_info = CLASS::get_type_info_static() + } #endif #define _NGRAPH_RTTI_DEFINITION_WITH_PARENT(CLASS, TYPE_NAME, _VERSION_INDEX, PARENT_CLASS) \ diff --git a/src/core/include/ngraph/opsets/opset.hpp b/src/core/include/ngraph/opsets/opset.hpp index ceefabe4cdf..71a5c43d8e3 100644 --- a/src/core/include/ngraph/opsets/opset.hpp +++ b/src/core/include/ngraph/opsets/opset.hpp @@ -33,14 +33,7 @@ public: } /// \brief Insert OP_TYPE into the opset with the default name and factory - template ::value, bool>::type = true> - void insert() { - NGRAPH_SUPPRESS_DEPRECATED_START - ov::OpSet::insert(OP_TYPE::type_info.name); - NGRAPH_SUPPRESS_DEPRECATED_END - } - - template ::value, bool>::type = true> + template void insert() { ov::OpSet::insert(OP_TYPE::get_type_info_static().name); } diff --git a/src/core/include/ngraph/runtime/aligned_buffer.hpp b/src/core/include/ngraph/runtime/aligned_buffer.hpp index a420cfb95a2..b7c83806f0c 100644 --- a/src/core/include/ngraph/runtime/aligned_buffer.hpp +++ b/src/core/include/ngraph/runtime/aligned_buffer.hpp @@ -74,7 +74,6 @@ public: AttributeAdapter(std::shared_ptr& value); OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/ngraph/type/element_type.hpp b/src/core/include/ngraph/type/element_type.hpp index 1de7e7a6587..215eed26f73 100644 --- a/src/core/include/ngraph/type/element_type.hpp +++ b/src/core/include/ngraph/type/element_type.hpp @@ -8,6 +8,7 @@ #pragma once +#include "ngraph/deprecated.hpp" #include "ngraph/type/bfloat16.hpp" #include "ngraph/type/float16.hpp" #include "openvino/core/type/element_type.hpp" diff --git a/src/core/include/openvino/core/attribute_adapter.hpp b/src/core/include/openvino/core/attribute_adapter.hpp index 3383970d4cc..eb28eb7bb26 100644 --- a/src/core/include/openvino/core/attribute_adapter.hpp +++ b/src/core/include/openvino/core/attribute_adapter.hpp @@ -234,7 +234,6 @@ public: AttributeAdapter(float& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a double as a double @@ -244,7 +243,6 @@ public: AttributeAdapter(double& value) : DirectValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a string as a string @@ -254,7 +252,6 @@ public: AttributeAdapter(std::string& value) : DirectValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a bool as a bool @@ -264,7 +261,6 @@ public: AttributeAdapter(bool& value) : DirectValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access an int8_t and an int64_t @@ -274,7 +270,6 @@ public: AttributeAdapter(int8_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access an int16_t as an int64_t @@ -284,7 +279,6 @@ public: AttributeAdapter(int16_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access an int32_t as an int64_t @@ -294,7 +288,6 @@ public: AttributeAdapter(int32_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access an int64_t as an int64_t @@ -304,7 +297,6 @@ public: AttributeAdapter(int64_t& value) : DirectValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a uint8_t as an int64_t @@ -314,7 +306,6 @@ public: AttributeAdapter(uint8_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a uint16_t as an int64_t @@ -324,7 +315,6 @@ public: AttributeAdapter(uint16_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a uint32_t as an int64_t @@ -334,7 +324,6 @@ public: AttributeAdapter(uint32_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a uint64_t as an int64_t @@ -344,7 +333,6 @@ public: AttributeAdapter(uint64_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; #ifdef __APPLE__ @@ -355,7 +343,6 @@ public: AttributeAdapter(size_t& value) : IndirectScalarValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -366,7 +353,6 @@ public: : IndirectVectorValueAccessor, std::vector>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; #endif @@ -380,7 +366,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -390,7 +375,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -400,7 +384,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -410,7 +393,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -420,7 +402,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -430,7 +411,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -440,7 +420,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -450,7 +429,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -460,7 +438,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -470,7 +447,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Access a vector @@ -480,7 +456,6 @@ public: AttributeAdapter(std::vector& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> diff --git a/src/core/include/openvino/core/axis_set.hpp b/src/core/include/openvino/core/axis_set.hpp index b62e266e33a..666e2d512ee 100644 --- a/src/core/include/openvino/core/axis_set.hpp +++ b/src/core/include/openvino/core/axis_set.hpp @@ -48,7 +48,6 @@ public: return m_ref; } OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; protected: ov::AxisSet& m_ref; diff --git a/src/core/include/openvino/core/axis_vector.hpp b/src/core/include/openvino/core/axis_vector.hpp index 862db080161..3edcc6eca80 100644 --- a/src/core/include/openvino/core/axis_vector.hpp +++ b/src/core/include/openvino/core/axis_vector.hpp @@ -44,7 +44,6 @@ class OPENVINO_API AttributeAdapter : public IndirectVectorValueAcce public: AttributeAdapter(AxisVector& value) : IndirectVectorValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/core/coordinate.hpp b/src/core/include/openvino/core/coordinate.hpp index ac12ff70fa7..42bd7fa813e 100644 --- a/src/core/include/openvino/core/coordinate.hpp +++ b/src/core/include/openvino/core/coordinate.hpp @@ -45,6 +45,5 @@ public: AttributeAdapter(Coordinate& value) : IndirectVectorValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/core/coordinate_diff.hpp b/src/core/include/openvino/core/coordinate_diff.hpp index 292d45decf0..6720c96a872 100644 --- a/src/core/include/openvino/core/coordinate_diff.hpp +++ b/src/core/include/openvino/core/coordinate_diff.hpp @@ -49,7 +49,6 @@ public: : IndirectVectorValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/core/model.hpp b/src/core/include/openvino/core/model.hpp index ec95e887adf..8b424447249 100644 --- a/src/core/include/openvino/core/model.hpp +++ b/src/core/include/openvino/core/model.hpp @@ -54,8 +54,6 @@ public: const ::ov::DiscreteTypeInfo& get_type_info() const { return get_type_info_static(); } - OPENVINO_DEPRECATED("This member was deprecated. Please use ::get_type_info_static() instead.") - static const ov::DiscreteTypeInfo type_info; Model(const ov::NodeVector& results, const ov::ParameterVector& parameters, const std::string& name = ""); @@ -578,7 +576,6 @@ public: AttributeAdapter(std::shared_ptr& value) : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; /// \brief Helper method to get associated batch size for a Model diff --git a/src/core/include/openvino/core/node.hpp b/src/core/include/openvino/core/node.hpp index 67e9ae5701f..3dfce106255 100644 --- a/src/core/include/openvino/core/node.hpp +++ b/src/core/include/openvino/core/node.hpp @@ -603,7 +603,6 @@ public: bool visit_attributes(AttributeVisitor& visitor) override; OPENVINO_RTTI("AttributeAdapter>"); - BWDCMP_RTTI_DECLARATION; protected: std::shared_ptr& m_ref; @@ -617,7 +616,6 @@ public: bool visit_attributes(AttributeVisitor& visitor) override; OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; protected: ov::NodeVector& m_ref; diff --git a/src/core/include/openvino/core/partial_shape.hpp b/src/core/include/openvino/core/partial_shape.hpp index d1dbdc57cd3..78574e5d2e7 100644 --- a/src/core/include/openvino/core/partial_shape.hpp +++ b/src/core/include/openvino/core/partial_shape.hpp @@ -430,6 +430,5 @@ public: AttributeAdapter(ov::PartialShape& value) : DirectValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/core/rtti.hpp b/src/core/include/openvino/core/rtti.hpp index ffbd14aad6e..e7a098f8634 100644 --- a/src/core/include/openvino/core/rtti.hpp +++ b/src/core/include/openvino/core/rtti.hpp @@ -100,15 +100,5 @@ _OPENVINO_RTTI_WITH_TYPE)(__VA_ARGS__)) /// Note: Please don't use this macros for new operations -#ifdef OPENVINO_STATIC_LIBRARY -# define BWDCMP_RTTI_DECLARATION -# define BWDCMP_RTTI_DEFINITION(CLASS) -#else -# define BWDCMP_RTTI_DECLARATION \ - OPENVINO_DEPRECATED("This member was deprecated. Please use ::get_type_info_static() instead.") \ - static const ov::DiscreteTypeInfo type_info -# define BWDCMP_RTTI_DEFINITION(CLASS) \ - OPENVINO_SUPPRESS_DEPRECATED_START \ - const ov::DiscreteTypeInfo CLASS::type_info = CLASS::get_type_info_static(); \ - OPENVINO_SUPPRESS_DEPRECATED_END -#endif +#define BWDCMP_RTTI_DECLARATION +#define BWDCMP_RTTI_DEFINITION(CLASS) diff --git a/src/core/include/openvino/core/shape.hpp b/src/core/include/openvino/core/shape.hpp index 41ca37bebef..0008cb917fa 100644 --- a/src/core/include/openvino/core/shape.hpp +++ b/src/core/include/openvino/core/shape.hpp @@ -113,7 +113,6 @@ class OPENVINO_API AttributeAdapter : public IndirectVectorValueAcces { public: OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; AttributeAdapter(ov::Shape& value) : IndirectVectorValueAccessor>(value) {} }; diff --git a/src/core/include/openvino/core/strides.hpp b/src/core/include/openvino/core/strides.hpp index 03985bb38c7..e783e3a6da7 100644 --- a/src/core/include/openvino/core/strides.hpp +++ b/src/core/include/openvino/core/strides.hpp @@ -42,7 +42,6 @@ class OPENVINO_API AttributeAdapter : public IndirectVectorValueAccesso public: AttributeAdapter(Strides& value) : IndirectVectorValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/core/type.hpp b/src/core/include/openvino/core/type.hpp index 1b22016f917..2d3acb275f7 100644 --- a/src/core/include/openvino/core/type.hpp +++ b/src/core/include/openvino/core/type.hpp @@ -13,8 +13,8 @@ #include #include -#include "ngraph/compatibility.hpp" #include "openvino/core/core_visibility.hpp" +#include "openvino/core/deprecated.hpp" namespace ov { @@ -96,26 +96,14 @@ std::ostream& operator<<(std::ostream& s, const DiscreteTypeInfo& info); /// \brief Tests if value is a pointer/shared_ptr that can be statically cast to a /// Type*/shared_ptr -OPENVINO_SUPPRESS_DEPRECATED_START template typename std::enable_if< - ngraph::HasTypeInfoMember::value && - std::is_convertible()->get_type_info().is_castable(Type::type_info)), bool>::value, - bool>::type -is_type(Value value) { - return value->get_type_info().is_castable(Type::type_info); -} - -template -typename std::enable_if< - !ngraph::HasTypeInfoMember::value && - std::is_convertible()->get_type_info().is_castable(Type::get_type_info_static())), - bool>::value, + std::is_convertible()->get_type_info().is_castable(Type::get_type_info_static())), + bool>::value, bool>::type is_type(Value value) { return value->get_type_info().is_castable(Type::get_type_info_static()); } -OPENVINO_SUPPRESS_DEPRECATED_END /// Casts a Value* to a Type* if it is of type Type, nullptr otherwise template diff --git a/src/core/include/openvino/core/type/element_type.hpp b/src/core/include/openvino/core/type/element_type.hpp index cc340f87319..05fd5cb5ff3 100644 --- a/src/core/include/openvino/core/type/element_type.hpp +++ b/src/core/include/openvino/core/type/element_type.hpp @@ -16,7 +16,6 @@ #include "openvino/core/attribute_adapter.hpp" #include "openvino/core/core_visibility.hpp" -#include "openvino/core/deprecated.hpp" #include "openvino/core/except.hpp" #include "openvino/core/rtti.hpp" #include "openvino/core/type/bfloat16.hpp" @@ -224,14 +223,12 @@ public: AttributeAdapter(ov::element::Type_t& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> class OPENVINO_API AttributeAdapter : public ValueAccessor { public: OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; AttributeAdapter(ov::element::Type& value) : m_ref(value) {} const std::string& get() override; @@ -249,7 +246,6 @@ template <> class OPENVINO_API AttributeAdapter : public DirectValueAccessor { public: OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; AttributeAdapter(ov::element::TypeVector& value) : DirectValueAccessor(value) {} }; diff --git a/src/core/include/openvino/op/abs.hpp b/src/core/include/openvino/op/abs.hpp index 64bc37e5f57..8319f6fc6a7 100644 --- a/src/core/include/openvino/op/abs.hpp +++ b/src/core/include/openvino/op/abs.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Abs : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Abs", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an absolute value operation. Abs() = default; bool visit_attributes(AttributeVisitor&) override { diff --git a/src/core/include/openvino/op/acos.hpp b/src/core/include/openvino/op/acos.hpp index 418fac705f3..85e3e8f9b7f 100644 --- a/src/core/include/openvino/op/acos.hpp +++ b/src/core/include/openvino/op/acos.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Acos : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Acos", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an arccos operation. Acos() = default; /// \brief Constructs an arccos operation. diff --git a/src/core/include/openvino/op/acosh.hpp b/src/core/include/openvino/op/acosh.hpp index 1f91d38ca7b..80e97cf04e1 100644 --- a/src/core/include/openvino/op/acosh.hpp +++ b/src/core/include/openvino/op/acosh.hpp @@ -17,7 +17,6 @@ namespace v3 { class OPENVINO_API Acosh : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Acosh", "opset4", util::UnaryElementwiseArithmetic, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an Acosh operation. Acosh() = default; diff --git a/src/core/include/openvino/op/adaptive_avg_pool.hpp b/src/core/include/openvino/op/adaptive_avg_pool.hpp index 95146656908..70f44b30c72 100644 --- a/src/core/include/openvino/op/adaptive_avg_pool.hpp +++ b/src/core/include/openvino/op/adaptive_avg_pool.hpp @@ -16,7 +16,6 @@ namespace v8 { class OPENVINO_API AdaptiveAvgPool : public Op { public: OPENVINO_OP("AdaptiveAvgPool", "opset8"); - BWDCMP_RTTI_DECLARATION; AdaptiveAvgPool() = default; diff --git a/src/core/include/openvino/op/adaptive_max_pool.hpp b/src/core/include/openvino/op/adaptive_max_pool.hpp index 37828627fd9..83152772188 100644 --- a/src/core/include/openvino/op/adaptive_max_pool.hpp +++ b/src/core/include/openvino/op/adaptive_max_pool.hpp @@ -16,7 +16,6 @@ namespace v8 { class OPENVINO_API AdaptiveMaxPool : public Op { public: OPENVINO_OP("AdaptiveMaxPool", "opset8"); - BWDCMP_RTTI_DECLARATION; AdaptiveMaxPool() = default; diff --git a/src/core/include/openvino/op/add.hpp b/src/core/include/openvino/op/add.hpp index 526d089a1e0..feec8e3e40b 100644 --- a/src/core/include/openvino/op/add.hpp +++ b/src/core/include/openvino/op/add.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API Add : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Add", "opset1", util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an uninitialized addition operation Add() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/asin.hpp b/src/core/include/openvino/op/asin.hpp index 5cb148805b7..f5e14b748fa 100644 --- a/src/core/include/openvino/op/asin.hpp +++ b/src/core/include/openvino/op/asin.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Asin : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Asin", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an arcsin operation. Asin() = default; /// \brief Constructs an arcsin operation. diff --git a/src/core/include/openvino/op/asinh.hpp b/src/core/include/openvino/op/asinh.hpp index 2488553d4a5..7d257f6f0fa 100644 --- a/src/core/include/openvino/op/asinh.hpp +++ b/src/core/include/openvino/op/asinh.hpp @@ -16,7 +16,6 @@ namespace v3 { class OPENVINO_API Asinh : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Asinh", "opset4", util::UnaryElementwiseArithmetic, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an Asinh operation. Asinh() = default; diff --git a/src/core/include/openvino/op/assign.hpp b/src/core/include/openvino/op/assign.hpp index b1d46749252..7566a985f36 100644 --- a/src/core/include/openvino/op/assign.hpp +++ b/src/core/include/openvino/op/assign.hpp @@ -15,7 +15,6 @@ namespace v3 { class OPENVINO_API Assign : public util::AssignBase { public: OPENVINO_OP("Assign", "opset3", util::AssignBase, 3); - BWDCMP_RTTI_DECLARATION; Assign() = default; /// \brief Constructs an Assign operation. @@ -46,7 +45,6 @@ namespace v6 { class OPENVINO_API Assign : public util::AssignBase { public: OPENVINO_OP("Assign", "opset6", util::AssignBase, 6); - BWDCMP_RTTI_DECLARATION; Assign() = default; /// \brief Constructs an Assign operation. diff --git a/src/core/include/openvino/op/atan.hpp b/src/core/include/openvino/op/atan.hpp index 9f61ffd7c3f..5f2b0a24cc7 100644 --- a/src/core/include/openvino/op/atan.hpp +++ b/src/core/include/openvino/op/atan.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Atan : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Atan", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an arctan operation. Atan() = default; diff --git a/src/core/include/openvino/op/atanh.hpp b/src/core/include/openvino/op/atanh.hpp index 5b9aa04fe28..36b1d06b3ba 100644 --- a/src/core/include/openvino/op/atanh.hpp +++ b/src/core/include/openvino/op/atanh.hpp @@ -17,7 +17,6 @@ namespace v3 { class OPENVINO_API Atanh : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Atanh", "opset4", util::UnaryElementwiseArithmetic, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an Atanh operation. Atanh() = default; diff --git a/src/core/include/openvino/op/avg_pool.hpp b/src/core/include/openvino/op/avg_pool.hpp index 116bde7df0a..df15ea6bf6d 100644 --- a/src/core/include/openvino/op/avg_pool.hpp +++ b/src/core/include/openvino/op/avg_pool.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API AvgPool : public Op { public: OPENVINO_OP("AvgPool", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a batched average pooling operation. AvgPool() = default; diff --git a/src/core/include/openvino/op/batch_norm.hpp b/src/core/include/openvino/op/batch_norm.hpp index d6d1204e376..76bb279b055 100644 --- a/src/core/include/openvino/op/batch_norm.hpp +++ b/src/core/include/openvino/op/batch_norm.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API BatchNormInference : public Op { public: OPENVINO_OP("BatchNormInference", "opset1"); - BWDCMP_RTTI_DECLARATION; BatchNormInference() = default; /// \param input [., C, ...] /// \param gamma gamma scaling for normalized value. [C] @@ -61,7 +60,6 @@ namespace v5 { class OPENVINO_API BatchNormInference : public Op { public: OPENVINO_OP("BatchNormInference", "opset5", op::Op, 5); - BWDCMP_RTTI_DECLARATION; BatchNormInference() = default; /// \param input [., C, ...] /// \param gamma gamma scaling for normalized value. [C] diff --git a/src/core/include/openvino/op/batch_to_space.hpp b/src/core/include/openvino/op/batch_to_space.hpp index 8a25f81f2fd..1639803edbb 100644 --- a/src/core/include/openvino/op/batch_to_space.hpp +++ b/src/core/include/openvino/op/batch_to_space.hpp @@ -24,7 +24,6 @@ namespace v1 { class OPENVINO_API BatchToSpace : public Op { public: OPENVINO_OP("BatchToSpace", "opset2", op::Op, 1); - BWDCMP_RTTI_DECLARATION; BatchToSpace() = default; /// \brief Constructs a BatchToSpace operation. /// diff --git a/src/core/include/openvino/op/binary_convolution.hpp b/src/core/include/openvino/op/binary_convolution.hpp index c83cb909695..6df19e7106e 100644 --- a/src/core/include/openvino/op/binary_convolution.hpp +++ b/src/core/include/openvino/op/binary_convolution.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API BinaryConvolution : public Op { public: OPENVINO_OP("BinaryConvolution", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; enum class BinaryConvolutionMode { // Interpret input data and kernel values: 0 as -1, 1 as 1 @@ -138,7 +137,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/broadcast.hpp b/src/core/include/openvino/op/broadcast.hpp index 9279745a7f7..439817b458b 100644 --- a/src/core/include/openvino/op/broadcast.hpp +++ b/src/core/include/openvino/op/broadcast.hpp @@ -18,7 +18,6 @@ namespace v3 { class OPENVINO_API Broadcast : public util::BroadcastBase { public: OPENVINO_OP("Broadcast", "opset3", op::util::BroadcastBase, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a broadcast operation. Broadcast() = default; @@ -83,7 +82,6 @@ namespace v1 { class OPENVINO_API Broadcast : public util::BroadcastBase { public: OPENVINO_OP("Broadcast", "opset1", op::util::BroadcastBase, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a broadcast operation. Broadcast() = default; diff --git a/src/core/include/openvino/op/bucketize.hpp b/src/core/include/openvino/op/bucketize.hpp index 63041c4cda7..44f071890fa 100644 --- a/src/core/include/openvino/op/bucketize.hpp +++ b/src/core/include/openvino/op/bucketize.hpp @@ -14,7 +14,6 @@ namespace v3 { class OPENVINO_API Bucketize : public Op { public: OPENVINO_OP("Bucketize", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; Bucketize() = default; /// \brief Constructs a Bucketize node diff --git a/src/core/include/openvino/op/ceiling.hpp b/src/core/include/openvino/op/ceiling.hpp index 6429b646467..075495c314a 100644 --- a/src/core/include/openvino/op/ceiling.hpp +++ b/src/core/include/openvino/op/ceiling.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Ceiling : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Ceiling", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a ceiling operation. Ceiling() = default; /// \brief Constructs a ceiling operation. diff --git a/src/core/include/openvino/op/clamp.hpp b/src/core/include/openvino/op/clamp.hpp index 862e0495a9b..732d569d97d 100644 --- a/src/core/include/openvino/op/clamp.hpp +++ b/src/core/include/openvino/op/clamp.hpp @@ -18,7 +18,6 @@ namespace v0 { class OPENVINO_API Clamp : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Clamp", "opset1", UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; Clamp() = default; /// \brief Constructs a Clamp node. diff --git a/src/core/include/openvino/op/concat.hpp b/src/core/include/openvino/op/concat.hpp index 0ee294e5861..3e040e96a4b 100644 --- a/src/core/include/openvino/op/concat.hpp +++ b/src/core/include/openvino/op/concat.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API Concat : public Op { public: OPENVINO_OP("Concat", "opset1"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a concatenation operation. Concat() = default; diff --git a/src/core/include/openvino/op/constant.hpp b/src/core/include/openvino/op/constant.hpp index 23aed791cf9..bcf6683744d 100644 --- a/src/core/include/openvino/op/constant.hpp +++ b/src/core/include/openvino/op/constant.hpp @@ -23,7 +23,6 @@ namespace v0 { class OPENVINO_API Constant : public Op { public: OPENVINO_OP("Constant", "opset1"); - BWDCMP_RTTI_DECLARATION; Constant() = default; diff --git a/src/core/include/openvino/op/convert.hpp b/src/core/include/openvino/op/convert.hpp index 54be69ae741..446d2464402 100644 --- a/src/core/include/openvino/op/convert.hpp +++ b/src/core/include/openvino/op/convert.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API Convert : public Op { public: OPENVINO_OP("Convert", "opset1"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a conversion operation. Convert() = default; diff --git a/src/core/include/openvino/op/convert_like.hpp b/src/core/include/openvino/op/convert_like.hpp index ed63a2f5269..8b1c7a9f25a 100644 --- a/src/core/include/openvino/op/convert_like.hpp +++ b/src/core/include/openvino/op/convert_like.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API ConvertLike : public Op { public: OPENVINO_OP("ConvertLike", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a conversion operation. ConvertLike() = default; diff --git a/src/core/include/openvino/op/convolution.hpp b/src/core/include/openvino/op/convolution.hpp index b52873c9630..577805de76f 100644 --- a/src/core/include/openvino/op/convolution.hpp +++ b/src/core/include/openvino/op/convolution.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API Convolution : public Op { public: OPENVINO_OP("Convolution", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a batched convolution operation. Convolution() = default; @@ -135,7 +134,6 @@ private: class OPENVINO_API ConvolutionBackpropData : public Op { public: OPENVINO_OP("ConvolutionBackpropData", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a batched-convolution data batch-backprop operation. ConvolutionBackpropData() = default; diff --git a/src/core/include/openvino/op/cos.hpp b/src/core/include/openvino/op/cos.hpp index b1d60596659..df50c57d35c 100644 --- a/src/core/include/openvino/op/cos.hpp +++ b/src/core/include/openvino/op/cos.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Cos : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Cos", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a cosine operation. Cos() = default; diff --git a/src/core/include/openvino/op/cosh.hpp b/src/core/include/openvino/op/cosh.hpp index 7f44084d2b6..44c7b4362b5 100644 --- a/src/core/include/openvino/op/cosh.hpp +++ b/src/core/include/openvino/op/cosh.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Cosh : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Cosh", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a hyperbolic cosine operation. Cosh() = default; diff --git a/src/core/include/openvino/op/ctc_greedy_decoder.hpp b/src/core/include/openvino/op/ctc_greedy_decoder.hpp index c41e3de2dbf..7d03133afd2 100644 --- a/src/core/include/openvino/op/ctc_greedy_decoder.hpp +++ b/src/core/include/openvino/op/ctc_greedy_decoder.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API CTCGreedyDecoder : public Op { public: OPENVINO_OP("CTCGreedyDecoder", "opset1"); - BWDCMP_RTTI_DECLARATION; CTCGreedyDecoder() = default; /// \brief Constructs a CTCGreedyDecoder operation diff --git a/src/core/include/openvino/op/ctc_greedy_decoder_seq_len.hpp b/src/core/include/openvino/op/ctc_greedy_decoder_seq_len.hpp index c2ab315b4cd..ddfac29f0ae 100644 --- a/src/core/include/openvino/op/ctc_greedy_decoder_seq_len.hpp +++ b/src/core/include/openvino/op/ctc_greedy_decoder_seq_len.hpp @@ -15,7 +15,6 @@ namespace v6 { class OPENVINO_API CTCGreedyDecoderSeqLen : public Op { public: OPENVINO_OP("CTCGreedyDecoderSeqLen", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; CTCGreedyDecoderSeqLen() = default; /// \brief Constructs a CTCGreedyDecoderSeqLen operation /// diff --git a/src/core/include/openvino/op/ctc_loss.hpp b/src/core/include/openvino/op/ctc_loss.hpp index 6f81a93e8ad..6fcda44962b 100644 --- a/src/core/include/openvino/op/ctc_loss.hpp +++ b/src/core/include/openvino/op/ctc_loss.hpp @@ -15,7 +15,6 @@ namespace v4 { class OPENVINO_API CTCLoss : public Op { public: OPENVINO_OP("CTCLoss", "opset4", op::Op, 4); - BWDCMP_RTTI_DECLARATION; CTCLoss() = default; /// \brief Constructs a CTCLoss operation diff --git a/src/core/include/openvino/op/cum_sum.hpp b/src/core/include/openvino/op/cum_sum.hpp index 976294e91f9..e3672853f7d 100644 --- a/src/core/include/openvino/op/cum_sum.hpp +++ b/src/core/include/openvino/op/cum_sum.hpp @@ -18,7 +18,6 @@ namespace v0 { class OPENVINO_API CumSum : public Op { public: OPENVINO_OP("CumSum", "opset3"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a cumulative summation operation. CumSum() = default; diff --git a/src/core/include/openvino/op/deformable_convolution.hpp b/src/core/include/openvino/op/deformable_convolution.hpp index 729fcc12cad..d4ad01629a3 100644 --- a/src/core/include/openvino/op/deformable_convolution.hpp +++ b/src/core/include/openvino/op/deformable_convolution.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API DeformableConvolution : public op::util::DeformableConvolutionBase { public: OPENVINO_OP("DeformableConvolution", "opset1", op::util::DeformableConvolutionBase, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a conversion operation. DeformableConvolution() = default; @@ -64,7 +63,6 @@ namespace v8 { class OPENVINO_API DeformableConvolution : public op::util::DeformableConvolutionBase { public: OPENVINO_OP("DeformableConvolution", "opset8", op::util::DeformableConvolutionBase); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a conversion operation. DeformableConvolution() = default; diff --git a/src/core/include/openvino/op/deformable_psroi_pooling.hpp b/src/core/include/openvino/op/deformable_psroi_pooling.hpp index 37569d3b0b6..82994e49812 100644 --- a/src/core/include/openvino/op/deformable_psroi_pooling.hpp +++ b/src/core/include/openvino/op/deformable_psroi_pooling.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API DeformablePSROIPooling : public Op { public: OPENVINO_OP("DeformablePSROIPooling", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; DeformablePSROIPooling() = default; /// \brief Constructs a DeformablePSROIPooling operation diff --git a/src/core/include/openvino/op/depth_to_space.hpp b/src/core/include/openvino/op/depth_to_space.hpp index f165fbff60f..32bf81dfa32 100644 --- a/src/core/include/openvino/op/depth_to_space.hpp +++ b/src/core/include/openvino/op/depth_to_space.hpp @@ -22,7 +22,6 @@ namespace v0 { class OPENVINO_API DepthToSpace : public Op { public: OPENVINO_OP("DepthToSpace", "opset1"); - BWDCMP_RTTI_DECLARATION; enum class DepthToSpaceMode { // The input depth is divided to [block_size, ..., block_size, new_depth] @@ -74,7 +73,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/detection_output.hpp b/src/core/include/openvino/op/detection_output.hpp index 16630212f10..f196641e171 100644 --- a/src/core/include/openvino/op/detection_output.hpp +++ b/src/core/include/openvino/op/detection_output.hpp @@ -19,7 +19,6 @@ public: }; OPENVINO_OP("DetectionOutput", "opset1", op::util::DetectionOutputBase); - BWDCMP_RTTI_DECLARATION; DetectionOutput() = default; /// \brief Constructs a DetectionOutput operation @@ -70,7 +69,6 @@ public: using Attributes = op::util::DetectionOutputBase::AttributesBase; OPENVINO_OP("DetectionOutput", "opset8", op::util::DetectionOutputBase); - BWDCMP_RTTI_DECLARATION; DetectionOutput() = default; /// \brief Constructs a DetectionOutput operation diff --git a/src/core/include/openvino/op/dft.hpp b/src/core/include/openvino/op/dft.hpp index 3c270833913..6072f711650 100644 --- a/src/core/include/openvino/op/dft.hpp +++ b/src/core/include/openvino/op/dft.hpp @@ -30,7 +30,6 @@ namespace v7 { class OPENVINO_API DFT : public util::FFTBase { public: OPENVINO_OP("DFT", "opset7", util::FFTBase, 7); - BWDCMP_RTTI_DECLARATION; DFT() = default; /// \brief Constructs a DFT operation. DFT is performed for full size axes. diff --git a/src/core/include/openvino/op/divide.hpp b/src/core/include/openvino/op/divide.hpp index f524b83e799..723f5658930 100644 --- a/src/core/include/openvino/op/divide.hpp +++ b/src/core/include/openvino/op/divide.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Divide : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Divide", "opset1", util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a division operation. Divide() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/einsum.hpp b/src/core/include/openvino/op/einsum.hpp index e028abea431..dc51bdb1dfd 100644 --- a/src/core/include/openvino/op/einsum.hpp +++ b/src/core/include/openvino/op/einsum.hpp @@ -14,7 +14,6 @@ namespace v7 { class OPENVINO_API Einsum : public Op { public: OPENVINO_OP("Einsum", "opset7", op::Op, 7); - BWDCMP_RTTI_DECLARATION; Einsum() = default; diff --git a/src/core/include/openvino/op/elu.hpp b/src/core/include/openvino/op/elu.hpp index 01c620ca6cf..978895f6903 100644 --- a/src/core/include/openvino/op/elu.hpp +++ b/src/core/include/openvino/op/elu.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Elu : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Elu", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; Elu() = default; /// \brief Constructs an Elu operation. diff --git a/src/core/include/openvino/op/embedding_segments_sum.hpp b/src/core/include/openvino/op/embedding_segments_sum.hpp index d021fb9cf55..3eb6f347e90 100644 --- a/src/core/include/openvino/op/embedding_segments_sum.hpp +++ b/src/core/include/openvino/op/embedding_segments_sum.hpp @@ -15,7 +15,6 @@ namespace v3 { class OPENVINO_API EmbeddingSegmentsSum : public Op { public: OPENVINO_OP("EmbeddingSegmentsSum", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a EmbeddingSegmentsSum operation. EmbeddingSegmentsSum() = default; /// \brief Constructs a EmbeddingSegmentsSum operation. diff --git a/src/core/include/openvino/op/embeddingbag_offsets_sum.hpp b/src/core/include/openvino/op/embeddingbag_offsets_sum.hpp index 6cb37b0157a..cae66d38dbf 100644 --- a/src/core/include/openvino/op/embeddingbag_offsets_sum.hpp +++ b/src/core/include/openvino/op/embeddingbag_offsets_sum.hpp @@ -16,7 +16,6 @@ namespace v3 { class OPENVINO_API EmbeddingBagOffsetsSum : public util::EmbeddingBagOffsetsBase { public: OPENVINO_OP("EmbeddingBagOffsetsSum", "opset3", util::EmbeddingBagOffsetsBase, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a EmbeddingBagOffsetsSum operation. EmbeddingBagOffsetsSum() = default; /// \brief Constructs a EmbeddingBagOffsetsSum operation. diff --git a/src/core/include/openvino/op/embeddingbag_packedsum.hpp b/src/core/include/openvino/op/embeddingbag_packedsum.hpp index b9f4654a15b..92d15064330 100644 --- a/src/core/include/openvino/op/embeddingbag_packedsum.hpp +++ b/src/core/include/openvino/op/embeddingbag_packedsum.hpp @@ -16,7 +16,6 @@ namespace v3 { class OPENVINO_API EmbeddingBagPackedSum : public util::EmbeddingBagPackedBase { public: OPENVINO_OP("EmbeddingBagPackedSum", "opset3", util::EmbeddingBagPackedBase, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a EmbeddingBagPackedSum operation. EmbeddingBagPackedSum() = default; /// \brief Constructs a EmbeddingBagPackedSum operation. diff --git a/src/core/include/openvino/op/equal.hpp b/src/core/include/openvino/op/equal.hpp index fa001480aa5..f2007046c09 100644 --- a/src/core/include/openvino/op/equal.hpp +++ b/src/core/include/openvino/op/equal.hpp @@ -30,7 +30,6 @@ namespace v1 { class OPENVINO_API Equal : public util::BinaryElementwiseComparison { public: OPENVINO_OP("Equal", "opset1", op::util::BinaryElementwiseComparison, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an equal operation. Equal() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} /// \brief Constructs an equal operation. diff --git a/src/core/include/openvino/op/erf.hpp b/src/core/include/openvino/op/erf.hpp index 637566c7f8e..72b88274987 100644 --- a/src/core/include/openvino/op/erf.hpp +++ b/src/core/include/openvino/op/erf.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Erf : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Erf", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a floor operation. Erf() = default; /// \brief Constructs a floor operation. diff --git a/src/core/include/openvino/op/exp.hpp b/src/core/include/openvino/op/exp.hpp index 312909f12d5..d99707f0357 100644 --- a/src/core/include/openvino/op/exp.hpp +++ b/src/core/include/openvino/op/exp.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Exp : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Exp", "opset1", UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an exponential operation. Exp() = default; diff --git a/src/core/include/openvino/op/experimental_detectron_detection_output.hpp b/src/core/include/openvino/op/experimental_detectron_detection_output.hpp index e940db9c3ba..b7c8fa38eb0 100644 --- a/src/core/include/openvino/op/experimental_detectron_detection_output.hpp +++ b/src/core/include/openvino/op/experimental_detectron_detection_output.hpp @@ -21,7 +21,6 @@ namespace v6 { class OPENVINO_API ExperimentalDetectronDetectionOutput : public Op { public: OPENVINO_OP("ExperimentalDetectronDetectionOutput", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; /// \brief Structure that specifies attributes of the operation struct Attributes { diff --git a/src/core/include/openvino/op/experimental_detectron_generate_proposals.hpp b/src/core/include/openvino/op/experimental_detectron_generate_proposals.hpp index e547d1145df..e17ea93db2a 100644 --- a/src/core/include/openvino/op/experimental_detectron_generate_proposals.hpp +++ b/src/core/include/openvino/op/experimental_detectron_generate_proposals.hpp @@ -20,7 +20,6 @@ namespace v6 { class OPENVINO_API ExperimentalDetectronGenerateProposalsSingleImage : public Op { public: OPENVINO_OP("ExperimentalDetectronGenerateProposalsSingleImage", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; /// \brief Structure that specifies attributes of the operation struct Attributes { diff --git a/src/core/include/openvino/op/experimental_detectron_prior_grid_generator.hpp b/src/core/include/openvino/op/experimental_detectron_prior_grid_generator.hpp index 06d5c8dd5f5..34cc3fa03f5 100644 --- a/src/core/include/openvino/op/experimental_detectron_prior_grid_generator.hpp +++ b/src/core/include/openvino/op/experimental_detectron_prior_grid_generator.hpp @@ -20,7 +20,6 @@ namespace v6 { class OPENVINO_API ExperimentalDetectronPriorGridGenerator : public Op { public: OPENVINO_OP("ExperimentalDetectronPriorGridGenerator", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; /// \brief Structure that specifies attributes of the operation struct Attributes { diff --git a/src/core/include/openvino/op/experimental_detectron_roi_feature.hpp b/src/core/include/openvino/op/experimental_detectron_roi_feature.hpp index 7c654e4d9b9..d472d819454 100644 --- a/src/core/include/openvino/op/experimental_detectron_roi_feature.hpp +++ b/src/core/include/openvino/op/experimental_detectron_roi_feature.hpp @@ -21,7 +21,6 @@ namespace v6 { class OPENVINO_API ExperimentalDetectronROIFeatureExtractor : public Op { public: OPENVINO_OP("ExperimentalDetectronROIFeatureExtractor", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; /// \brief Structure that specifies attributes of the operation struct Attributes { diff --git a/src/core/include/openvino/op/experimental_detectron_topkrois.hpp b/src/core/include/openvino/op/experimental_detectron_topkrois.hpp index 741eab4ee41..dc31fa7193a 100644 --- a/src/core/include/openvino/op/experimental_detectron_topkrois.hpp +++ b/src/core/include/openvino/op/experimental_detectron_topkrois.hpp @@ -20,7 +20,6 @@ namespace v6 { class OPENVINO_API ExperimentalDetectronTopKROIs : public Op { public: OPENVINO_OP("ExperimentalDetectronTopKROIs", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; ExperimentalDetectronTopKROIs() = default; /// \brief Constructs a ExperimentalDetectronTopKROIs operation. diff --git a/src/core/include/openvino/op/extractimagepatches.hpp b/src/core/include/openvino/op/extractimagepatches.hpp index 537c09e923e..5819c8282b4 100644 --- a/src/core/include/openvino/op/extractimagepatches.hpp +++ b/src/core/include/openvino/op/extractimagepatches.hpp @@ -15,7 +15,6 @@ namespace v3 { class OPENVINO_API ExtractImagePatches : public Op { public: OPENVINO_OP("ExtractImagePatches", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; ExtractImagePatches() = default; /// \brief Constructs a ExtractImagePatches operation diff --git a/src/core/include/openvino/op/fake_quantize.hpp b/src/core/include/openvino/op/fake_quantize.hpp index cfd9581898f..45f4f9f487b 100644 --- a/src/core/include/openvino/op/fake_quantize.hpp +++ b/src/core/include/openvino/op/fake_quantize.hpp @@ -27,7 +27,6 @@ namespace v0 { class OPENVINO_API FakeQuantize : public Op { public: OPENVINO_OP("FakeQuantize", "opset1"); - BWDCMP_RTTI_DECLARATION; FakeQuantize(); /// diff --git a/src/core/include/openvino/op/floor.hpp b/src/core/include/openvino/op/floor.hpp index 3e42b9ff6b3..e389e5fb307 100644 --- a/src/core/include/openvino/op/floor.hpp +++ b/src/core/include/openvino/op/floor.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Floor : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Floor", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a floor operation. Floor() = default; /// \brief Constructs a floor operation. diff --git a/src/core/include/openvino/op/floor_mod.hpp b/src/core/include/openvino/op/floor_mod.hpp index 44350986896..295b89584b8 100644 --- a/src/core/include/openvino/op/floor_mod.hpp +++ b/src/core/include/openvino/op/floor_mod.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API FloorMod : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("FloorMod", "opset1", op::util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an uninitialized addition operation FloorMod() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/gather.hpp b/src/core/include/openvino/op/gather.hpp index 376e1112cb7..70792fb51b0 100644 --- a/src/core/include/openvino/op/gather.hpp +++ b/src/core/include/openvino/op/gather.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Gather : public op::util::GatherBase { public: OPENVINO_OP("Gather", "opset1", op::util::GatherBase, 1); - BWDCMP_RTTI_DECLARATION; static constexpr int64_t AXIS_NOT_SET_VALUE = std::numeric_limits::max(); Gather() = default; /// \param data The tensor from which slices are gathered @@ -35,7 +34,6 @@ namespace v7 { class OPENVINO_API Gather : public op::util::GatherBase { public: OPENVINO_OP("Gather", "opset7", op::util::GatherBase, 7); - BWDCMP_RTTI_DECLARATION; Gather() = default; /// \param data The tensor from which slices are gathered @@ -63,7 +61,6 @@ namespace v8 { class OPENVINO_API Gather : public op::util::GatherBase { public: OPENVINO_OP("Gather", "opset8", op::util::GatherBase); - BWDCMP_RTTI_DECLARATION; Gather() = default; /// \param data The tensor from which slices are gathered diff --git a/src/core/include/openvino/op/gather_elements.hpp b/src/core/include/openvino/op/gather_elements.hpp index fa0e8c67538..f4d6c5d63b5 100644 --- a/src/core/include/openvino/op/gather_elements.hpp +++ b/src/core/include/openvino/op/gather_elements.hpp @@ -15,7 +15,6 @@ namespace v6 { class OPENVINO_API GatherElements : public Op { public: OPENVINO_OP("GatherElements", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; GatherElements() = default; /// \brief Constructs a GatherElements operation. diff --git a/src/core/include/openvino/op/gather_nd.hpp b/src/core/include/openvino/op/gather_nd.hpp index 451ae230699..d904dffda9e 100644 --- a/src/core/include/openvino/op/gather_nd.hpp +++ b/src/core/include/openvino/op/gather_nd.hpp @@ -14,7 +14,6 @@ namespace v5 { class OPENVINO_API GatherND : public op::util::GatherNDBase { public: OPENVINO_OP("GatherND", "opset5", op::util::GatherNDBase, 5); - BWDCMP_RTTI_DECLARATION; GatherND() = default; /// \brief Constructs a GatherND operation. @@ -37,7 +36,6 @@ namespace v8 { class OPENVINO_API GatherND : public op::util::GatherNDBase { public: OPENVINO_OP("GatherND", "opset8", op::util::GatherNDBase); - BWDCMP_RTTI_DECLARATION; GatherND() = default; /// \brief Constructs a GatherND operation. diff --git a/src/core/include/openvino/op/gather_tree.hpp b/src/core/include/openvino/op/gather_tree.hpp index 39719673bb8..e5bf0ff3f33 100644 --- a/src/core/include/openvino/op/gather_tree.hpp +++ b/src/core/include/openvino/op/gather_tree.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API GatherTree : public Op { public: OPENVINO_OP("GatherTree", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; GatherTree() = default; /// \param step_ids Tensor of shape [MAX_TIME, BATCH_SIZE, BEAM_WIDTH] with diff --git a/src/core/include/openvino/op/gelu.hpp b/src/core/include/openvino/op/gelu.hpp index 94b18c8136c..018d32e6e8a 100644 --- a/src/core/include/openvino/op/gelu.hpp +++ b/src/core/include/openvino/op/gelu.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API Gelu : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Gelu", "opset2", util::UnaryElementwiseArithmetic, 0); - BWDCMP_RTTI_DECLARATION; Gelu(); /// \brief Constructs a Gelu operation. @@ -45,7 +44,6 @@ namespace v7 { class OPENVINO_API Gelu : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Gelu", "opset7", util::UnaryElementwiseArithmetic, 7); - BWDCMP_RTTI_DECLARATION; Gelu() = default; /// \brief Constructs a Gelu operation. @@ -83,6 +81,5 @@ public: AttributeAdapter(op::GeluApproximationMode& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/greater.hpp b/src/core/include/openvino/op/greater.hpp index f524d4d20b3..73cf630c6c2 100644 --- a/src/core/include/openvino/op/greater.hpp +++ b/src/core/include/openvino/op/greater.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Greater : public util::BinaryElementwiseComparison { public: OPENVINO_OP("Greater", "opset1", op::util::BinaryElementwiseComparison, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a greater-than operation. Greater() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} /// \brief Constructs a greater-than operation. diff --git a/src/core/include/openvino/op/greater_eq.hpp b/src/core/include/openvino/op/greater_eq.hpp index 67cb7ab0989..4d6b358b360 100644 --- a/src/core/include/openvino/op/greater_eq.hpp +++ b/src/core/include/openvino/op/greater_eq.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API GreaterEqual : public util::BinaryElementwiseComparison { public: OPENVINO_OP("GreaterEqual", "opset1", op::util::BinaryElementwiseComparison, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a greater-than-or-equal operation. GreaterEqual() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} /// \brief Constructs a greater-than-or-equal operation. diff --git a/src/core/include/openvino/op/grn.hpp b/src/core/include/openvino/op/grn.hpp index 8ec9f832f54..8900f0218dc 100644 --- a/src/core/include/openvino/op/grn.hpp +++ b/src/core/include/openvino/op/grn.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API GRN : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("GRN", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; GRN() = default; /// \brief Constructs a GRN operation. diff --git a/src/core/include/openvino/op/group_conv.hpp b/src/core/include/openvino/op/group_conv.hpp index de8accf02d9..ed3995adffb 100644 --- a/src/core/include/openvino/op/group_conv.hpp +++ b/src/core/include/openvino/op/group_conv.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API GroupConvolution : public Op { public: OPENVINO_OP("GroupConvolution", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a batched convolution operation. GroupConvolution() = default; @@ -132,7 +131,6 @@ private: class OPENVINO_API GroupConvolutionBackpropData : public Op { public: OPENVINO_OP("GroupConvolutionBackpropData", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a batched-convolution data batch-backprop operation. GroupConvolutionBackpropData(); diff --git a/src/core/include/openvino/op/gru_cell.hpp b/src/core/include/openvino/op/gru_cell.hpp index 1e71e046006..d720c5b8cb4 100644 --- a/src/core/include/openvino/op/gru_cell.hpp +++ b/src/core/include/openvino/op/gru_cell.hpp @@ -25,7 +25,6 @@ namespace v3 { class OPENVINO_API GRUCell : public util::RNNCellBase { public: OPENVINO_OP("GRUCell", "opset3", op::util::RNNCellBase, 3); - BWDCMP_RTTI_DECLARATION; GRUCell(); /// /// \brief Constructs GRUCell node. diff --git a/src/core/include/openvino/op/gru_sequence.hpp b/src/core/include/openvino/op/gru_sequence.hpp index 5211ff46cee..2501de80ddc 100644 --- a/src/core/include/openvino/op/gru_sequence.hpp +++ b/src/core/include/openvino/op/gru_sequence.hpp @@ -20,7 +20,6 @@ namespace v5 { class OPENVINO_API GRUSequence : public util::RNNCellBase { public: OPENVINO_OP("GRUSequence", "opset5", op::Op, 5); - BWDCMP_RTTI_DECLARATION; GRUSequence(); GRUSequence(const Output& X, diff --git a/src/core/include/openvino/op/hard_sigmoid.hpp b/src/core/include/openvino/op/hard_sigmoid.hpp index 5608c2773b0..bd810a68092 100644 --- a/src/core/include/openvino/op/hard_sigmoid.hpp +++ b/src/core/include/openvino/op/hard_sigmoid.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API HardSigmoid : public Op { public: OPENVINO_OP("HardSigmoid", "opset1"); - BWDCMP_RTTI_DECLARATION; HardSigmoid(); diff --git a/src/core/include/openvino/op/hsigmoid.hpp b/src/core/include/openvino/op/hsigmoid.hpp index ee977433835..d99be281c98 100644 --- a/src/core/include/openvino/op/hsigmoid.hpp +++ b/src/core/include/openvino/op/hsigmoid.hpp @@ -18,7 +18,6 @@ namespace v5 { class OPENVINO_API HSigmoid : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("HSigmoid", "opset5", op::util::UnaryElementwiseArithmetic, 5); - BWDCMP_RTTI_DECLARATION; HSigmoid() = default; /// \brief Constructs a HSigmoid operation. diff --git a/src/core/include/openvino/op/hswish.hpp b/src/core/include/openvino/op/hswish.hpp index a77e3d136d7..dff5552f77b 100644 --- a/src/core/include/openvino/op/hswish.hpp +++ b/src/core/include/openvino/op/hswish.hpp @@ -18,7 +18,6 @@ namespace v4 { class OPENVINO_API HSwish : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("HSwish", "opset4", op::util::UnaryElementwiseArithmetic, 4); - BWDCMP_RTTI_DECLARATION; HSwish() = default; /// \brief Constructs a HSwish (hard version of Swish) operation. diff --git a/src/core/include/openvino/op/i420_to_bgr.hpp b/src/core/include/openvino/op/i420_to_bgr.hpp index fc8e1efaad2..0b17345b711 100644 --- a/src/core/include/openvino/op/i420_to_bgr.hpp +++ b/src/core/include/openvino/op/i420_to_bgr.hpp @@ -35,8 +35,6 @@ class OPENVINO_API I420toBGR : public util::ConvertColorI420Base { public: OPENVINO_OP("I420toBGR", "opset8", util::ConvertColorI420Base); - BWDCMP_RTTI_DECLARATION; - I420toBGR() = default; /// \brief Constructs a conversion operation from input image in I420 format diff --git a/src/core/include/openvino/op/i420_to_rgb.hpp b/src/core/include/openvino/op/i420_to_rgb.hpp index 32dbc9b00c0..ba10a349714 100644 --- a/src/core/include/openvino/op/i420_to_rgb.hpp +++ b/src/core/include/openvino/op/i420_to_rgb.hpp @@ -35,8 +35,6 @@ class OPENVINO_API I420toRGB : public util::ConvertColorI420Base { public: OPENVINO_OP("I420toRGB", "opset8", util::ConvertColorI420Base); - BWDCMP_RTTI_DECLARATION; - I420toRGB() = default; /// \brief Constructs a conversion operation from input image in I420 format diff --git a/src/core/include/openvino/op/idft.hpp b/src/core/include/openvino/op/idft.hpp index 4d1a04c5155..9642b7a4bf9 100644 --- a/src/core/include/openvino/op/idft.hpp +++ b/src/core/include/openvino/op/idft.hpp @@ -18,7 +18,6 @@ namespace v7 { class OPENVINO_API IDFT : public util::FFTBase { public: OPENVINO_OP("IDFT", "opset7", util::FFTBase, 7); - BWDCMP_RTTI_DECLARATION; IDFT() = default; /// \brief Constructs a IDFT operation. IDFT is performed for full size axes. diff --git a/src/core/include/openvino/op/if.hpp b/src/core/include/openvino/op/if.hpp index 0849caf85bf..4ad6d30630e 100644 --- a/src/core/include/openvino/op/if.hpp +++ b/src/core/include/openvino/op/if.hpp @@ -18,7 +18,6 @@ namespace v8 { class OPENVINO_API If : public util::MultiSubGraphOp { public: OPENVINO_OP("If", "opset8", util::MultiSubGraphOp); - BWDCMP_RTTI_DECLARATION; enum BodyIndexes { THEN_BODY_INDEX = 0, ELSE_BODY_INDEX = 1 }; diff --git a/src/core/include/openvino/op/interpolate.hpp b/src/core/include/openvino/op/interpolate.hpp index 748f0be0f93..6dc82485ed3 100644 --- a/src/core/include/openvino/op/interpolate.hpp +++ b/src/core/include/openvino/op/interpolate.hpp @@ -21,7 +21,6 @@ namespace v0 { class OPENVINO_API Interpolate : public Op { public: OPENVINO_OP("Interpolate", "opset1"); - BWDCMP_RTTI_DECLARATION; /// \brief Structure that specifies attributes for interpolation struct Attributes { // specify dimension indices where interpolation is applied, and `axes` is any @@ -84,7 +83,6 @@ namespace v4 { class OPENVINO_API Interpolate : public Op { public: OPENVINO_OP("Interpolate", "opset4", op::Op, 4); - BWDCMP_RTTI_DECLARATION; /// \brief PartialShape calculation mode /// @@ -350,7 +348,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> class OPENVINO_API AttributeAdapter @@ -360,7 +357,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -371,7 +367,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -382,7 +377,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -393,6 +387,5 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/irdft.hpp b/src/core/include/openvino/op/irdft.hpp index 348b00e5219..bfcf23b7cf1 100644 --- a/src/core/include/openvino/op/irdft.hpp +++ b/src/core/include/openvino/op/irdft.hpp @@ -14,7 +14,6 @@ namespace v9 { class OPENVINO_API IRDFT : public util::FFTBase { public: OPENVINO_OP("IRDFT", "opset9", util::FFTBase); - BWDCMP_RTTI_DECLARATION; IRDFT() = default; /// \brief Constructs a IRDFT operation. IRDFT is performed for full size axes. diff --git a/src/core/include/openvino/op/less.hpp b/src/core/include/openvino/op/less.hpp index 6e3f48b23cf..3e6f9089e71 100644 --- a/src/core/include/openvino/op/less.hpp +++ b/src/core/include/openvino/op/less.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Less : public util::BinaryElementwiseComparison { public: OPENVINO_OP("Less", "opset1", op::util::BinaryElementwiseComparison, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a less-than operation. Less() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} /// \brief Constructs a less-than operation. diff --git a/src/core/include/openvino/op/less_eq.hpp b/src/core/include/openvino/op/less_eq.hpp index 043dba98e71..bb63496a718 100644 --- a/src/core/include/openvino/op/less_eq.hpp +++ b/src/core/include/openvino/op/less_eq.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API LessEqual : public util::BinaryElementwiseComparison { public: OPENVINO_OP("LessEqual", "opset1", op::util::BinaryElementwiseComparison, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a less-than-or-equal operation. LessEqual() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/log.hpp b/src/core/include/openvino/op/log.hpp index 680b480da72..7bcea114c16 100644 --- a/src/core/include/openvino/op/log.hpp +++ b/src/core/include/openvino/op/log.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Log : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Log", "opset1", op::util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a natural log operation. Log() = default; /// \brief Constructs a natural log operation. diff --git a/src/core/include/openvino/op/log_softmax.hpp b/src/core/include/openvino/op/log_softmax.hpp index a8ca66da78f..df5b4c7cb3a 100644 --- a/src/core/include/openvino/op/log_softmax.hpp +++ b/src/core/include/openvino/op/log_softmax.hpp @@ -15,7 +15,6 @@ namespace v5 { class OPENVINO_API LogSoftmax : public Op { public: OPENVINO_OP("LogSoftmax", "opset5", op::Op, 5); - BWDCMP_RTTI_DECLARATION; LogSoftmax() = default; /// \brief Constructs a LogSoftmax operation. /// diff --git a/src/core/include/openvino/op/logical_and.hpp b/src/core/include/openvino/op/logical_and.hpp index 0d20f2f9b0f..091b9e50c20 100644 --- a/src/core/include/openvino/op/logical_and.hpp +++ b/src/core/include/openvino/op/logical_and.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API LogicalAnd : public util::BinaryElementwiseLogical { public: OPENVINO_OP("LogicalAnd", "opset1", util::BinaryElementwiseLogical, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a logical-and operation. LogicalAnd() = default; diff --git a/src/core/include/openvino/op/logical_not.hpp b/src/core/include/openvino/op/logical_not.hpp index 533cc7fc921..a4c358867d6 100644 --- a/src/core/include/openvino/op/logical_not.hpp +++ b/src/core/include/openvino/op/logical_not.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API LogicalNot : public Op { public: OPENVINO_OP("LogicalNot", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a logical negation operation. LogicalNot() = default; /// \brief Constructs a logical negation operation. diff --git a/src/core/include/openvino/op/logical_or.hpp b/src/core/include/openvino/op/logical_or.hpp index 7dd79945433..95639b06031 100644 --- a/src/core/include/openvino/op/logical_or.hpp +++ b/src/core/include/openvino/op/logical_or.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API LogicalOr : public util::BinaryElementwiseLogical { public: OPENVINO_OP("LogicalOr", "opset1", util::BinaryElementwiseLogical, 1); - BWDCMP_RTTI_DECLARATION; LogicalOr() = default; /// \brief Constructs a logical-or operation. /// diff --git a/src/core/include/openvino/op/logical_xor.hpp b/src/core/include/openvino/op/logical_xor.hpp index 1b35dc0c24c..709e4c82ea5 100644 --- a/src/core/include/openvino/op/logical_xor.hpp +++ b/src/core/include/openvino/op/logical_xor.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API LogicalXor : public util::BinaryElementwiseLogical { public: OPENVINO_OP("LogicalXor", "opset2", util::BinaryElementwiseLogical, 1); - BWDCMP_RTTI_DECLARATION; LogicalXor() = default; /// \brief Constructs a logical-xor operation. /// diff --git a/src/core/include/openvino/op/loop.hpp b/src/core/include/openvino/op/loop.hpp index e5674531b1e..4094b7c4390 100644 --- a/src/core/include/openvino/op/loop.hpp +++ b/src/core/include/openvino/op/loop.hpp @@ -32,7 +32,6 @@ public: }; OPENVINO_OP("Loop", "opset5", op::util::SubGraphOp, 5); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a Loop operation. Loop() = default; @@ -86,7 +85,6 @@ public: : DirectValueAccessor(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/lrn.hpp b/src/core/include/openvino/op/lrn.hpp index a74e864b3e0..30eab3ece8f 100644 --- a/src/core/include/openvino/op/lrn.hpp +++ b/src/core/include/openvino/op/lrn.hpp @@ -28,7 +28,6 @@ namespace v0 { class OPENVINO_API LRN : public Op { public: OPENVINO_OP("LRN", "opset1"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a LRN operation. LRN() = default; diff --git a/src/core/include/openvino/op/lstm_cell.hpp b/src/core/include/openvino/op/lstm_cell.hpp index 3e073ea291b..4868fd20ce2 100644 --- a/src/core/include/openvino/op/lstm_cell.hpp +++ b/src/core/include/openvino/op/lstm_cell.hpp @@ -56,7 +56,6 @@ namespace v0 { class OPENVINO_API LSTMCell : public util::RNNCellBase { public: OPENVINO_OP("LSTMCell", "opset1", op::util::RNNCellBase); - BWDCMP_RTTI_DECLARATION; LSTMCell(); /// @@ -280,7 +279,6 @@ namespace v4 { class OPENVINO_API LSTMCell : public util::RNNCellBase { public: OPENVINO_OP("LSTMCell", "opset4", op::util::RNNCellBase, 4); - BWDCMP_RTTI_DECLARATION; LSTMCell(); /// @@ -399,7 +397,6 @@ public: AttributeAdapter(op::LSTMWeightsFormat& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/lstm_sequence.hpp b/src/core/include/openvino/op/lstm_sequence.hpp index c275f8b626c..04051621adf 100644 --- a/src/core/include/openvino/op/lstm_sequence.hpp +++ b/src/core/include/openvino/op/lstm_sequence.hpp @@ -32,7 +32,6 @@ namespace v0 { class OPENVINO_API LSTMSequence : public Op { public: OPENVINO_OP("LSTMSequence", "opset1"); - BWDCMP_RTTI_DECLARATION; LSTMSequence(); using direction = RecurrentSequenceDirection; @@ -129,7 +128,6 @@ namespace v5 { class OPENVINO_API LSTMSequence : public util::RNNCellBase { public: OPENVINO_OP("LSTMSequence", "opset5", util::RNNCellBase, 5); - BWDCMP_RTTI_DECLARATION; LSTMSequence() = default; using direction = RecurrentSequenceDirection; diff --git a/src/core/include/openvino/op/matmul.hpp b/src/core/include/openvino/op/matmul.hpp index abbba946d41..c19cd232ead 100644 --- a/src/core/include/openvino/op/matmul.hpp +++ b/src/core/include/openvino/op/matmul.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API MatMul : public Op { public: OPENVINO_OP("MatMul", "opset1"); - BWDCMP_RTTI_DECLARATION; MatMul() = default; /// \brief Constructs an Matrix Multiplication operation. /// diff --git a/src/core/include/openvino/op/matrix_nms.hpp b/src/core/include/openvino/op/matrix_nms.hpp index 961c0ffd599..640544108a3 100644 --- a/src/core/include/openvino/op/matrix_nms.hpp +++ b/src/core/include/openvino/op/matrix_nms.hpp @@ -15,7 +15,6 @@ namespace v8 { class OPENVINO_API MatrixNms : public Op { public: OPENVINO_OP("MatrixNms", "opset8"); - BWDCMP_RTTI_DECLARATION; enum class DecayFunction { GAUSSIAN, LINEAR }; @@ -124,7 +123,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; OPENVINO_API @@ -138,7 +136,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/max_pool.hpp b/src/core/include/openvino/op/max_pool.hpp index 5591a8f68eb..3a1c8f306f3 100644 --- a/src/core/include/openvino/op/max_pool.hpp +++ b/src/core/include/openvino/op/max_pool.hpp @@ -16,7 +16,6 @@ namespace v1 { class OPENVINO_API MaxPool : public op::util::MaxPoolBase { public: OPENVINO_OP("MaxPool", "opset1", op::util::MaxPoolBase, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a batched max pooling operation. MaxPool() = default; @@ -65,7 +64,6 @@ namespace v8 { class OPENVINO_API MaxPool : public op::util::MaxPoolBase { public: OPENVINO_OP("MaxPool", "opset8", op::util::MaxPoolBase); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an empty MaxPool operation. MaxPool() = default; diff --git a/src/core/include/openvino/op/maximum.hpp b/src/core/include/openvino/op/maximum.hpp index 9bdcbe4fa5c..e22298362b2 100644 --- a/src/core/include/openvino/op/maximum.hpp +++ b/src/core/include/openvino/op/maximum.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Maximum : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Maximum", "opset1", op::util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a maximum operation. Maximum() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/minimum.hpp b/src/core/include/openvino/op/minimum.hpp index 65536194eaf..daa2315b936 100644 --- a/src/core/include/openvino/op/minimum.hpp +++ b/src/core/include/openvino/op/minimum.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Minimum : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Minimum", "opset1", op::util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a minimum operation. Minimum() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/mish.hpp b/src/core/include/openvino/op/mish.hpp index 0bb45f822a8..566b01534ad 100644 --- a/src/core/include/openvino/op/mish.hpp +++ b/src/core/include/openvino/op/mish.hpp @@ -16,7 +16,6 @@ namespace v4 { class OPENVINO_API Mish : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Mish", "opset4", util::UnaryElementwiseArithmetic, 4); - BWDCMP_RTTI_DECLARATION; Mish() = default; /// \brief Constructs an Mish operation. diff --git a/src/core/include/openvino/op/mod.hpp b/src/core/include/openvino/op/mod.hpp index 9f8c8748fa2..e2cc3ee71a6 100644 --- a/src/core/include/openvino/op/mod.hpp +++ b/src/core/include/openvino/op/mod.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API Mod : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Mod", "opset1", op::util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a Mod node. Mod() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/multiclass_nms.hpp b/src/core/include/openvino/op/multiclass_nms.hpp index 7fcad39e26f..c0a9a77f5a7 100644 --- a/src/core/include/openvino/op/multiclass_nms.hpp +++ b/src/core/include/openvino/op/multiclass_nms.hpp @@ -14,7 +14,6 @@ namespace v8 { class OPENVINO_API MulticlassNms : public util::MulticlassNmsBase { public: OPENVINO_OP("MulticlassNms", "opset8", op::util::MulticlassNmsBase); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a conversion operation. MulticlassNms() = default; @@ -38,7 +37,6 @@ namespace v9 { class OPENVINO_API MulticlassNms : public util::MulticlassNmsBase { public: OPENVINO_OP("MulticlassNms", "opset9", op::util::MulticlassNmsBase); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a conversion operation. MulticlassNms() = default; diff --git a/src/core/include/openvino/op/multiply.hpp b/src/core/include/openvino/op/multiply.hpp index 592661cfe38..344882f2724 100644 --- a/src/core/include/openvino/op/multiply.hpp +++ b/src/core/include/openvino/op/multiply.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Multiply : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Multiply", "opset1", util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a multiplication operation. Multiply() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/mvn.hpp b/src/core/include/openvino/op/mvn.hpp index 8c8a932a610..4b7da9e2e59 100644 --- a/src/core/include/openvino/op/mvn.hpp +++ b/src/core/include/openvino/op/mvn.hpp @@ -18,7 +18,6 @@ namespace v0 { class OPENVINO_API MVN : public Op { public: OPENVINO_OP("MVN", "opset2"); - BWDCMP_RTTI_DECLARATION; MVN() = default; /// \brief Constructs an MVN operation. @@ -101,7 +100,6 @@ namespace v6 { class OPENVINO_API MVN : public Op { public: OPENVINO_OP("MVN", "opset6", op::Op, 6); - BWDCMP_RTTI_DECLARATION; MVN() = default; /// \brief Constructs an MVN operation. @@ -162,7 +160,6 @@ public: AttributeAdapter(op::MVNEpsMode& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/negative.hpp b/src/core/include/openvino/op/negative.hpp index d083cf1ffe0..644c74633d3 100644 --- a/src/core/include/openvino/op/negative.hpp +++ b/src/core/include/openvino/op/negative.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Negative : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Negative", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a negative operation. Negative() = default; /// \brief Constructs a negative operation. diff --git a/src/core/include/openvino/op/non_max_suppression.hpp b/src/core/include/openvino/op/non_max_suppression.hpp index be1abbdddce..ee54d4db9fa 100644 --- a/src/core/include/openvino/op/non_max_suppression.hpp +++ b/src/core/include/openvino/op/non_max_suppression.hpp @@ -17,7 +17,6 @@ public: enum class BoxEncodingType { CORNER, CENTER }; OPENVINO_OP("NonMaxSuppression", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; NonMaxSuppression() = default; @@ -88,7 +87,6 @@ public: enum class BoxEncodingType { CORNER, CENTER }; OPENVINO_OP("NonMaxSuppression", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; NonMaxSuppression() = default; /// \brief Constructs a NonMaxSuppression operation. @@ -169,7 +167,6 @@ namespace v4 { class OPENVINO_API NonMaxSuppression : public op::v3::NonMaxSuppression { public: OPENVINO_OP("NonMaxSuppression", "opset4", op::v3::NonMaxSuppression, 4); - BWDCMP_RTTI_DECLARATION; NonMaxSuppression() = default; /// \brief Constructs a NonMaxSuppression operation. @@ -221,7 +218,6 @@ namespace v5 { class OPENVINO_API NonMaxSuppression : public Op { public: OPENVINO_OP("NonMaxSuppression", "opset5", op::Op, 5); - BWDCMP_RTTI_DECLARATION; enum class BoxEncodingType { CORNER, CENTER }; NonMaxSuppression() = default; @@ -370,7 +366,6 @@ namespace v9 { class OPENVINO_API NonMaxSuppression : public Op { public: OPENVINO_OP("NonMaxSuppression", "opset9", op::Op, 9); - BWDCMP_RTTI_DECLARATION; enum class BoxEncodingType { CORNER, CENTER }; NonMaxSuppression() = default; @@ -536,7 +531,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -547,7 +541,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -558,7 +551,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -569,7 +561,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/non_zero.hpp b/src/core/include/openvino/op/non_zero.hpp index a7850a129ab..91c17ed934d 100644 --- a/src/core/include/openvino/op/non_zero.hpp +++ b/src/core/include/openvino/op/non_zero.hpp @@ -21,7 +21,6 @@ namespace v3 { class OPENVINO_API NonZero : public Op { public: OPENVINO_OP("NonZero", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a NonZero operation. NonZero() = default; /// \brief Constructs a NonZero operation. diff --git a/src/core/include/openvino/op/normalize_l2.hpp b/src/core/include/openvino/op/normalize_l2.hpp index 9623a3dfdab..2e05fd39c30 100644 --- a/src/core/include/openvino/op/normalize_l2.hpp +++ b/src/core/include/openvino/op/normalize_l2.hpp @@ -18,7 +18,6 @@ namespace v0 { class OPENVINO_API NormalizeL2 : public Op { public: OPENVINO_OP("NormalizeL2", "opset1"); - BWDCMP_RTTI_DECLARATION; NormalizeL2() = default; /// diff --git a/src/core/include/openvino/op/not_equal.hpp b/src/core/include/openvino/op/not_equal.hpp index 859f604e5c1..611268ad9d0 100644 --- a/src/core/include/openvino/op/not_equal.hpp +++ b/src/core/include/openvino/op/not_equal.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API NotEqual : public util::BinaryElementwiseComparison { public: OPENVINO_OP("NotEqual", "opset1", op::util::BinaryElementwiseComparison, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a not-equal operation. NotEqual() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} /// \brief Constructs a not-equal operation. diff --git a/src/core/include/openvino/op/nv12_to_bgr.hpp b/src/core/include/openvino/op/nv12_to_bgr.hpp index 536c1869354..f43de8f4baa 100644 --- a/src/core/include/openvino/op/nv12_to_bgr.hpp +++ b/src/core/include/openvino/op/nv12_to_bgr.hpp @@ -34,8 +34,6 @@ class OPENVINO_API NV12toBGR : public util::ConvertColorNV12Base { public: OPENVINO_OP("NV12toBGR", "opset8", util::ConvertColorNV12Base); - BWDCMP_RTTI_DECLARATION; - NV12toBGR() = default; /// \brief Constructs a conversion operation from input image in NV12 format diff --git a/src/core/include/openvino/op/nv12_to_rgb.hpp b/src/core/include/openvino/op/nv12_to_rgb.hpp index c52892d3e20..0ebe9022d9a 100644 --- a/src/core/include/openvino/op/nv12_to_rgb.hpp +++ b/src/core/include/openvino/op/nv12_to_rgb.hpp @@ -34,8 +34,6 @@ class OPENVINO_API NV12toRGB : public util::ConvertColorNV12Base { public: OPENVINO_OP("NV12toRGB", "opset8", util::ConvertColorNV12Base); - BWDCMP_RTTI_DECLARATION; - NV12toRGB() = default; /// \brief Constructs a conversion operation from input image in NV12 format diff --git a/src/core/include/openvino/op/one_hot.hpp b/src/core/include/openvino/op/one_hot.hpp index 5acf4864abb..c896a7d52cb 100644 --- a/src/core/include/openvino/op/one_hot.hpp +++ b/src/core/include/openvino/op/one_hot.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API OneHot : public Op { public: OPENVINO_OP("OneHot", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a one-hot operation. OneHot() = default; diff --git a/src/core/include/openvino/op/pad.hpp b/src/core/include/openvino/op/pad.hpp index a66835c4317..8f321e6152a 100644 --- a/src/core/include/openvino/op/pad.hpp +++ b/src/core/include/openvino/op/pad.hpp @@ -16,7 +16,6 @@ namespace v1 { class OPENVINO_API Pad : public Op { public: OPENVINO_OP("Pad", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a generic padding operation. /// diff --git a/src/core/include/openvino/op/parameter.hpp b/src/core/include/openvino/op/parameter.hpp index 63207276b8d..a4de0dee6b1 100644 --- a/src/core/include/openvino/op/parameter.hpp +++ b/src/core/include/openvino/op/parameter.hpp @@ -19,7 +19,6 @@ namespace v0 { class OPENVINO_API Parameter : public op::Op { public: OPENVINO_OP("Parameter", "opset1"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructions a tensor-typed parameter node. Parameter() = default; /// \brief Constructions a tensor-typed parameter node. @@ -78,7 +77,6 @@ public: bool visit_attributes(AttributeVisitor& visitor) override; OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; protected: ParameterVector& m_ref; diff --git a/src/core/include/openvino/op/power.hpp b/src/core/include/openvino/op/power.hpp index 8bdac461a2c..aafbfaaab9b 100644 --- a/src/core/include/openvino/op/power.hpp +++ b/src/core/include/openvino/op/power.hpp @@ -29,7 +29,6 @@ namespace v1 { class OPENVINO_API Power : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Power", "opset1", op::util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; Power() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/prelu.hpp b/src/core/include/openvino/op/prelu.hpp index 10c5118a067..13a4e5a1eee 100644 --- a/src/core/include/openvino/op/prelu.hpp +++ b/src/core/include/openvino/op/prelu.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API PRelu : public Op { public: OPENVINO_OP("PRelu", "opset1"); - BWDCMP_RTTI_DECLARATION; PRelu(); /// \brief Constructs a PRelu operation. /// diff --git a/src/core/include/openvino/op/prior_box.hpp b/src/core/include/openvino/op/prior_box.hpp index fa897678c06..18566c428c9 100644 --- a/src/core/include/openvino/op/prior_box.hpp +++ b/src/core/include/openvino/op/prior_box.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API PriorBox : public Op { public: OPENVINO_OP("PriorBox", "opset1"); - BWDCMP_RTTI_DECLARATION; struct Attributes { // min_size Desired min_size of prior boxes // max_size Desired max_size of prior boxes @@ -75,7 +74,6 @@ namespace v8 { class OPENVINO_API PriorBox : public Op { public: OPENVINO_OP("PriorBox", "opset8"); - BWDCMP_RTTI_DECLARATION; struct Attributes { // min_size Desired min_size of prior boxes // max_size Desired max_size of prior boxes diff --git a/src/core/include/openvino/op/prior_box_clustered.hpp b/src/core/include/openvino/op/prior_box_clustered.hpp index 725a8ec6e4c..54ff8da327d 100644 --- a/src/core/include/openvino/op/prior_box_clustered.hpp +++ b/src/core/include/openvino/op/prior_box_clustered.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API PriorBoxClustered : public Op { public: OPENVINO_OP("PriorBoxClustered", "opset1"); - BWDCMP_RTTI_DECLARATION; struct Attributes { // widths Desired widths of prior boxes // heights Desired heights of prior boxes diff --git a/src/core/include/openvino/op/proposal.hpp b/src/core/include/openvino/op/proposal.hpp index a3a8326d703..cf24915dc17 100644 --- a/src/core/include/openvino/op/proposal.hpp +++ b/src/core/include/openvino/op/proposal.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API Proposal : public Op { public: OPENVINO_OP("Proposal", "opset1"); - BWDCMP_RTTI_DECLARATION; // base_size Anchor sizes // pre_nms_topn Number of boxes before nms // post_nms_topn Number of boxes after nms @@ -80,7 +79,6 @@ namespace v4 { class OPENVINO_API Proposal : public op::v0::Proposal { public: OPENVINO_OP("Proposal", "opset4", op::Op, 4); - BWDCMP_RTTI_DECLARATION; Proposal() = default; /// \brief Constructs a Proposal operation /// diff --git a/src/core/include/openvino/op/psroi_pooling.hpp b/src/core/include/openvino/op/psroi_pooling.hpp index 1ea8ca18263..932d14dbe1d 100644 --- a/src/core/include/openvino/op/psroi_pooling.hpp +++ b/src/core/include/openvino/op/psroi_pooling.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API PSROIPooling : public Op { public: OPENVINO_OP("PSROIPooling", "opset1"); - BWDCMP_RTTI_DECLARATION; PSROIPooling() = default; /// \brief Constructs a PSROIPooling operation diff --git a/src/core/include/openvino/op/random_uniform.hpp b/src/core/include/openvino/op/random_uniform.hpp index 4cbdea2d312..7d7f354a4a0 100644 --- a/src/core/include/openvino/op/random_uniform.hpp +++ b/src/core/include/openvino/op/random_uniform.hpp @@ -14,7 +14,6 @@ namespace v8 { class OPENVINO_API RandomUniform : public Op { public: OPENVINO_OP("RandomUniform", "opset8"); - BWDCMP_RTTI_DECLARATION; RandomUniform() = default; diff --git a/src/core/include/openvino/op/range.hpp b/src/core/include/openvino/op/range.hpp index c61d398d07e..aebdc129d26 100644 --- a/src/core/include/openvino/op/range.hpp +++ b/src/core/include/openvino/op/range.hpp @@ -14,7 +14,6 @@ namespace v4 { class OPENVINO_API Range : public Op { public: OPENVINO_OP("Range", "opset4", op::Op, 4); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an unitialized range operation. Range() = default; @@ -58,7 +57,6 @@ namespace v0 { class OPENVINO_API Range : public Op { public: OPENVINO_OP("Range", "opset1"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs an unitialized range operation. Range() = default; diff --git a/src/core/include/openvino/op/rdft.hpp b/src/core/include/openvino/op/rdft.hpp index 9c46edba2d7..cfd2e9aa1e6 100644 --- a/src/core/include/openvino/op/rdft.hpp +++ b/src/core/include/openvino/op/rdft.hpp @@ -14,7 +14,6 @@ namespace v9 { class OPENVINO_API RDFT : public util::FFTBase { public: OPENVINO_OP("RDFT", "opset9", util::FFTBase); - BWDCMP_RTTI_DECLARATION; RDFT() = default; /// \brief Constructs a RDFT operation. RDFT is performed for full size axes. diff --git a/src/core/include/openvino/op/read_value.hpp b/src/core/include/openvino/op/read_value.hpp index 8b2734402c0..0c3c4b3bb24 100644 --- a/src/core/include/openvino/op/read_value.hpp +++ b/src/core/include/openvino/op/read_value.hpp @@ -16,7 +16,6 @@ namespace v3 { class OPENVINO_API ReadValue : public util::ReadValueBase { public: OPENVINO_OP("ReadValue", "opset3", util::ReadValueBase, 3); - BWDCMP_RTTI_DECLARATION; ReadValue() = default; /// \brief Constructs a ReadValue operation. @@ -47,7 +46,6 @@ namespace v6 { class OPENVINO_API ReadValue : public util::ReadValueBase { public: OPENVINO_OP("ReadValue", "opset6", util::ReadValueBase, 6); - BWDCMP_RTTI_DECLARATION; ReadValue() = default; /// \brief Constructs a ReadValue operation. diff --git a/src/core/include/openvino/op/reduce_l1.hpp b/src/core/include/openvino/op/reduce_l1.hpp index 75fd5a42e73..febfec0e077 100644 --- a/src/core/include/openvino/op/reduce_l1.hpp +++ b/src/core/include/openvino/op/reduce_l1.hpp @@ -17,7 +17,6 @@ namespace v4 { class OPENVINO_API ReduceL1 : public util::ArithmeticReductionKeepDims { public: OPENVINO_OP("ReduceL1", "opset4", util::ArithmeticReductionKeepDims, 4); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a reducet L1-norm operation. ReduceL1() = default; /// \brief Constructs a reduce L1-norm operation. diff --git a/src/core/include/openvino/op/reduce_l2.hpp b/src/core/include/openvino/op/reduce_l2.hpp index fca0978730c..51da2ac5bea 100644 --- a/src/core/include/openvino/op/reduce_l2.hpp +++ b/src/core/include/openvino/op/reduce_l2.hpp @@ -16,7 +16,6 @@ namespace v4 { class OPENVINO_API ReduceL2 : public util::ArithmeticReductionKeepDims { public: OPENVINO_OP("ReduceL2", "opset4", util::ArithmeticReductionKeepDims, 4); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a reducet L2-norm operation. ReduceL2() = default; /// \brief Constructs a reduce L2-norm operation. diff --git a/src/core/include/openvino/op/reduce_logical_and.hpp b/src/core/include/openvino/op/reduce_logical_and.hpp index c8e43109091..20df49816fd 100644 --- a/src/core/include/openvino/op/reduce_logical_and.hpp +++ b/src/core/include/openvino/op/reduce_logical_and.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API ReduceLogicalAnd : public util::LogicalReductionKeepDims { public: OPENVINO_OP("ReduceLogicalAnd", "opset1", util::LogicalReductionKeepDims, 1); - BWDCMP_RTTI_DECLARATION; ReduceLogicalAnd() = default; /// \brief Constructs a ReduceLogicalAnd node. /// diff --git a/src/core/include/openvino/op/reduce_logical_or.hpp b/src/core/include/openvino/op/reduce_logical_or.hpp index d3eaac340fb..c2684774458 100644 --- a/src/core/include/openvino/op/reduce_logical_or.hpp +++ b/src/core/include/openvino/op/reduce_logical_or.hpp @@ -17,7 +17,6 @@ namespace v1 { class OPENVINO_API ReduceLogicalOr : public util::LogicalReductionKeepDims { public: OPENVINO_OP("ReduceLogicalOr", "opset1", util::LogicalReductionKeepDims, 1); - BWDCMP_RTTI_DECLARATION; ReduceLogicalOr() = default; /// \brief Constructs a ReduceLogicalOr node. /// diff --git a/src/core/include/openvino/op/reduce_max.hpp b/src/core/include/openvino/op/reduce_max.hpp index 433e1192077..e0fec2a17ea 100644 --- a/src/core/include/openvino/op/reduce_max.hpp +++ b/src/core/include/openvino/op/reduce_max.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API ReduceMax : public util::ArithmeticReductionKeepDims { public: OPENVINO_OP("ReduceMax", "opset1", util::ArithmeticReductionKeepDims, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a summation operation. ReduceMax() = default; /// \brief Constructs a summation operation. diff --git a/src/core/include/openvino/op/reduce_mean.hpp b/src/core/include/openvino/op/reduce_mean.hpp index b0e3ad9bff7..9f1ddd66f69 100644 --- a/src/core/include/openvino/op/reduce_mean.hpp +++ b/src/core/include/openvino/op/reduce_mean.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API ReduceMean : public util::ArithmeticReductionKeepDims { public: OPENVINO_OP("ReduceMean", "opset1", util::ArithmeticReductionKeepDims, 1); - BWDCMP_RTTI_DECLARATION; ReduceMean() = default; /// \param arg The tensor to be summed. diff --git a/src/core/include/openvino/op/reduce_min.hpp b/src/core/include/openvino/op/reduce_min.hpp index 0eb83503932..10b9c508a03 100644 --- a/src/core/include/openvino/op/reduce_min.hpp +++ b/src/core/include/openvino/op/reduce_min.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API ReduceMin : public util::ArithmeticReductionKeepDims { public: OPENVINO_OP("ReduceMin", "opset1", util::ArithmeticReductionKeepDims, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a summation operation. ReduceMin() = default; /// \brief Constructs a summation operation. diff --git a/src/core/include/openvino/op/reduce_prod.hpp b/src/core/include/openvino/op/reduce_prod.hpp index cae770880ee..e6de2743e0c 100644 --- a/src/core/include/openvino/op/reduce_prod.hpp +++ b/src/core/include/openvino/op/reduce_prod.hpp @@ -16,7 +16,6 @@ namespace v1 { class OPENVINO_API ReduceProd : public util::ArithmeticReductionKeepDims { public: OPENVINO_OP("ReduceProd", "opset1", util::ArithmeticReductionKeepDims, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a product reduction operation. ReduceProd() = default; /// \brief Constructs a product reduction operation. diff --git a/src/core/include/openvino/op/reduce_sum.hpp b/src/core/include/openvino/op/reduce_sum.hpp index d1753a20a6b..f4cec263040 100644 --- a/src/core/include/openvino/op/reduce_sum.hpp +++ b/src/core/include/openvino/op/reduce_sum.hpp @@ -62,7 +62,6 @@ namespace v1 { class OPENVINO_API ReduceSum : public util::ArithmeticReductionKeepDims { public: OPENVINO_OP("ReduceSum", "opset1", util::ArithmeticReductionKeepDims, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a summation operation. ReduceSum() = default; /// \brief Constructs a summation operation. diff --git a/src/core/include/openvino/op/region_yolo.hpp b/src/core/include/openvino/op/region_yolo.hpp index 043637cffeb..72316e146b0 100644 --- a/src/core/include/openvino/op/region_yolo.hpp +++ b/src/core/include/openvino/op/region_yolo.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API RegionYolo : public Op { public: OPENVINO_OP("RegionYolo", "opset1"); - BWDCMP_RTTI_DECLARATION; RegionYolo() = default; /// diff --git a/src/core/include/openvino/op/relu.hpp b/src/core/include/openvino/op/relu.hpp index 0243a65f191..9bb5616a307 100644 --- a/src/core/include/openvino/op/relu.hpp +++ b/src/core/include/openvino/op/relu.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Relu : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Relu", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; Relu() = default; /// \brief Constructs a Relu operation. /// diff --git a/src/core/include/openvino/op/reorg_yolo.hpp b/src/core/include/openvino/op/reorg_yolo.hpp index 46c43a323d3..bd0abd979b4 100644 --- a/src/core/include/openvino/op/reorg_yolo.hpp +++ b/src/core/include/openvino/op/reorg_yolo.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API ReorgYolo : public Op { public: OPENVINO_OP("ReorgYolo", "opset2"); - BWDCMP_RTTI_DECLARATION; ReorgYolo() = default; /// \brief Constructs a ReorgYolo operation diff --git a/src/core/include/openvino/op/reshape.hpp b/src/core/include/openvino/op/reshape.hpp index 838e91b1079..f28f3c21578 100644 --- a/src/core/include/openvino/op/reshape.hpp +++ b/src/core/include/openvino/op/reshape.hpp @@ -18,7 +18,6 @@ namespace v1 { class OPENVINO_API Reshape : public Op { public: OPENVINO_OP("Reshape", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; Reshape() = default; /// \brief Constructs a dynamic reshape operation. This operation does not perform /// transpose. diff --git a/src/core/include/openvino/op/result.hpp b/src/core/include/openvino/op/result.hpp index 0693429d683..68bb90b6d11 100644 --- a/src/core/include/openvino/op/result.hpp +++ b/src/core/include/openvino/op/result.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API Result : public Op { public: OPENVINO_OP("Result", "opset1"); - BWDCMP_RTTI_DECLARATION; /// \brief Allows a value to be used as a function result. Result() = default; @@ -66,7 +65,6 @@ public: bool visit_attributes(AttributeVisitor& visitor) override; OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; protected: ResultVector& m_ref; diff --git a/src/core/include/openvino/op/reverse.hpp b/src/core/include/openvino/op/reverse.hpp index d3b8e137371..ee29918d665 100644 --- a/src/core/include/openvino/op/reverse.hpp +++ b/src/core/include/openvino/op/reverse.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API Reverse : public Op { public: OPENVINO_OP("Reverse", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; enum class Mode { INDEX, MASK }; @@ -73,7 +72,6 @@ public: AttributeAdapter(op::v1::Reverse::Mode& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/reverse_sequence.hpp b/src/core/include/openvino/op/reverse_sequence.hpp index 5e2683f67fe..c9037bab89c 100644 --- a/src/core/include/openvino/op/reverse_sequence.hpp +++ b/src/core/include/openvino/op/reverse_sequence.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API ReverseSequence : public Op { public: OPENVINO_OP("ReverseSequence", "opset1"); - BWDCMP_RTTI_DECLARATION; ReverseSequence() = default; /// \brief Constructs a ReverseSequence operation. diff --git a/src/core/include/openvino/op/rnn_cell.hpp b/src/core/include/openvino/op/rnn_cell.hpp index 0e607630f74..abc95df3e08 100644 --- a/src/core/include/openvino/op/rnn_cell.hpp +++ b/src/core/include/openvino/op/rnn_cell.hpp @@ -38,7 +38,6 @@ namespace v0 { class OPENVINO_API RNNCell : public util::RNNCellBase { public: OPENVINO_OP("RNNCell", "opset1", util::RNNCellBase); - BWDCMP_RTTI_DECLARATION; RNNCell(); /// diff --git a/src/core/include/openvino/op/rnn_sequence.hpp b/src/core/include/openvino/op/rnn_sequence.hpp index 7efb217b247..d9862ea9ea1 100644 --- a/src/core/include/openvino/op/rnn_sequence.hpp +++ b/src/core/include/openvino/op/rnn_sequence.hpp @@ -19,7 +19,6 @@ namespace v5 { class OPENVINO_API RNNSequence : public util::RNNCellBase { public: OPENVINO_OP("RNNSequence", "opset5", util::RNNCellBase, 4); - BWDCMP_RTTI_DECLARATION; RNNSequence(); diff --git a/src/core/include/openvino/op/roi_align.hpp b/src/core/include/openvino/op/roi_align.hpp index 9f773d508aa..00f4a0c263b 100644 --- a/src/core/include/openvino/op/roi_align.hpp +++ b/src/core/include/openvino/op/roi_align.hpp @@ -15,7 +15,6 @@ namespace v3 { class OPENVINO_API ROIAlign : public Op { public: OPENVINO_OP("ROIAlign", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; enum class PoolingMode { AVG, MAX }; ROIAlign() = default; @@ -161,7 +160,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; std::ostream& operator<<(std::ostream& s, const op::v9::ROIAlign::PoolingMode& mode); diff --git a/src/core/include/openvino/op/roi_pooling.hpp b/src/core/include/openvino/op/roi_pooling.hpp index f90cda5a524..aa71813023c 100644 --- a/src/core/include/openvino/op/roi_pooling.hpp +++ b/src/core/include/openvino/op/roi_pooling.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API ROIPooling : public Op { public: OPENVINO_OP("ROIPooling", "opset2"); - BWDCMP_RTTI_DECLARATION; ROIPooling() = default; /// \brief Constructs a ROIPooling operation diff --git a/src/core/include/openvino/op/roll.hpp b/src/core/include/openvino/op/roll.hpp index 99586a0c405..dba62270657 100644 --- a/src/core/include/openvino/op/roll.hpp +++ b/src/core/include/openvino/op/roll.hpp @@ -14,7 +14,6 @@ namespace v7 { class OPENVINO_API Roll : public Op { public: OPENVINO_OP("Roll", "opset7", op::Op, 7); - BWDCMP_RTTI_DECLARATION; Roll() = default; diff --git a/src/core/include/openvino/op/round.hpp b/src/core/include/openvino/op/round.hpp index a2936c1e5d7..6f034117bcc 100644 --- a/src/core/include/openvino/op/round.hpp +++ b/src/core/include/openvino/op/round.hpp @@ -19,7 +19,6 @@ class OPENVINO_API Round : public util::UnaryElementwiseArithmetic { public: enum class RoundMode { HALF_TO_EVEN, HALF_AWAY_FROM_ZERO }; OPENVINO_OP("Round", "opset5", util::UnaryElementwiseArithmetic, 5); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a round operation. Round() = default; @@ -62,7 +61,6 @@ public: AttributeAdapter(op::v5::Round::RoundMode& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/scatter_elements_update.hpp b/src/core/include/openvino/op/scatter_elements_update.hpp index e8c0e1f216b..c8095d80f6e 100644 --- a/src/core/include/openvino/op/scatter_elements_update.hpp +++ b/src/core/include/openvino/op/scatter_elements_update.hpp @@ -15,7 +15,6 @@ namespace v3 { class OPENVINO_API ScatterElementsUpdate : public Op { public: OPENVINO_OP("ScatterElementsUpdate", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; ScatterElementsUpdate() = default; /// \brief Constructs a ScatterElementsUpdate node diff --git a/src/core/include/openvino/op/scatter_nd_update.hpp b/src/core/include/openvino/op/scatter_nd_update.hpp index f8b0ed49e50..d9cc3544126 100644 --- a/src/core/include/openvino/op/scatter_nd_update.hpp +++ b/src/core/include/openvino/op/scatter_nd_update.hpp @@ -14,7 +14,6 @@ namespace v3 { class OPENVINO_API ScatterNDUpdate : public util::ScatterNDBase { public: OPENVINO_OP("ScatterNDUpdate", "opset4", util::ScatterNDBase, 3); - BWDCMP_RTTI_DECLARATION; ScatterNDUpdate() = default; /// \param inputs Tensor /// \param indices Index tensor: Data type must be `element::i32` or `element::i64` diff --git a/src/core/include/openvino/op/scatter_update.hpp b/src/core/include/openvino/op/scatter_update.hpp index abbd86723a1..e3173ec9fd7 100644 --- a/src/core/include/openvino/op/scatter_update.hpp +++ b/src/core/include/openvino/op/scatter_update.hpp @@ -16,7 +16,6 @@ namespace v3 { class OPENVINO_API ScatterUpdate : public util::ScatterBase { public: OPENVINO_OP("ScatterUpdate", "opset3", util::ScatterBase, 3); - BWDCMP_RTTI_DECLARATION; ScatterUpdate() = default; /// /// \brief Constructs ScatterUpdate operator object. diff --git a/src/core/include/openvino/op/select.hpp b/src/core/include/openvino/op/select.hpp index 5406ea3bac6..efbb01af469 100644 --- a/src/core/include/openvino/op/select.hpp +++ b/src/core/include/openvino/op/select.hpp @@ -31,7 +31,6 @@ namespace v1 { class OPENVINO_API Select : public Op { public: OPENVINO_OP("Select", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a selection operation. Select() : m_auto_broadcast(AutoBroadcastSpec(AutoBroadcastType::NUMPY)) {} diff --git a/src/core/include/openvino/op/selu.hpp b/src/core/include/openvino/op/selu.hpp index 3a42987c4ce..5880237e594 100644 --- a/src/core/include/openvino/op/selu.hpp +++ b/src/core/include/openvino/op/selu.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Selu : public Op { public: OPENVINO_OP("Selu", "opset1"); - BWDCMP_RTTI_DECLARATION; Selu() = default; /// \brief Constructs a Selu node. diff --git a/src/core/include/openvino/op/shape_of.hpp b/src/core/include/openvino/op/shape_of.hpp index 6201411c9a0..2c9b5016b78 100644 --- a/src/core/include/openvino/op/shape_of.hpp +++ b/src/core/include/openvino/op/shape_of.hpp @@ -14,7 +14,6 @@ namespace v3 { class OPENVINO_API ShapeOf : public Op { public: OPENVINO_OP("ShapeOf", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; ShapeOf() = default; /// \brief Constructs a shape-of operation. ShapeOf(const Output& arg, const element::Type output_type = element::i64); @@ -55,7 +54,6 @@ namespace v0 { class OPENVINO_API ShapeOf : public Op { public: OPENVINO_OP("ShapeOf", "opset1"); - BWDCMP_RTTI_DECLARATION; ShapeOf() = default; /// \brief Constructs a shape-of operation. ShapeOf(const Output& arg); diff --git a/src/core/include/openvino/op/shuffle_channels.hpp b/src/core/include/openvino/op/shuffle_channels.hpp index 75173c1270b..283ba03b1d5 100644 --- a/src/core/include/openvino/op/shuffle_channels.hpp +++ b/src/core/include/openvino/op/shuffle_channels.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API ShuffleChannels : public Op { public: OPENVINO_OP("ShuffleChannels", "opset1"); - BWDCMP_RTTI_DECLARATION; ShuffleChannels() = default; /// \brief Constructs a ShuffleChannels node. diff --git a/src/core/include/openvino/op/sigmoid.hpp b/src/core/include/openvino/op/sigmoid.hpp index 428f256b0d6..18d27ab7dcc 100644 --- a/src/core/include/openvino/op/sigmoid.hpp +++ b/src/core/include/openvino/op/sigmoid.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API Sigmoid : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Sigmoid", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; Sigmoid(const Output& arg); Sigmoid() = default; std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; diff --git a/src/core/include/openvino/op/sign.hpp b/src/core/include/openvino/op/sign.hpp index abb8701635f..3980226e239 100644 --- a/src/core/include/openvino/op/sign.hpp +++ b/src/core/include/openvino/op/sign.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API Sign : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Sign", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; Sign() = default; /// \brief Constructs an elementwise sign operation. diff --git a/src/core/include/openvino/op/sin.hpp b/src/core/include/openvino/op/sin.hpp index 53a53725966..fce6a9f2362 100644 --- a/src/core/include/openvino/op/sin.hpp +++ b/src/core/include/openvino/op/sin.hpp @@ -28,7 +28,6 @@ namespace v0 { class OPENVINO_API Sin : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Sin", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a sine operation. /// /// \param arg Node that produces the input tensor. diff --git a/src/core/include/openvino/op/sinh.hpp b/src/core/include/openvino/op/sinh.hpp index f904c60bf9e..810c6a4c08e 100644 --- a/src/core/include/openvino/op/sinh.hpp +++ b/src/core/include/openvino/op/sinh.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Sinh : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Sinh", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a hyperbolic sine operation. /// /// \param arg Node that produces the input tensor. diff --git a/src/core/include/openvino/op/sink.hpp b/src/core/include/openvino/op/sink.hpp index c467df62828..19ba785c09f 100644 --- a/src/core/include/openvino/op/sink.hpp +++ b/src/core/include/openvino/op/sink.hpp @@ -16,7 +16,6 @@ class OPENVINO_API Sink : public Op { public: ~Sink() override = 0; OPENVINO_OP("Sink"); - BWDCMP_RTTI_DECLARATION; protected: Sink() : Op() {} diff --git a/src/core/include/openvino/op/slice.hpp b/src/core/include/openvino/op/slice.hpp index c71cea1d36c..49feabad978 100644 --- a/src/core/include/openvino/op/slice.hpp +++ b/src/core/include/openvino/op/slice.hpp @@ -16,8 +16,6 @@ class OPENVINO_API Slice : public Op { public: OPENVINO_OP("Slice", "opset8"); - BWDCMP_RTTI_DECLARATION; - Slice() = default; /// \brief Constructs Slice operation (default axes). diff --git a/src/core/include/openvino/op/softmax.hpp b/src/core/include/openvino/op/softmax.hpp index f0f012bffff..4500ec8ea5b 100644 --- a/src/core/include/openvino/op/softmax.hpp +++ b/src/core/include/openvino/op/softmax.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API Softmax : public Op { public: OPENVINO_OP("Softmax", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; Softmax() = default; /// \brief Constructs a softmax operation. @@ -55,7 +54,6 @@ namespace v8 { class OPENVINO_API Softmax : public Op { public: OPENVINO_OP("Softmax", "opset8"); - BWDCMP_RTTI_DECLARATION; Softmax() = default; /// \brief Constructs a softmax operation. diff --git a/src/core/include/openvino/op/softplus.hpp b/src/core/include/openvino/op/softplus.hpp index 077cd35c616..8e5ad910204 100644 --- a/src/core/include/openvino/op/softplus.hpp +++ b/src/core/include/openvino/op/softplus.hpp @@ -16,7 +16,6 @@ namespace v4 { class OPENVINO_API SoftPlus : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("SoftPlus", "opset4", util::UnaryElementwiseArithmetic, 4); - BWDCMP_RTTI_DECLARATION; SoftPlus() = default; /// \brief Constructs an SoftPlus operation. diff --git a/src/core/include/openvino/op/softsign.hpp b/src/core/include/openvino/op/softsign.hpp index 08cae2cb35f..30e900f8549 100644 --- a/src/core/include/openvino/op/softsign.hpp +++ b/src/core/include/openvino/op/softsign.hpp @@ -12,7 +12,6 @@ namespace v9 { class OPENVINO_API SoftSign : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("SoftSign", "opset9", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; SoftSign() = default; /// \brief Constructs a SoftSign operation. diff --git a/src/core/include/openvino/op/space_to_batch.hpp b/src/core/include/openvino/op/space_to_batch.hpp index 715944b6281..040c0512670 100644 --- a/src/core/include/openvino/op/space_to_batch.hpp +++ b/src/core/include/openvino/op/space_to_batch.hpp @@ -24,7 +24,6 @@ namespace v1 { class OPENVINO_API SpaceToBatch : public Op { public: OPENVINO_OP("SpaceToBatch", "opset2", op::Op, 1); - BWDCMP_RTTI_DECLARATION; SpaceToBatch() = default; diff --git a/src/core/include/openvino/op/space_to_depth.hpp b/src/core/include/openvino/op/space_to_depth.hpp index ec57577f436..def518505bd 100644 --- a/src/core/include/openvino/op/space_to_depth.hpp +++ b/src/core/include/openvino/op/space_to_depth.hpp @@ -20,7 +20,6 @@ namespace v0 { class OPENVINO_API SpaceToDepth : public Op { public: OPENVINO_OP("SpaceToDepth", "opset1"); - BWDCMP_RTTI_DECLARATION; enum class SpaceToDepthMode { // The output depth is gathered from [block_size, ..., block_size, C] @@ -73,7 +72,6 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/split.hpp b/src/core/include/openvino/op/split.hpp index 4b21fe49bb0..9dce470b331 100644 --- a/src/core/include/openvino/op/split.hpp +++ b/src/core/include/openvino/op/split.hpp @@ -18,7 +18,6 @@ namespace v1 { class OPENVINO_API Split : public Op { public: OPENVINO_OP("Split", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a split operation. Split() = default; diff --git a/src/core/include/openvino/op/sqrt.hpp b/src/core/include/openvino/op/sqrt.hpp index c1433a3df1e..fa76e0fb2ca 100644 --- a/src/core/include/openvino/op/sqrt.hpp +++ b/src/core/include/openvino/op/sqrt.hpp @@ -28,7 +28,6 @@ namespace v0 { class OPENVINO_API Sqrt : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Sqrt", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a square operation. /// diff --git a/src/core/include/openvino/op/squared_difference.hpp b/src/core/include/openvino/op/squared_difference.hpp index 061aabb63e1..c53df6c8951 100644 --- a/src/core/include/openvino/op/squared_difference.hpp +++ b/src/core/include/openvino/op/squared_difference.hpp @@ -16,7 +16,6 @@ namespace v0 { class OPENVINO_API SquaredDifference : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("SquaredDifference", "opset1", util::BinaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constrcuts an uninitialized squared difference operation SquaredDifference() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/squeeze.hpp b/src/core/include/openvino/op/squeeze.hpp index 5445b692413..5ac238d5c80 100644 --- a/src/core/include/openvino/op/squeeze.hpp +++ b/src/core/include/openvino/op/squeeze.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API Squeeze : public Op { public: OPENVINO_OP("Squeeze", "opset1"); - BWDCMP_RTTI_DECLARATION; Squeeze(); Squeeze(const Output& data, const Output& axes); diff --git a/src/core/include/openvino/op/strided_slice.hpp b/src/core/include/openvino/op/strided_slice.hpp index b4fd03c0aaf..b2037a0c4f6 100644 --- a/src/core/include/openvino/op/strided_slice.hpp +++ b/src/core/include/openvino/op/strided_slice.hpp @@ -19,7 +19,6 @@ namespace v1 { class OPENVINO_API StridedSlice : public Op { public: OPENVINO_OP("StridedSlice", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; StridedSlice() = default; diff --git a/src/core/include/openvino/op/subtract.hpp b/src/core/include/openvino/op/subtract.hpp index ce48b9cd209..4ea5f8f9d4e 100644 --- a/src/core/include/openvino/op/subtract.hpp +++ b/src/core/include/openvino/op/subtract.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Subtract : public util::BinaryElementwiseArithmetic { public: OPENVINO_OP("Subtract", "opset1", util::BinaryElementwiseArithmetic, 1); - BWDCMP_RTTI_DECLARATION; Subtract() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/swish.hpp b/src/core/include/openvino/op/swish.hpp index 4d33513f548..06affee8c02 100644 --- a/src/core/include/openvino/op/swish.hpp +++ b/src/core/include/openvino/op/swish.hpp @@ -17,7 +17,6 @@ namespace v4 { class OPENVINO_API Swish : public Op { public: OPENVINO_OP("Swish", "opset4", op::Op, 4); - BWDCMP_RTTI_DECLARATION; Swish() = default; /// \brief Constructs an Swish operation. diff --git a/src/core/include/openvino/op/tan.hpp b/src/core/include/openvino/op/tan.hpp index 87240a2c4f7..694b116cb67 100644 --- a/src/core/include/openvino/op/tan.hpp +++ b/src/core/include/openvino/op/tan.hpp @@ -28,7 +28,6 @@ namespace v0 { class OPENVINO_API Tan : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Tan", "opset1", util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a tangent operation. /// /// \param arg Node that produces the input tensor. diff --git a/src/core/include/openvino/op/tanh.hpp b/src/core/include/openvino/op/tanh.hpp index 98564bd6b33..4929e0b0ec9 100644 --- a/src/core/include/openvino/op/tanh.hpp +++ b/src/core/include/openvino/op/tanh.hpp @@ -14,7 +14,6 @@ namespace v0 { class OPENVINO_API Tanh : public util::UnaryElementwiseArithmetic { public: OPENVINO_OP("Tanh", "opset1", op::util::UnaryElementwiseArithmetic); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a hyperbolic tangent operation. /// diff --git a/src/core/include/openvino/op/tensor_iterator.hpp b/src/core/include/openvino/op/tensor_iterator.hpp index 6fd7b25f792..7a715270fc3 100644 --- a/src/core/include/openvino/op/tensor_iterator.hpp +++ b/src/core/include/openvino/op/tensor_iterator.hpp @@ -18,7 +18,6 @@ namespace v0 { class OPENVINO_API TensorIterator : public op::util::SubGraphOp { public: OPENVINO_OP("TensorIterator", "opset1", op::util::SubGraphOp); - BWDCMP_RTTI_DECLARATION; bool visit_attributes(AttributeVisitor& visitor) override; diff --git a/src/core/include/openvino/op/tile.hpp b/src/core/include/openvino/op/tile.hpp index dcf31f9d1da..e2effad69bf 100644 --- a/src/core/include/openvino/op/tile.hpp +++ b/src/core/include/openvino/op/tile.hpp @@ -15,7 +15,6 @@ namespace v0 { class OPENVINO_API Tile : public Op { public: OPENVINO_OP("Tile", "opset1"); - BWDCMP_RTTI_DECLARATION; Tile() = default; /// \brief Perform dynamic padding of a tensor diff --git a/src/core/include/openvino/op/topk.hpp b/src/core/include/openvino/op/topk.hpp index a39809ec0cc..9d2898cc2ad 100644 --- a/src/core/include/openvino/op/topk.hpp +++ b/src/core/include/openvino/op/topk.hpp @@ -18,7 +18,6 @@ namespace v1 { class OPENVINO_API TopK : public Op { public: OPENVINO_OP("TopK", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; using SortType = TopKSortType; using Mode = TopKMode; @@ -123,7 +122,6 @@ namespace v3 { class OPENVINO_API TopK : public v1::TopK { public: OPENVINO_OP("TopK", "opset3", op::Op, 3); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a TopK operation TopK() = default; /// \brief Constructs a TopK operation with two outputs: values and indices. diff --git a/src/core/include/openvino/op/transpose.hpp b/src/core/include/openvino/op/transpose.hpp index 959b71c2d0c..2f1d1b2dcbe 100644 --- a/src/core/include/openvino/op/transpose.hpp +++ b/src/core/include/openvino/op/transpose.hpp @@ -14,7 +14,6 @@ namespace v1 { class OPENVINO_API Transpose : public Op { public: OPENVINO_OP("Transpose", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; Transpose() = default; /// diff --git a/src/core/include/openvino/op/unsqueeze.hpp b/src/core/include/openvino/op/unsqueeze.hpp index 6cc279b329c..cd80681eef6 100644 --- a/src/core/include/openvino/op/unsqueeze.hpp +++ b/src/core/include/openvino/op/unsqueeze.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Unsqueeze : public Op { public: OPENVINO_OP("Unsqueeze", "opset1"); - BWDCMP_RTTI_DECLARATION; Unsqueeze() = default; Unsqueeze(const Output& data, const Output& axes); diff --git a/src/core/include/openvino/op/util/arithmetic_reduction.hpp b/src/core/include/openvino/op/util/arithmetic_reduction.hpp index e7191583e51..04fd4dc5a2d 100644 --- a/src/core/include/openvino/op/util/arithmetic_reduction.hpp +++ b/src/core/include/openvino/op/util/arithmetic_reduction.hpp @@ -26,7 +26,6 @@ protected: public: OPENVINO_OP("ArithmeticReduction", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; }; } // namespace util diff --git a/src/core/include/openvino/op/util/arithmetic_reductions_keep_dims.hpp b/src/core/include/openvino/op/util/arithmetic_reductions_keep_dims.hpp index e3195e7b024..e8f470be5aa 100644 --- a/src/core/include/openvino/op/util/arithmetic_reductions_keep_dims.hpp +++ b/src/core/include/openvino/op/util/arithmetic_reductions_keep_dims.hpp @@ -22,7 +22,6 @@ protected: public: OPENVINO_OP("ArithmeticReductionKeepDims", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; /// \return If set to 1 it holds axes that are used for reduction. diff --git a/src/core/include/openvino/op/util/assign_base.hpp b/src/core/include/openvino/op/util/assign_base.hpp index ad482361c17..3da9ffc887b 100644 --- a/src/core/include/openvino/op/util/assign_base.hpp +++ b/src/core/include/openvino/op/util/assign_base.hpp @@ -13,7 +13,6 @@ namespace util { class OPENVINO_API AssignBase : public Sink, public VariableExtension { public: OPENVINO_OP("AssignBase", "util", ov::op::Sink); - BWDCMP_RTTI_DECLARATION; AssignBase() = default; /// \brief Constructs an AssignBase operation. explicit AssignBase(const OutputVector& arguments) : Sink(arguments) {} diff --git a/src/core/include/openvino/op/util/attr_types.hpp b/src/core/include/openvino/op/util/attr_types.hpp index c33e2b1ba83..cfbea7dea93 100644 --- a/src/core/include/openvino/op/util/attr_types.hpp +++ b/src/core/include/openvino/op/util/attr_types.hpp @@ -209,7 +209,6 @@ public: AttributeAdapter(op::PadMode& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -218,7 +217,6 @@ public: AttributeAdapter(op::PadType& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -227,7 +225,6 @@ public: AttributeAdapter(op::RoundingType& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -236,7 +233,6 @@ public: AttributeAdapter(op::AutoBroadcastType& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -245,7 +241,6 @@ public: AttributeAdapter(op::BroadcastType& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -254,7 +249,6 @@ public: AttributeAdapter(op::EpsMode& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -263,7 +257,6 @@ public: AttributeAdapter(op::TopKSortType& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -272,7 +265,6 @@ public: AttributeAdapter(op::TopKMode& value) : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; template <> @@ -282,7 +274,6 @@ public: bool visit_attributes(AttributeVisitor& visitor) override; OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; protected: op::AutoBroadcastSpec& m_ref; @@ -295,7 +286,6 @@ public: bool visit_attributes(AttributeVisitor& visitor) override; OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; protected: op::BroadcastModeSpec& m_ref; @@ -309,6 +299,5 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/util/binary_elementwise_arithmetic.hpp b/src/core/include/openvino/op/util/binary_elementwise_arithmetic.hpp index f690f122120..dc70b04b901 100644 --- a/src/core/include/openvino/op/util/binary_elementwise_arithmetic.hpp +++ b/src/core/include/openvino/op/util/binary_elementwise_arithmetic.hpp @@ -48,7 +48,6 @@ protected: public: OPENVINO_OP("BinaryElementwiseArithmetic", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; diff --git a/src/core/include/openvino/op/util/binary_elementwise_comparison.hpp b/src/core/include/openvino/op/util/binary_elementwise_comparison.hpp index d7e13a563dc..5551210a0ab 100644 --- a/src/core/include/openvino/op/util/binary_elementwise_comparison.hpp +++ b/src/core/include/openvino/op/util/binary_elementwise_comparison.hpp @@ -52,7 +52,6 @@ protected: public: OPENVINO_OP("BinaryElementwiseComparison", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; diff --git a/src/core/include/openvino/op/util/binary_elementwise_logical.hpp b/src/core/include/openvino/op/util/binary_elementwise_logical.hpp index 36f2ad2bb99..4873c86e86d 100644 --- a/src/core/include/openvino/op/util/binary_elementwise_logical.hpp +++ b/src/core/include/openvino/op/util/binary_elementwise_logical.hpp @@ -49,7 +49,6 @@ protected: public: OPENVINO_OP("BinaryElementwiseLogical", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; diff --git a/src/core/include/openvino/op/util/broadcast_base.hpp b/src/core/include/openvino/op/util/broadcast_base.hpp index e4cbbd72586..fdf294ed152 100644 --- a/src/core/include/openvino/op/util/broadcast_base.hpp +++ b/src/core/include/openvino/op/util/broadcast_base.hpp @@ -40,7 +40,6 @@ protected: public: OPENVINO_OP("BroadcastBase", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; /// \return true and the AxisSet if broadcast axes can be fully determined. diff --git a/src/core/include/openvino/op/util/deformable_convolution_base.hpp b/src/core/include/openvino/op/util/deformable_convolution_base.hpp index 95803e7c9cd..fc61a7157ec 100644 --- a/src/core/include/openvino/op/util/deformable_convolution_base.hpp +++ b/src/core/include/openvino/op/util/deformable_convolution_base.hpp @@ -16,7 +16,6 @@ namespace util { class OPENVINO_API DeformableConvolutionBase : public Op { public: OPENVINO_OP("DeformableConvolutionBase", "util"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a conversion operation. DeformableConvolutionBase() = default; diff --git a/src/core/include/openvino/op/util/embeddingbag_offsets_base.hpp b/src/core/include/openvino/op/util/embeddingbag_offsets_base.hpp index 152513879ab..971cd515983 100644 --- a/src/core/include/openvino/op/util/embeddingbag_offsets_base.hpp +++ b/src/core/include/openvino/op/util/embeddingbag_offsets_base.hpp @@ -14,7 +14,6 @@ namespace util { class OPENVINO_API EmbeddingBagOffsetsBase : public Op { public: OPENVINO_OP("EmbeddingBagOffsetsBase", "util"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a EmbeddingBagOffsetsBase operation. EmbeddingBagOffsetsBase() = default; /// \brief Constructs a EmbeddingBagOffsetsBase operation. diff --git a/src/core/include/openvino/op/util/embeddingbag_packed_base.hpp b/src/core/include/openvino/op/util/embeddingbag_packed_base.hpp index 5423878cd9f..6afdbc379a5 100644 --- a/src/core/include/openvino/op/util/embeddingbag_packed_base.hpp +++ b/src/core/include/openvino/op/util/embeddingbag_packed_base.hpp @@ -14,7 +14,6 @@ namespace util { class OPENVINO_API EmbeddingBagPackedBase : public Op { public: OPENVINO_OP("EmbeddingBagPackedBase", "util"); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a EmbeddingBagPackedBase operation. EmbeddingBagPackedBase() = default; /// \brief Constructs a EmbeddingBagPackedBase operation. diff --git a/src/core/include/openvino/op/util/fft_base.hpp b/src/core/include/openvino/op/util/fft_base.hpp index f1975447bc6..cb4fa3a3bc2 100644 --- a/src/core/include/openvino/op/util/fft_base.hpp +++ b/src/core/include/openvino/op/util/fft_base.hpp @@ -14,7 +14,6 @@ namespace util { class OPENVINO_API FFTBase : public Op { public: OPENVINO_OP("FFTBase", "util"); - BWDCMP_RTTI_DECLARATION; FFTBase() = default; void validate_and_infer_types() override; diff --git a/src/core/include/openvino/op/util/framework_node.hpp b/src/core/include/openvino/op/util/framework_node.hpp index 3d8a0b749e0..a642490524e 100644 --- a/src/core/include/openvino/op/util/framework_node.hpp +++ b/src/core/include/openvino/op/util/framework_node.hpp @@ -72,7 +72,6 @@ private: class OPENVINO_API FrameworkNode : public Op { public: OPENVINO_OP("FrameworkNode", "util"); - BWDCMP_RTTI_DECLARATION; FrameworkNode() = default; diff --git a/src/core/include/openvino/op/util/gather_base.hpp b/src/core/include/openvino/op/util/gather_base.hpp index 5a4d7b57e77..6166cddcdfa 100644 --- a/src/core/include/openvino/op/util/gather_base.hpp +++ b/src/core/include/openvino/op/util/gather_base.hpp @@ -13,7 +13,6 @@ namespace util { class OPENVINO_API GatherBase : public Op { public: OPENVINO_OP("GatherBase", "util"); - BWDCMP_RTTI_DECLARATION; GatherBase() = default; /// \param data The tensor from which slices are gathered diff --git a/src/core/include/openvino/op/util/gather_nd_base.hpp b/src/core/include/openvino/op/util/gather_nd_base.hpp index e633360a48d..1d540f94d15 100644 --- a/src/core/include/openvino/op/util/gather_nd_base.hpp +++ b/src/core/include/openvino/op/util/gather_nd_base.hpp @@ -13,7 +13,6 @@ namespace util { class OPENVINO_API GatherNDBase : public Op { public: OPENVINO_OP("GatherNDBase", "util"); - BWDCMP_RTTI_DECLARATION; GatherNDBase() = default; /// \brief Constructs a GatherND operation. diff --git a/src/core/include/openvino/op/util/logical_reduction.hpp b/src/core/include/openvino/op/util/logical_reduction.hpp index a62e4685323..f7ea71928ae 100644 --- a/src/core/include/openvino/op/util/logical_reduction.hpp +++ b/src/core/include/openvino/op/util/logical_reduction.hpp @@ -30,7 +30,6 @@ protected: public: OPENVINO_OP("LogicalReduction", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; }; } // namespace util diff --git a/src/core/include/openvino/op/util/logical_reduction_keep_dims.hpp b/src/core/include/openvino/op/util/logical_reduction_keep_dims.hpp index ddfd00447e1..265559783a6 100644 --- a/src/core/include/openvino/op/util/logical_reduction_keep_dims.hpp +++ b/src/core/include/openvino/op/util/logical_reduction_keep_dims.hpp @@ -23,7 +23,6 @@ protected: public: OPENVINO_OP("LogicalReductionKeepDims", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; /// \return If set to 1 it holds axes that are used for reduction. diff --git a/src/core/include/openvino/op/util/multi_subgraph_base.hpp b/src/core/include/openvino/op/util/multi_subgraph_base.hpp index 6724f757680..e8328f853f7 100644 --- a/src/core/include/openvino/op/util/multi_subgraph_base.hpp +++ b/src/core/include/openvino/op/util/multi_subgraph_base.hpp @@ -17,7 +17,6 @@ namespace util { class OPENVINO_API MultiSubGraphOp : public Op { public: OPENVINO_OP("MultiSubGraphOp", "util"); - BWDCMP_RTTI_DECLARATION; /// \brief Abstract class describes a connection between a MultiSubGraphOp input and /// the body. class InputDescription { @@ -74,7 +73,6 @@ public: class OPENVINO_API SliceInputDescription : public InputDescription { public: OPENVINO_RTTI("SliceInputDescription"); - BWDCMP_RTTI_DECLARATION; /// /// \brief Constructs a new instance. /// @@ -109,7 +107,6 @@ public: class OPENVINO_API MergedInputDescription : public InputDescription { public: OPENVINO_RTTI("MergedInputDescription"); - BWDCMP_RTTI_DECLARATION; /// /// \brief Constructs a new instance. /// @@ -131,7 +128,6 @@ public: class OPENVINO_API ConcatOutputDescription : public OutputDescription { public: OPENVINO_RTTI("ConcatOutputDescription"); - BWDCMP_RTTI_DECLARATION; /// /// \brief Constructs a new instance. /// @@ -164,7 +160,6 @@ public: class OPENVINO_API InvariantInputDescription : public InputDescription { public: OPENVINO_RTTI("InvariantInputDescription"); - BWDCMP_RTTI_DECLARATION; /// /// \brief Constructs a new instance. /// @@ -180,7 +175,6 @@ public: class OPENVINO_API BodyOutputDescription : public MultiSubGraphOp::OutputDescription { public: OPENVINO_RTTI("BodyOutputDescription"); - BWDCMP_RTTI_DECLARATION; /// /// \brief Constructs a new instance. /// @@ -330,7 +324,6 @@ public: : DirectValueAccessor>>(value) {} OPENVINO_RTTI("AttributeAdapter>>") - BWDCMP_RTTI_DECLARATION; }; template <> @@ -341,7 +334,6 @@ public: : DirectValueAccessor>>(value) {} OPENVINO_RTTI("AttributeAdapter>>"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/util/multiclass_nms_base.hpp b/src/core/include/openvino/op/util/multiclass_nms_base.hpp index c89d6f4124c..1dcf7918dfd 100644 --- a/src/core/include/openvino/op/util/multiclass_nms_base.hpp +++ b/src/core/include/openvino/op/util/multiclass_nms_base.hpp @@ -14,7 +14,6 @@ namespace util { class OPENVINO_API MulticlassNmsBase : public Op { public: OPENVINO_OP("MulticlassNmsBase", "util"); - BWDCMP_RTTI_DECLARATION; enum class SortResultType { CLASSID, // sort selected boxes by class id (ascending) in each batch element @@ -88,6 +87,5 @@ public: : EnumAttributeAdapterBase(value) {} OPENVINO_RTTI("AttributeAdapter"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/util/read_value_base.hpp b/src/core/include/openvino/op/util/read_value_base.hpp index ed31e3f3b17..3949b38d41e 100644 --- a/src/core/include/openvino/op/util/read_value_base.hpp +++ b/src/core/include/openvino/op/util/read_value_base.hpp @@ -13,7 +13,6 @@ namespace util { class OPENVINO_API ReadValueBase : public Op, public VariableExtension { public: OPENVINO_OP("ReadValueBase", "util"); - BWDCMP_RTTI_DECLARATION; ReadValueBase() = default; diff --git a/src/core/include/openvino/op/util/reduction_base.hpp b/src/core/include/openvino/op/util/reduction_base.hpp index 59ec1a735e9..c2f08089f06 100644 --- a/src/core/include/openvino/op/util/reduction_base.hpp +++ b/src/core/include/openvino/op/util/reduction_base.hpp @@ -30,7 +30,6 @@ protected: public: OPENVINO_OP("ReductionBase", "util"); - BWDCMP_RTTI_DECLARATION; /// \return true if reduction axes are constant else false. bool reduction_axes_constant() const; diff --git a/src/core/include/openvino/op/util/rnn_cell_base.hpp b/src/core/include/openvino/op/util/rnn_cell_base.hpp index 3af18a30867..789fde7bbe3 100644 --- a/src/core/include/openvino/op/util/rnn_cell_base.hpp +++ b/src/core/include/openvino/op/util/rnn_cell_base.hpp @@ -62,7 +62,6 @@ convert_lstm_peepholes_format(const Output& node, class OPENVINO_API RNNCellBase : public Op { public: OPENVINO_OP("RNNCellBase", "util"); - BWDCMP_RTTI_DECLARATION; /// /// \brief Constructs a RNNCellBase class. diff --git a/src/core/include/openvino/op/util/scatter_base.hpp b/src/core/include/openvino/op/util/scatter_base.hpp index 34e5c4bee5e..3c84a0fb593 100644 --- a/src/core/include/openvino/op/util/scatter_base.hpp +++ b/src/core/include/openvino/op/util/scatter_base.hpp @@ -15,7 +15,6 @@ namespace util { class OPENVINO_API ScatterBase : public Op { public: OPENVINO_OP("ScatterBase", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; bool visit_attributes(AttributeVisitor& visitor) override; diff --git a/src/core/include/openvino/op/util/scatter_nd_base.hpp b/src/core/include/openvino/op/util/scatter_nd_base.hpp index 4e6b7df6b87..03b0c7efcf4 100644 --- a/src/core/include/openvino/op/util/scatter_nd_base.hpp +++ b/src/core/include/openvino/op/util/scatter_nd_base.hpp @@ -15,7 +15,6 @@ namespace util { class OPENVINO_API ScatterNDBase : public Op { public: OPENVINO_OP("ScatterNDBase", "util"); - BWDCMP_RTTI_DECLARATION; // Respective input ordinal number. static constexpr int INPUTS = 0; static constexpr int INDICES = 1; diff --git a/src/core/include/openvino/op/util/sub_graph_base.hpp b/src/core/include/openvino/op/util/sub_graph_base.hpp index 15ff74bb385..7392f95a75c 100644 --- a/src/core/include/openvino/op/util/sub_graph_base.hpp +++ b/src/core/include/openvino/op/util/sub_graph_base.hpp @@ -16,7 +16,6 @@ namespace util { class OPENVINO_API SubGraphOp : public MultiSubGraphOp { public: OPENVINO_OP("SubGraphOp", "util", op::util::MultiSubGraphOp); - BWDCMP_RTTI_DECLARATION; virtual const std::shared_ptr& get_function() const { return m_bodies[0]; diff --git a/src/core/include/openvino/op/util/unary_elementwise_arithmetic.hpp b/src/core/include/openvino/op/util/unary_elementwise_arithmetic.hpp index cc0e66cc38a..31fbb71d308 100644 --- a/src/core/include/openvino/op/util/unary_elementwise_arithmetic.hpp +++ b/src/core/include/openvino/op/util/unary_elementwise_arithmetic.hpp @@ -41,7 +41,6 @@ protected: public: OPENVINO_OP("UnaryElementwiseArithmetic", "util"); - BWDCMP_RTTI_DECLARATION; void validate_and_infer_types() override; bool visit_attributes(AttributeVisitor& visitor) override; diff --git a/src/core/include/openvino/op/util/variable.hpp b/src/core/include/openvino/op/util/variable.hpp index 69edc300e9a..342a62ccfec 100644 --- a/src/core/include/openvino/op/util/variable.hpp +++ b/src/core/include/openvino/op/util/variable.hpp @@ -53,6 +53,5 @@ public: : DirectValueAccessor>(value) {} OPENVINO_RTTI("AttributeAdapter>"); - BWDCMP_RTTI_DECLARATION; }; } // namespace ov diff --git a/src/core/include/openvino/op/variadic_split.hpp b/src/core/include/openvino/op/variadic_split.hpp index 19256cc10cd..8b6b96194c0 100644 --- a/src/core/include/openvino/op/variadic_split.hpp +++ b/src/core/include/openvino/op/variadic_split.hpp @@ -15,7 +15,6 @@ namespace v1 { class OPENVINO_API VariadicSplit : public Op { public: OPENVINO_OP("VariadicSplit", "opset1", op::Op, 1); - BWDCMP_RTTI_DECLARATION; /// \brief Constructs a variadic split operation. VariadicSplit() = default; diff --git a/src/core/include/openvino/op/xor.hpp b/src/core/include/openvino/op/xor.hpp index e248e76b74e..1e642ab7f9e 100644 --- a/src/core/include/openvino/op/xor.hpp +++ b/src/core/include/openvino/op/xor.hpp @@ -17,7 +17,6 @@ namespace v0 { class OPENVINO_API Xor : public util::BinaryElementwiseLogical { public: OPENVINO_OP("Xor", "opset1", util::BinaryElementwiseLogical); - BWDCMP_RTTI_DECLARATION; Xor() = default; /// \brief Constructs a logical-xor operation. /// diff --git a/src/core/include/openvino/opsets/opset.hpp b/src/core/include/openvino/opsets/opset.hpp index 35df780b775..ff9a9ab3aa2 100644 --- a/src/core/include/openvino/opsets/opset.hpp +++ b/src/core/include/openvino/opsets/opset.hpp @@ -10,7 +10,6 @@ #include #include -#include "ngraph/compatibility.hpp" #include "ngraph/factory.hpp" #include "openvino/core/deprecated.hpp" #include "openvino/core/node.hpp" @@ -33,28 +32,16 @@ public: } /// \brief Insert OP_TYPE into the opset with a special name and the default factory - template ::value, bool>::type = true> + template void insert(const std::string& name) { insert(name, OP_TYPE::get_type_info_static(), ngraph::FactoryRegistry::get_default_factory()); } - template ::value, bool>::type = true> - void insert(const std::string& name) { - OPENVINO_SUPPRESS_DEPRECATED_START - insert(name, OP_TYPE::type_info, ngraph::FactoryRegistry::get_default_factory()); - OPENVINO_SUPPRESS_DEPRECATED_END - } /// \brief Insert OP_TYPE into the opset with the default name and factory - template ::value, bool>::type = true> + template void insert() { insert(OP_TYPE::get_type_info_static().name); } - template ::value, bool>::type = true> - void insert() { - OPENVINO_SUPPRESS_DEPRECATED_START - insert(OP_TYPE::type_info.name); - OPENVINO_SUPPRESS_DEPRECATED_END - } const std::set& get_types_info() const { return m_op_types; @@ -72,16 +59,10 @@ public: } /// \brief Return true if OP_TYPE is in the opset - template ::value, bool>::type = true> + template bool contains_type() const { return contains_type(OP_TYPE::get_type_info_static()); } - template ::value, bool>::type = true> - bool contains_type() const { - OPENVINO_SUPPRESS_DEPRECATED_START - return contains_type(OP_TYPE::type_info); - OPENVINO_SUPPRESS_DEPRECATED_END - } /// \brief Return true if name is in the opset bool contains_type(const std::string& name) const { diff --git a/src/core/include/openvino/pass/pass_config.hpp b/src/core/include/openvino/pass/pass_config.hpp index bb3cc4657bb..aef73b3f274 100644 --- a/src/core/include/openvino/pass/pass_config.hpp +++ b/src/core/include/openvino/pass/pass_config.hpp @@ -8,7 +8,6 @@ #include #include -#include "ngraph/compatibility.hpp" #include "openvino/core/core_visibility.hpp" #include "openvino/core/deprecated.hpp" #include "openvino/core/model.hpp" @@ -61,29 +60,19 @@ public: /// \param type_info Transformation type_info void disable(const DiscreteTypeInfo& type_info); /// \brief Disable transformation by its class type (based on type_info) - template ::value, bool>::type = true> + template void disable() { disable(T::get_type_info_static()); } - template ::value, bool>::type = true> - void disable() { - disable(T::type_info); - } /// \brief Enable transformation by its type_info /// \param type_info Transformation type_info void enable(const DiscreteTypeInfo& type_info); /// \brief Enable transformation by its class type (based on type_info) - template ::value, bool>::type = true> + template void enable() { enable(T::get_type_info_static()); } - template ::value, bool>::type = true> - void enable() { - OPENVINO_SUPPRESS_DEPRECATED_START - enable(T::type_info); - OPENVINO_SUPPRESS_DEPRECATED_END - } /// \brief Set callback for all kind of transformations void set_callback(const param_callback& callback) { @@ -116,22 +105,11 @@ public: /// return false; // exit from transformation /// } /// - template ::value, bool>::type = true> + template void set_callback(const param_callback& callback) { m_callback_map[T::get_type_info_static()] = callback; set_callback(callback); } - template ::value, bool>::type = true> - void set_callback(const param_callback& callback) { - OPENVINO_SUPPRESS_DEPRECATED_START - m_callback_map[T::type_info] = callback; - OPENVINO_SUPPRESS_DEPRECATED_END - set_callback(callback); - } /// \brief Get callback for given transformation type_info /// \param type_info Transformation type_info @@ -143,13 +121,7 @@ public: /// \brief Get callback for given transformation class type /// \return callback lambda function - template ::value, bool>::type = true> - param_callback get_callback() const { - OPENVINO_SUPPRESS_DEPRECATED_START - return get_callback(T::type_info); - OPENVINO_SUPPRESS_DEPRECATED_END - } - template ::value, bool>::type = true> + template param_callback get_callback() const { return get_callback(T::get_type_info_static()); } @@ -163,13 +135,7 @@ public: /// \brief Check either transformation class type is disabled or not /// \return true if transformation type was disabled and false otherwise - template ::value, bool>::type = true> - bool is_disabled() const { - OPENVINO_SUPPRESS_DEPRECATED_START - return is_disabled(T::type_info); - OPENVINO_SUPPRESS_DEPRECATED_END - } - template ::value, bool>::type = true> + template bool is_disabled() const { return is_disabled(T::get_type_info_static()); } @@ -183,13 +149,7 @@ public: /// \brief Check either transformation class type is force enabled or not /// \return true if transformation type was force enabled and false otherwise - template ::value, bool>::type = true> - bool is_enabled() const { - OPENVINO_SUPPRESS_DEPRECATED_START - return is_enabled(T::type_info); - OPENVINO_SUPPRESS_DEPRECATED_END - } - template ::value, bool>::type = true> + template bool is_enabled() const { return is_enabled(T::get_type_info_static()); } diff --git a/src/core/include/openvino/pass/pattern/op/any.hpp b/src/core/include/openvino/pass/pattern/op/any.hpp index c82d50eac01..69d6b81b7fd 100644 --- a/src/core/include/openvino/pass/pattern/op/any.hpp +++ b/src/core/include/openvino/pass/pattern/op/any.hpp @@ -16,7 +16,6 @@ namespace op { class OPENVINO_API Any : public Pattern { public: OPENVINO_RTTI("patternAny"); - BWDCMP_RTTI_DECLARATION; /// \brief creates a Any node containing a sub-pattern described by \sa type and \sa /// shape. Any(const element::Type& type, const PartialShape& s, ValuePredicate pred, const OutputVector& wrapped_values) diff --git a/src/core/include/openvino/pass/pattern/op/any_of.hpp b/src/core/include/openvino/pass/pattern/op/any_of.hpp index 4a34c73582f..5c0d28b23cd 100644 --- a/src/core/include/openvino/pass/pattern/op/any_of.hpp +++ b/src/core/include/openvino/pass/pattern/op/any_of.hpp @@ -21,7 +21,6 @@ namespace op { class OPENVINO_API AnyOf : public Pattern { public: OPENVINO_RTTI("patternAnyOf"); - BWDCMP_RTTI_DECLARATION; /// \brief creates a AnyOf node containing a sub-pattern described by \sa type and /// \sa shape. AnyOf(const element::Type& type, const PartialShape& s, ValuePredicate pred, const OutputVector& wrapped_values) diff --git a/src/core/include/openvino/pass/pattern/op/any_output.hpp b/src/core/include/openvino/pass/pattern/op/any_output.hpp index 99de880a8aa..59ca9c165f5 100644 --- a/src/core/include/openvino/pass/pattern/op/any_output.hpp +++ b/src/core/include/openvino/pass/pattern/op/any_output.hpp @@ -15,7 +15,6 @@ namespace op { class OPENVINO_API AnyOutput : public Pattern { public: OPENVINO_RTTI("patternAnyOutput"); - BWDCMP_RTTI_DECLARATION; /// \brief creates an AnyOutput node matching any output of a node /// \param node The node to match AnyOutput(const std::shared_ptr& pattern) : Pattern({pattern->output(0)}) {} diff --git a/src/core/include/openvino/pass/pattern/op/branch.hpp b/src/core/include/openvino/pass/pattern/op/branch.hpp index 192474ec3c2..7c4f71c9ce5 100644 --- a/src/core/include/openvino/pass/pattern/op/branch.hpp +++ b/src/core/include/openvino/pass/pattern/op/branch.hpp @@ -22,7 +22,6 @@ namespace op { class OPENVINO_API Branch : public Pattern { public: OPENVINO_RTTI("patternBranch"); - BWDCMP_RTTI_DECLARATION; /// \brief Creates a Branch pattern /// \param pattern the destinationing pattern /// \param labels Labels where the destination may occur diff --git a/src/core/include/openvino/pass/pattern/op/capture.hpp b/src/core/include/openvino/pass/pattern/op/capture.hpp index 46f42521948..352abe1cc80 100644 --- a/src/core/include/openvino/pass/pattern/op/capture.hpp +++ b/src/core/include/openvino/pass/pattern/op/capture.hpp @@ -18,7 +18,6 @@ namespace op { class OPENVINO_API Capture : public Pattern { public: OPENVINO_RTTI("patternCapture"); - BWDCMP_RTTI_DECLARATION; Capture(const Output& arg) : Pattern({arg}) { set_output_type(0, arg.get_element_type(), arg.get_partial_shape()); } diff --git a/src/core/include/openvino/pass/pattern/op/label.hpp b/src/core/include/openvino/pass/pattern/op/label.hpp index ce995f223f0..befbcea3040 100644 --- a/src/core/include/openvino/pass/pattern/op/label.hpp +++ b/src/core/include/openvino/pass/pattern/op/label.hpp @@ -23,7 +23,6 @@ namespace op { class OPENVINO_API Label : public Pattern { public: OPENVINO_RTTI("patternLabel"); - BWDCMP_RTTI_DECLARATION; /// \brief creates a Label node containing a sub-pattern described by \sa type and /// \sa shape. /// diff --git a/src/core/include/openvino/pass/pattern/op/or.hpp b/src/core/include/openvino/pass/pattern/op/or.hpp index c06f650c1b3..b1bd5c4ef78 100644 --- a/src/core/include/openvino/pass/pattern/op/or.hpp +++ b/src/core/include/openvino/pass/pattern/op/or.hpp @@ -16,7 +16,6 @@ namespace op { class OPENVINO_API Or : public Pattern { public: OPENVINO_RTTI("patternOr"); - BWDCMP_RTTI_DECLARATION; /// \brief creates an Or node matching one of several sub-patterns in order. Does /// not add node to match list. /// \param patterns The patterns to try for matching diff --git a/src/core/include/openvino/pass/pattern/op/skip.hpp b/src/core/include/openvino/pass/pattern/op/skip.hpp index 2e0931647b2..ea606c615a1 100644 --- a/src/core/include/openvino/pass/pattern/op/skip.hpp +++ b/src/core/include/openvino/pass/pattern/op/skip.hpp @@ -17,7 +17,6 @@ namespace op { class OPENVINO_API Skip : public Pattern { public: OPENVINO_RTTI("patternSkip"); - BWDCMP_RTTI_DECLARATION; Skip(const Output& arg, ValuePredicate pred) : Pattern({arg}, pred) { set_output_type(0, arg.get_element_type(), arg.get_partial_shape()); } diff --git a/src/core/include/openvino/pass/pattern/op/true.hpp b/src/core/include/openvino/pass/pattern/op/true.hpp index 69ab7402d1a..7337c8704d1 100644 --- a/src/core/include/openvino/pass/pattern/op/true.hpp +++ b/src/core/include/openvino/pass/pattern/op/true.hpp @@ -15,7 +15,6 @@ namespace op { class OPENVINO_API True : public Pattern { public: OPENVINO_RTTI("patternTrue"); - BWDCMP_RTTI_DECLARATION; /// \brief Always matches, does not add node to match list. True() : Pattern(OutputVector{}) {} bool match_value(pattern::Matcher* matcher, diff --git a/src/core/include/openvino/pass/pattern/op/wrap_type.hpp b/src/core/include/openvino/pass/pattern/op/wrap_type.hpp index dc9835d9951..812ffdda8b2 100644 --- a/src/core/include/openvino/pass/pattern/op/wrap_type.hpp +++ b/src/core/include/openvino/pass/pattern/op/wrap_type.hpp @@ -4,7 +4,6 @@ #pragma once -#include "ngraph/compatibility.hpp" #include "openvino/core/node.hpp" #include "openvino/pass/pattern/op/pattern.hpp" @@ -15,7 +14,6 @@ namespace op { class OPENVINO_API WrapType : public Pattern { public: OPENVINO_RTTI("patternAnyType"); - BWDCMP_RTTI_DECLARATION; explicit WrapType( NodeTypeInfo wrapped_type, @@ -54,13 +52,7 @@ private: }; } // namespace op -template ::value, bool>::type = true> -void collect_wrap_info(std::vector& info) { - OPENVINO_SUPPRESS_DEPRECATED_START - info.emplace_back(T::type_info); - OPENVINO_SUPPRESS_DEPRECATED_END -} -template ::value, bool>::type = true> +template void collect_wrap_info(std::vector& info) { info.emplace_back(T::get_type_info_static()); } diff --git a/src/core/src/attribute_adapter.cpp b/src/core/src/attribute_adapter.cpp deleted file mode 100644 index eb0147b9585..00000000000 --- a/src/core/src/attribute_adapter.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (C) 2018-2022 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "ngraph/attribute_adapter.hpp" - -#include - -#include "ngraph/axis_set.hpp" -#include "ngraph/coordinate.hpp" -#include "ngraph/coordinate_diff.hpp" -#include "ngraph/partial_shape.hpp" -#include "ngraph/shape.hpp" -#include "ngraph/strides.hpp" -#include "ngraph/type.hpp" -#include "ngraph/type/element_type.hpp" -#include "openvino/core/any.hpp" - -using namespace std; -using namespace ngraph; - -namespace ov { -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -#ifdef __APPLE__ -// size_t is not uint_64t on OSX -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -#endif -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); -} // namespace ov diff --git a/src/core/src/axis_set.cpp b/src/core/src/axis_set.cpp index 8b8fa76f6f1..14b8fbec100 100644 --- a/src/core/src/axis_set.cpp +++ b/src/core/src/axis_set.cpp @@ -55,5 +55,3 @@ void ov::AttributeAdapter::set(const std::vector& value) { } m_buffer_valid = false; } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/axis_vector.cpp b/src/core/src/axis_vector.cpp index 904b7908e13..caf02d31971 100644 --- a/src/core/src/axis_vector.cpp +++ b/src/core/src/axis_vector.cpp @@ -34,5 +34,3 @@ ov::AxisVector& ov::AxisVector::operator=(AxisVector&& v) noexcept { static_cast*>(this)->operator=(v); return *this; } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/coordinate.cpp b/src/core/src/coordinate.cpp index e8e66e4335a..af34b21df8d 100644 --- a/src/core/src/coordinate.cpp +++ b/src/core/src/coordinate.cpp @@ -39,5 +39,3 @@ ov::Coordinate& ov::Coordinate::operator=(Coordinate&& v) noexcept { static_cast*>(this)->operator=(v); return *this; } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/coordinate_diff.cpp b/src/core/src/coordinate_diff.cpp index da1eb0a6c9e..4fb585d5a73 100644 --- a/src/core/src/coordinate_diff.cpp +++ b/src/core/src/coordinate_diff.cpp @@ -39,5 +39,3 @@ ov::CoordinateDiff& ov::CoordinateDiff::operator=(CoordinateDiff&& v) noexcept { static_cast*>(this)->operator=(v); return *this; } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/distributed.cpp b/src/core/src/distributed.cpp index 68e0ac44227..02911b9e1fe 100644 --- a/src/core/src/distributed.cpp +++ b/src/core/src/distributed.cpp @@ -20,7 +20,6 @@ NGRAPH_API EnumNames& EnumNames); } // namespace ov std::ostream& ngraph::reduction::operator<<(std::ostream& out, const ngraph::reduction::Type& obj) { diff --git a/src/core/src/model.cpp b/src/core/src/model.cpp index e7274c6ba1b..5fd668ca62e 100644 --- a/src/core/src/model.cpp +++ b/src/core/src/model.cpp @@ -31,8 +31,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter>); - atomic ov::Model::m_next_instance_id(0); namespace { @@ -89,10 +87,6 @@ ngraph::ParameterVector auto_detect_parameters(const std::vector>); - AttributeAdapter>::AttributeAdapter(std::shared_ptr& value) : m_ref(value) {} bool AttributeAdapter>::visit_attributes(AttributeVisitor& visitor) { @@ -870,8 +868,6 @@ bool AttributeAdapter>::visit_attributes(AttributeVisitor& return true; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - AttributeAdapter::AttributeAdapter(NodeVector& ref) : m_ref(ref) {} bool AttributeAdapter::visit_attributes(AttributeVisitor& visitor) { diff --git a/src/core/src/op/abs.cpp b/src/core/src/op/abs.cpp index a1dd2b4b274..ee594cdbacd 100644 --- a/src/core/src/op/abs.cpp +++ b/src/core/src/op/abs.cpp @@ -10,8 +10,6 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/abs.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::v0::Abs); - ov::op::v0::Abs::Abs(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/acos.cpp b/src/core/src/op/acos.cpp index 1bd40ee0134..2e12c3a7219 100644 --- a/src/core/src/op/acos.cpp +++ b/src/core/src/op/acos.cpp @@ -18,8 +18,6 @@ #include "ngraph/runtime/host_tensor.hpp" #include "ngraph/runtime/reference/acos.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::v0::Acos); - ov::op::v0::Acos::Acos(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/acosh.cpp b/src/core/src/op/acosh.cpp index 215ef3625a0..cf1cf9a38c6 100644 --- a/src/core/src/op/acosh.cpp +++ b/src/core/src/op/acosh.cpp @@ -12,8 +12,6 @@ #include "ngraph/runtime/reference/acosh.hpp" #include "ngraph/type/element_type.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::v3::Acosh); - ov::op::v3::Acosh::Acosh(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/adaptive_avg_pool.cpp b/src/core/src/op/adaptive_avg_pool.cpp index b735c5e6b79..78f13fdab54 100644 --- a/src/core/src/op/adaptive_avg_pool.cpp +++ b/src/core/src/op/adaptive_avg_pool.cpp @@ -11,7 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v8::AdaptiveAvgPool); op::v8::AdaptiveAvgPool::AdaptiveAvgPool(const Output& data, const Output& output_shape) : Op({data, output_shape}) { diff --git a/src/core/src/op/adaptive_max_pool.cpp b/src/core/src/op/adaptive_max_pool.cpp index 5f1d4b34d61..7bf3a310dc2 100644 --- a/src/core/src/op/adaptive_max_pool.cpp +++ b/src/core/src/op/adaptive_max_pool.cpp @@ -11,7 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v8::AdaptiveMaxPool); op::v8::AdaptiveMaxPool::AdaptiveMaxPool(const Output& data, const Output& output_shape, diff --git a/src/core/src/op/add.cpp b/src/core/src/op/add.cpp index ca524d7bba4..49a47a84fd0 100644 --- a/src/core/src/op/add.cpp +++ b/src/core/src/op/add.cpp @@ -56,8 +56,6 @@ bool evaluate_add(const HostTensorPtr& arg0, // ------------------------------- v1 ------------------------------------------ -BWDCMP_RTTI_DEFINITION(ov::op::v1::Add); - op::v1::Add::Add(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/asin.cpp b/src/core/src/op/asin.cpp index 3133d91c6c6..49db5235012 100644 --- a/src/core/src/op/asin.cpp +++ b/src/core/src/op/asin.cpp @@ -22,8 +22,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::Asin); - op::Asin::Asin(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/asinh.cpp b/src/core/src/op/asinh.cpp index 29bdcc3b89f..a1bc6ce4c41 100644 --- a/src/core/src/op/asinh.cpp +++ b/src/core/src/op/asinh.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v3::Asinh); - op::v3::Asinh::Asinh(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/assign.cpp b/src/core/src/op/assign.cpp index fd2e0a59976..5858fc596c9 100644 --- a/src/core/src/op/assign.cpp +++ b/src/core/src/op/assign.cpp @@ -15,9 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v3::Assign); -BWDCMP_RTTI_DEFINITION(ov::op::v6::Assign); - op::v3::Assign::Assign(const Output& new_value, const std::string& variable_id) : AssignBase({new_value}), m_variable_id(variable_id) { diff --git a/src/core/src/op/atan.cpp b/src/core/src/op/atan.cpp index 8ffe7f33ea4..3d50bab07b1 100644 --- a/src/core/src/op/atan.cpp +++ b/src/core/src/op/atan.cpp @@ -20,8 +20,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::Atan); - op::Atan::Atan(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/atanh.cpp b/src/core/src/op/atanh.cpp index c5d1299f383..fed36b562c3 100644 --- a/src/core/src/op/atanh.cpp +++ b/src/core/src/op/atanh.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v3::Atanh); - op::v3::Atanh::Atanh(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/avg_pool.cpp b/src/core/src/op/avg_pool.cpp index a5423aa40ad..c85fe183c7e 100644 --- a/src/core/src/op/avg_pool.cpp +++ b/src/core/src/op/avg_pool.cpp @@ -12,8 +12,6 @@ using namespace std; // *** AvgPool OP SET 1 *** -BWDCMP_RTTI_DEFINITION(ov::op::v1::AvgPool); - ov::op::v1::AvgPool::AvgPool(const Output& arg, const Strides& strides, const Shape& pads_begin, diff --git a/src/core/src/op/batch_norm.cpp b/src/core/src/op/batch_norm.cpp index c54d006741d..90bf3976b6f 100644 --- a/src/core/src/op/batch_norm.cpp +++ b/src/core/src/op/batch_norm.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::BatchNormInference); - op::v0::BatchNormInference::BatchNormInference(const Output& input, const Output& gamma, const Output& beta, @@ -71,8 +69,6 @@ std::shared_ptr op::v0::BatchNormInference::clone_with_new_inputs(const Ou m_epsilon); } -BWDCMP_RTTI_DEFINITION(op::v5::BatchNormInference); - op::v5::BatchNormInference::BatchNormInference(const Output& input, const Output& gamma, const Output& beta, diff --git a/src/core/src/op/batch_to_space.cpp b/src/core/src/op/batch_to_space.cpp index ceee2753fba..1154b5448f6 100644 --- a/src/core/src/op/batch_to_space.cpp +++ b/src/core/src/op/batch_to_space.cpp @@ -25,8 +25,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::BatchToSpace); - ngraph::op::v1::BatchToSpace::BatchToSpace(const ngraph::Output& data, const ngraph::Output& block_shape, const ngraph::Output& crops_begin, diff --git a/src/core/src/op/binary_convolution.cpp b/src/core/src/op/binary_convolution.cpp index 98616da3a38..13d203621c6 100644 --- a/src/core/src/op/binary_convolution.cpp +++ b/src/core/src/op/binary_convolution.cpp @@ -14,8 +14,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::v1::BinaryConvolution); - ov::op::v1::BinaryConvolution::BinaryConvolution(const Output& data, const Output& kernel, const Strides& strides, @@ -125,8 +123,6 @@ EnumNames::get() { {{"xnor-popcount", ngraph::op::v1::BinaryConvolution::BinaryConvolutionMode::XNOR_POPCOUNT}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); } // namespace ov std::ostream& ov::operator<<(std::ostream& s, const ov::op::v1::BinaryConvolution::BinaryConvolutionMode& type) { diff --git a/src/core/src/op/broadcast.cpp b/src/core/src/op/broadcast.cpp index 9ee92ec24ce..17d5f3a7ac5 100644 --- a/src/core/src/op/broadcast.cpp +++ b/src/core/src/op/broadcast.cpp @@ -18,8 +18,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::Broadcast); - op::v3::Broadcast::Broadcast(const Output& arg, const Output& target_shape, const Output& axes_mapping, @@ -226,8 +224,6 @@ BroadcastModeSpec to_broadcast_mode(const AutoBroadcastSpec& bs) { } } // namespace -BWDCMP_RTTI_DEFINITION(op::v1::Broadcast); - op::v1::Broadcast::Broadcast(const Output& arg, const Output& target_shape, const Output& axes_mapping, diff --git a/src/core/src/op/bucketize.cpp b/src/core/src/op/bucketize.cpp index 3c5cd25802d..65702dd483e 100644 --- a/src/core/src/op/bucketize.cpp +++ b/src/core/src/op/bucketize.cpp @@ -10,8 +10,6 @@ using namespace ngraph; using namespace std; -BWDCMP_RTTI_DEFINITION(op::v3::Bucketize); - op::v3::Bucketize::Bucketize(const Output& data, const Output& buckets, const element::Type output_type, diff --git a/src/core/src/op/ceiling.cpp b/src/core/src/op/ceiling.cpp index cf2f987ffb1..c6cff2863ce 100644 --- a/src/core/src/op/ceiling.cpp +++ b/src/core/src/op/ceiling.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Ceiling); - op::Ceiling::Ceiling(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/clamp.cpp b/src/core/src/op/clamp.cpp index b3bf65237a6..a4879f124bb 100644 --- a/src/core/src/op/clamp.cpp +++ b/src/core/src/op/clamp.cpp @@ -99,8 +99,6 @@ bool op::v0::Clamp::has_evaluate() const { return false; } -BWDCMP_RTTI_DEFINITION(op::v0::Clamp); - op::Clamp::Clamp(const Output& data, const double min, const double max) : util::UnaryElementwiseArithmetic(data), m_min{min}, diff --git a/src/core/src/op/concat.cpp b/src/core/src/op/concat.cpp index 355f15d4981..5afd3f61bb1 100644 --- a/src/core/src/op/concat.cpp +++ b/src/core/src/op/concat.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::Concat); - op::Concat::Concat(const OutputVector& args, int64_t axis) : Op(args), m_axis(axis) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/constant.cpp b/src/core/src/op/constant.cpp index 0efc05f0729..2fac5a410b8 100644 --- a/src/core/src/op/constant.cpp +++ b/src/core/src/op/constant.cpp @@ -32,8 +32,6 @@ static inline string to_cpp_string(T value) { return rc; } -BWDCMP_RTTI_DEFINITION(ov::op::v0::Constant); - ov::op::v0::Constant::Constant(const shared_ptr& tensor) { m_element_type = tensor->get_element_type(); m_shape = tensor->get_shape(); diff --git a/src/core/src/op/convert.cpp b/src/core/src/op/convert.cpp index e66192b1a3d..7e7cd767448 100644 --- a/src/core/src/op/convert.cpp +++ b/src/core/src/op/convert.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Convert); - op::Convert::Convert(const Output& arg, const element::Type& destination_type) : Op({arg}), m_destination_type(destination_type) { diff --git a/src/core/src/op/convert_like.cpp b/src/core/src/op/convert_like.cpp index be27f916845..11fc4a07c44 100644 --- a/src/core/src/op/convert_like.cpp +++ b/src/core/src/op/convert_like.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::ConvertLike); - op::v1::ConvertLike::ConvertLike(const Output& data, const Output& like) : Op({data, like}) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/convolution.cpp b/src/core/src/op/convolution.cpp index 4c3f99793a4..bf7864428eb 100644 --- a/src/core/src/op/convolution.cpp +++ b/src/core/src/op/convolution.cpp @@ -18,8 +18,6 @@ using namespace std; using namespace ngraph; // *** Convolution OP SET 1 *** -BWDCMP_RTTI_DEFINITION(op::v1::Convolution); - op::v1::Convolution::Convolution(const Output& data_batch, const Output& filters, const Strides& strides, @@ -100,8 +98,6 @@ shared_ptr op::v1::Convolution::get_default_value() const { NGRAPH_SUPPRESS_DEPRECATED_END // *** ConvolutionBackpropData OP SET 1 *** -BWDCMP_RTTI_DEFINITION(op::v1::ConvolutionBackpropData); - op::v1::ConvolutionBackpropData::ConvolutionBackpropData(const Output& data, const Output& filters, const Output& output_shape, diff --git a/src/core/src/op/cos.cpp b/src/core/src/op/cos.cpp index e26219f1af1..6baaf9104ab 100644 --- a/src/core/src/op/cos.cpp +++ b/src/core/src/op/cos.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Cos); - op::Cos::Cos(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/cosh.cpp b/src/core/src/op/cosh.cpp index abe534dbcea..99664e24030 100644 --- a/src/core/src/op/cosh.cpp +++ b/src/core/src/op/cosh.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Cosh); - op::Cosh::Cosh(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/ctc_greedy_decoder.cpp b/src/core/src/op/ctc_greedy_decoder.cpp index 71cbd99c079..bb70c5882f4 100644 --- a/src/core/src/op/ctc_greedy_decoder.cpp +++ b/src/core/src/op/ctc_greedy_decoder.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::CTCGreedyDecoder); - op::CTCGreedyDecoder::CTCGreedyDecoder(const Output& input, const Output& seq_len, const bool ctc_merge_repeated) diff --git a/src/core/src/op/ctc_greedy_decoder_seq_len.cpp b/src/core/src/op/ctc_greedy_decoder_seq_len.cpp index f7d6a5596e6..41362edb798 100644 --- a/src/core/src/op/ctc_greedy_decoder_seq_len.cpp +++ b/src/core/src/op/ctc_greedy_decoder_seq_len.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v6::CTCGreedyDecoderSeqLen); - op::v6::CTCGreedyDecoderSeqLen::CTCGreedyDecoderSeqLen(const Output& input, const Output& seq_len, const bool merge_repeated, diff --git a/src/core/src/op/ctc_loss.cpp b/src/core/src/op/ctc_loss.cpp index 9906f95cdb0..b9d9b1837e1 100644 --- a/src/core/src/op/ctc_loss.cpp +++ b/src/core/src/op/ctc_loss.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v4::CTCLoss); - op::v4::CTCLoss::CTCLoss(const Output& logits, const Output& logit_length, const Output& labels, diff --git a/src/core/src/op/cum_sum.cpp b/src/core/src/op/cum_sum.cpp index 759ec63c13d..0fa89d71723 100644 --- a/src/core/src/op/cum_sum.cpp +++ b/src/core/src/op/cum_sum.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::CumSum); - op::v0::CumSum::CumSum(const Output& arg, const Output& axis, const bool exclusive, const bool reverse) : Op({arg, axis}), m_exclusive(exclusive), diff --git a/src/core/src/op/deformable_convolution.cpp b/src/core/src/op/deformable_convolution.cpp index ad8453b3593..c56c169366a 100644 --- a/src/core/src/op/deformable_convolution.cpp +++ b/src/core/src/op/deformable_convolution.cpp @@ -14,9 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::DeformableConvolution); -BWDCMP_RTTI_DEFINITION(op::v8::DeformableConvolution); - op::v8::DeformableConvolution::DeformableConvolution(const Output& arg, const Output& offsets, const Output& filters, diff --git a/src/core/src/op/deformable_psroi_pooling.cpp b/src/core/src/op/deformable_psroi_pooling.cpp index 9b6524effe0..6a77dbc6acb 100644 --- a/src/core/src/op/deformable_psroi_pooling.cpp +++ b/src/core/src/op/deformable_psroi_pooling.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::DeformablePSROIPooling); - op::v1::DeformablePSROIPooling::DeformablePSROIPooling(const Output& input, const Output& coords, const Output& offsets, diff --git a/src/core/src/op/depth_to_space.cpp b/src/core/src/op/depth_to_space.cpp index c991b5e9839..093ae454dbf 100644 --- a/src/core/src/op/depth_to_space.cpp +++ b/src/core/src/op/depth_to_space.cpp @@ -17,8 +17,6 @@ using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::DepthToSpace); - op::DepthToSpace::DepthToSpace(const Output& data, const DepthToSpaceMode& mode, const size_t block_size) : Op({data}), m_blocksize(block_size), @@ -100,6 +98,4 @@ EnumNames::get() { {"depth_first", ngraph::op::DepthToSpace::DepthToSpaceMode::DEPTH_FIRST}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); } // namespace ov diff --git a/src/core/src/op/detection_output.cpp b/src/core/src/op/detection_output.cpp index 7010a0218f2..6ec90ec85a7 100644 --- a/src/core/src/op/detection_output.cpp +++ b/src/core/src/op/detection_output.cpp @@ -11,7 +11,6 @@ using namespace std; // ------------------------------ V0 ------------------------------ -BWDCMP_RTTI_DEFINITION(ov::op::v0::DetectionOutput); ov::op::v0::DetectionOutput::DetectionOutput(const Output& box_logits, const Output& class_preds, const Output& proposals, @@ -75,7 +74,6 @@ bool ov::op::v0::DetectionOutput::visit_attributes(AttributeVisitor& visitor) { } // ------------------------------ V8 ------------------------------ -BWDCMP_RTTI_DEFINITION(ov::op::v8::DetectionOutput); ov::op::v8::DetectionOutput::DetectionOutput(const Output& box_logits, const Output& class_preds, const Output& proposals, diff --git a/src/core/src/op/dft.cpp b/src/core/src/op/dft.cpp index 3787bbc7291..ae02d24dbee 100644 --- a/src/core/src/op/dft.cpp +++ b/src/core/src/op/dft.cpp @@ -31,8 +31,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v7::DFT); - op::v7::DFT::DFT(const Output& data, const Output& axes) : FFTBase(data, axes) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/divide.cpp b/src/core/src/op/divide.cpp index 469fe478b7c..4b11ef64242 100644 --- a/src/core/src/op/divide.cpp +++ b/src/core/src/op/divide.cpp @@ -222,8 +222,6 @@ bool evaluate_bound(const Node* node, const HostTensorVector& output_values, boo // ------------------------------ v1 ------------------------------------------- -BWDCMP_RTTI_DEFINITION(op::v1::Divide); - op::v1::Divide::Divide(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/einsum.cpp b/src/core/src/op/einsum.cpp index 9adc52b687c..1ddfb74c302 100644 --- a/src/core/src/op/einsum.cpp +++ b/src/core/src/op/einsum.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v7::Einsum); - op::v7::Einsum::Einsum(const OutputVector& inputs, const std::string& equation) : Op(inputs), m_equation(equation) { // normalize input equation by removing extra white-spaces from the equation m_equation.erase(std::remove_if(m_equation.begin(), m_equation.end(), ::isspace), m_equation.end()); diff --git a/src/core/src/op/elu.cpp b/src/core/src/op/elu.cpp index 4f943f7bedc..5db968a5995 100644 --- a/src/core/src/op/elu.cpp +++ b/src/core/src/op/elu.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Elu); - op::Elu::Elu(const Output& data, const double alpha) : util::UnaryElementwiseArithmetic(data), m_alpha{alpha} { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/embedding_segments_sum.cpp b/src/core/src/op/embedding_segments_sum.cpp index f030e554d99..8e3b1f314ab 100644 --- a/src/core/src/op/embedding_segments_sum.cpp +++ b/src/core/src/op/embedding_segments_sum.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::EmbeddingSegmentsSum); - op::v3::EmbeddingSegmentsSum::EmbeddingSegmentsSum(const Output& emb_table, const Output& indices, const Output& segment_ids, diff --git a/src/core/src/op/embeddingbag_offsets_sum.cpp b/src/core/src/op/embeddingbag_offsets_sum.cpp index 1ec199c168e..2c92bcf3183 100644 --- a/src/core/src/op/embeddingbag_offsets_sum.cpp +++ b/src/core/src/op/embeddingbag_offsets_sum.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::EmbeddingBagOffsetsSum); - op::v3::EmbeddingBagOffsetsSum::EmbeddingBagOffsetsSum(const Output& emb_table, const Output& indices, const Output& offsets, diff --git a/src/core/src/op/embeddingbag_packedsum.cpp b/src/core/src/op/embeddingbag_packedsum.cpp index 2d4fb01017b..2a7d6681a1f 100644 --- a/src/core/src/op/embeddingbag_packedsum.cpp +++ b/src/core/src/op/embeddingbag_packedsum.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::EmbeddingBagPackedSum); - op::v3::EmbeddingBagPackedSum::EmbeddingBagPackedSum(const Output& emb_table, const Output& indices, const Output& per_sample_weights) diff --git a/src/core/src/op/equal.cpp b/src/core/src/op/equal.cpp index 5cd67e9c33e..07839fc42ce 100644 --- a/src/core/src/op/equal.cpp +++ b/src/core/src/op/equal.cpp @@ -59,9 +59,6 @@ bool evaluate_equal(const HostTensorPtr& arg0, } // namespace equal //------------------------------- v1 ------------------------------------------- - -BWDCMP_RTTI_DEFINITION(op::v1::Equal); - op::v1::Equal::Equal(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseComparison(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/erf.cpp b/src/core/src/op/erf.cpp index e4ab6d99f93..6498dc430cd 100644 --- a/src/core/src/op/erf.cpp +++ b/src/core/src/op/erf.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Erf); - bool ngraph::op::v0::Erf::visit_attributes(AttributeVisitor& visitor) { OV_OP_SCOPE(v0_Erf_visit_attributes); return true; diff --git a/src/core/src/op/exp.cpp b/src/core/src/op/exp.cpp index 95946e5cc9a..98c75081d09 100644 --- a/src/core/src/op/exp.cpp +++ b/src/core/src/op/exp.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Exp); - op::Exp::Exp(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/experimental_detectron_detection_output.cpp b/src/core/src/op/experimental_detectron_detection_output.cpp index 87e79978ffa..53c1a15b190 100644 --- a/src/core/src/op/experimental_detectron_detection_output.cpp +++ b/src/core/src/op/experimental_detectron_detection_output.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v6::ExperimentalDetectronDetectionOutput); - op::v6::ExperimentalDetectronDetectionOutput::ExperimentalDetectronDetectionOutput(const Output& input_rois, const Output& input_deltas, const Output& input_scores, diff --git a/src/core/src/op/experimental_detectron_generate_proposals.cpp b/src/core/src/op/experimental_detectron_generate_proposals.cpp index 281aca5dea0..d7e23ecd6ba 100644 --- a/src/core/src/op/experimental_detectron_generate_proposals.cpp +++ b/src/core/src/op/experimental_detectron_generate_proposals.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v6::ExperimentalDetectronGenerateProposalsSingleImage); - op::v6::ExperimentalDetectronGenerateProposalsSingleImage::ExperimentalDetectronGenerateProposalsSingleImage( const Output& im_info, const Output& anchors, diff --git a/src/core/src/op/experimental_detectron_prior_grid_generator.cpp b/src/core/src/op/experimental_detectron_prior_grid_generator.cpp index b3f4e6ecfd4..510ad5aad7f 100644 --- a/src/core/src/op/experimental_detectron_prior_grid_generator.cpp +++ b/src/core/src/op/experimental_detectron_prior_grid_generator.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v6::ExperimentalDetectronPriorGridGenerator); - op::v6::ExperimentalDetectronPriorGridGenerator::ExperimentalDetectronPriorGridGenerator( const Output& priors, const Output& feature_map, diff --git a/src/core/src/op/experimental_detectron_roi_feature.cpp b/src/core/src/op/experimental_detectron_roi_feature.cpp index d739b1f870c..237e838760a 100644 --- a/src/core/src/op/experimental_detectron_roi_feature.cpp +++ b/src/core/src/op/experimental_detectron_roi_feature.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v6::ExperimentalDetectronROIFeatureExtractor); - op::v6::ExperimentalDetectronROIFeatureExtractor::ExperimentalDetectronROIFeatureExtractor(const OutputVector& args, const Attributes& attrs) : Op(args), diff --git a/src/core/src/op/experimental_detectron_topkrois.cpp b/src/core/src/op/experimental_detectron_topkrois.cpp index 27cb9b9914a..305789b4e3d 100644 --- a/src/core/src/op/experimental_detectron_topkrois.cpp +++ b/src/core/src/op/experimental_detectron_topkrois.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v6::ExperimentalDetectronTopKROIs); - op::v6::ExperimentalDetectronTopKROIs::ExperimentalDetectronTopKROIs(const Output& input_rois, const Output& rois_probs, size_t max_rois) diff --git a/src/core/src/op/extractimagepatches.cpp b/src/core/src/op/extractimagepatches.cpp index b659930251c..9663b0c65d7 100644 --- a/src/core/src/op/extractimagepatches.cpp +++ b/src/core/src/op/extractimagepatches.cpp @@ -14,8 +14,6 @@ using namespace ngraph; // ExtractImagePatches v3 -BWDCMP_RTTI_DEFINITION(op::v3::ExtractImagePatches); - op::v3::ExtractImagePatches::ExtractImagePatches(const Output& image, const ov::Shape& sizes, const Strides& strides, diff --git a/src/core/src/op/fake_quantize.cpp b/src/core/src/op/fake_quantize.cpp index c9d48a19502..a074ffff311 100644 --- a/src/core/src/op/fake_quantize.cpp +++ b/src/core/src/op/fake_quantize.cpp @@ -18,8 +18,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::FakeQuantize); - op::FakeQuantize::FakeQuantize() : Op(), m_levels() {} op::FakeQuantize::FakeQuantize(const Output& data, diff --git a/src/core/src/op/floor.cpp b/src/core/src/op/floor.cpp index b0b63881dd9..e247a449a83 100644 --- a/src/core/src/op/floor.cpp +++ b/src/core/src/op/floor.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Floor); - op::Floor::Floor(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/floor_mod.cpp b/src/core/src/op/floor_mod.cpp index 292f9a828db..c0caa663ab2 100644 --- a/src/core/src/op/floor_mod.cpp +++ b/src/core/src/op/floor_mod.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::FloorMod); - op::v1::FloorMod::FloorMod(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/gather.cpp b/src/core/src/op/gather.cpp index 4ae2190acc2..2c82b68b84a 100644 --- a/src/core/src/op/gather.cpp +++ b/src/core/src/op/gather.cpp @@ -12,9 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::Gather); -BWDCMP_RTTI_DEFINITION(op::v8::Gather); - op::v1::Gather::Gather(const Output& params, const Output& indices, const Output& axes) : GatherBase(params, indices, axes) { constructor_validate_and_infer_types(); @@ -37,8 +34,6 @@ shared_ptr op::v1::Gather::clone_with_new_inputs(const OutputVector& new_a return make_shared(new_args.at(0), new_args.at(1), new_args.at(2)); } -BWDCMP_RTTI_DEFINITION(op::v7::Gather); - op::v7::Gather::Gather(const Output& data, const Output& indices, const Output& axis, diff --git a/src/core/src/op/gather_elements.cpp b/src/core/src/op/gather_elements.cpp index 98e83dc03b3..f35276e9850 100644 --- a/src/core/src/op/gather_elements.cpp +++ b/src/core/src/op/gather_elements.cpp @@ -14,8 +14,6 @@ using namespace ngraph; // ------------------------------ V6 ------------------------------ -BWDCMP_RTTI_DEFINITION(op::v6::GatherElements); - op::v6::GatherElements::GatherElements(const Output& data, const Output& indices, const int64_t axis) : Op({data, indices}), m_axis(axis) { diff --git a/src/core/src/op/gather_nd.cpp b/src/core/src/op/gather_nd.cpp index 67e706ea0e1..d28671655df 100644 --- a/src/core/src/op/gather_nd.cpp +++ b/src/core/src/op/gather_nd.cpp @@ -11,9 +11,6 @@ using namespace std; using namespace ngraph; // ------------------------------ V5 ------------------------------ - -BWDCMP_RTTI_DEFINITION(op::v5::GatherND); - op::v5::GatherND::GatherND(const Output& data, const Output& indices, const size_t batch_dims) : GatherNDBase(data, indices, batch_dims) { constructor_validate_and_infer_types(); @@ -62,8 +59,6 @@ shared_ptr op::v5::GatherND::clone_with_new_inputs(const OutputVector& new } // ------------------------------ V8 ------------------------------ -BWDCMP_RTTI_DEFINITION(op::v8::GatherND); - op::v8::GatherND::GatherND(const Output& data, const Output& indices, const size_t batch_dims) : GatherNDBase(data, indices, batch_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/gather_tree.cpp b/src/core/src/op/gather_tree.cpp index 263c53abbbd..8dfc9c11eab 100644 --- a/src/core/src/op/gather_tree.cpp +++ b/src/core/src/op/gather_tree.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::GatherTree); - op::v1::GatherTree::GatherTree(const Output& step_ids, const Output& parent_idx, const Output& max_seq_len, diff --git a/src/core/src/op/gelu.cpp b/src/core/src/op/gelu.cpp index 58f9fca34a0..73ddffda781 100644 --- a/src/core/src/op/gelu.cpp +++ b/src/core/src/op/gelu.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; // ------------------------------ V0 ------------------------------ -BWDCMP_RTTI_DEFINITION(op::v0::Gelu); - op::v0::Gelu::Gelu() : UnaryElementwiseArithmetic() {} op::v0::Gelu::Gelu(const Output& data) : UnaryElementwiseArithmetic(data) { @@ -63,12 +61,8 @@ NGRAPH_API EnumNames& EnumNames); } // namespace ov -BWDCMP_RTTI_DEFINITION(op::v7::Gelu); - op::v7::Gelu::Gelu(const Output& data, GeluApproximationMode mode) : UnaryElementwiseArithmetic(data), m_approximation_mode(mode) { diff --git a/src/core/src/op/greater.cpp b/src/core/src/op/greater.cpp index 554a856a5da..768cec3d7cd 100644 --- a/src/core/src/op/greater.cpp +++ b/src/core/src/op/greater.cpp @@ -52,8 +52,6 @@ bool evaluate_greater(const HostTensorPtr& arg0, //-------------------------------------- v1 ------------------------------------ -BWDCMP_RTTI_DEFINITION(op::v1::Greater); - op::v1::Greater::Greater(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseComparison(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/greater_eq.cpp b/src/core/src/op/greater_eq.cpp index 637a53710b1..76636e02d0a 100644 --- a/src/core/src/op/greater_eq.cpp +++ b/src/core/src/op/greater_eq.cpp @@ -53,8 +53,6 @@ bool evaluate_greater_equal(const HostTensorPtr& arg0, //---------------------------------- v1 ---------------------------------------- -BWDCMP_RTTI_DEFINITION(op::v1::GreaterEqual); - op::v1::GreaterEqual::GreaterEqual(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) diff --git a/src/core/src/op/grn.cpp b/src/core/src/op/grn.cpp index 6d024b525f5..6b2b194cc62 100644 --- a/src/core/src/op/grn.cpp +++ b/src/core/src/op/grn.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::GRN); - op::v0::GRN::GRN(const Output& data, float bias) : util::UnaryElementwiseArithmetic(data), m_bias(bias) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/group_conv.cpp b/src/core/src/op/group_conv.cpp index 5778731c6a4..9cff3bfed6a 100644 --- a/src/core/src/op/group_conv.cpp +++ b/src/core/src/op/group_conv.cpp @@ -18,8 +18,6 @@ using namespace ngraph; // v1::GroupConvolution //------------------------------------------------------------------------------ -BWDCMP_RTTI_DEFINITION(op::v1::GroupConvolution); - shared_ptr op::v1::GroupConvolution::get_default_value() const { return op::v0::Constant::create(get_element_type(), get_shape(), {0}); } @@ -117,8 +115,6 @@ shared_ptr op::v1::GroupConvolution::clone_with_new_inputs(const OutputVec // v1::GroupConvolutionBackpropData //------------------------------------------------------------------------------ -BWDCMP_RTTI_DEFINITION(op::v1::GroupConvolutionBackpropData); - op::v1::GroupConvolutionBackpropData::GroupConvolutionBackpropData() : Op(), m_strides(), diff --git a/src/core/src/op/gru_cell.cpp b/src/core/src/op/gru_cell.cpp index cc320a6bfea..3a6399725df 100644 --- a/src/core/src/op/gru_cell.cpp +++ b/src/core/src/op/gru_cell.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::GRUCell); - op::v3::GRUCell::GRUCell() : m_linear_before_reset(false) { m_activations = {"sigmoid", "tanh"}; m_activation_f = get_activation_function(0); diff --git a/src/core/src/op/gru_sequence.cpp b/src/core/src/op/gru_sequence.cpp index f8ed8c5957d..59f76be221a 100644 --- a/src/core/src/op/gru_sequence.cpp +++ b/src/core/src/op/gru_sequence.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v5::GRUSequence); - op::v5::GRUSequence::GRUSequence() : m_direction(op::RecurrentSequenceDirection::FORWARD), m_linear_before_reset(false) {} diff --git a/src/core/src/op/hard_sigmoid.cpp b/src/core/src/op/hard_sigmoid.cpp index 7a7c333eab9..c487d8b8b11 100644 --- a/src/core/src/op/hard_sigmoid.cpp +++ b/src/core/src/op/hard_sigmoid.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::HardSigmoid); - op::v0::HardSigmoid::HardSigmoid() : Op() {} op::v0::HardSigmoid::HardSigmoid(const Output& data, const Output& alpha, const Output& beta) diff --git a/src/core/src/op/hsigmoid.cpp b/src/core/src/op/hsigmoid.cpp index cc20fb6ed9f..cc38d3405af 100644 --- a/src/core/src/op/hsigmoid.cpp +++ b/src/core/src/op/hsigmoid.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v5::HSigmoid); - op::v5::HSigmoid::HSigmoid(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/hswish.cpp b/src/core/src/op/hswish.cpp index 6716efcfbec..23ec4bdd895 100644 --- a/src/core/src/op/hswish.cpp +++ b/src/core/src/op/hswish.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v4::HSwish); - op::v4::HSwish::HSwish(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/i420_to_bgr.cpp b/src/core/src/op/i420_to_bgr.cpp index 7729ae94e27..fba9ec1f520 100644 --- a/src/core/src/op/i420_to_bgr.cpp +++ b/src/core/src/op/i420_to_bgr.cpp @@ -6,8 +6,6 @@ #include "itt.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::v8::I420toBGR); - ov::op::v8::I420toBGR::I420toBGR(const Output& arg) : util::ConvertColorI420Base(arg, util::ConvertColorI420Base::ColorConversion::I420_TO_BGR) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/i420_to_rgb.cpp b/src/core/src/op/i420_to_rgb.cpp index 9db20bd8771..29266037d33 100644 --- a/src/core/src/op/i420_to_rgb.cpp +++ b/src/core/src/op/i420_to_rgb.cpp @@ -6,8 +6,6 @@ #include "itt.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::v8::I420toRGB); - ov::op::v8::I420toRGB::I420toRGB(const Output& arg) : util::ConvertColorI420Base(arg, util::ConvertColorI420Base::ColorConversion::I420_TO_RGB) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/idft.cpp b/src/core/src/op/idft.cpp index 46a67b876ef..a9a34de7db5 100644 --- a/src/core/src/op/idft.cpp +++ b/src/core/src/op/idft.cpp @@ -18,8 +18,6 @@ using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v7::IDFT); - op::v7::IDFT::IDFT(const Output& data, const Output& axes) : FFTBase(data, axes) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/if.cpp b/src/core/src/op/if.cpp index ef87b343a27..e9fff4b531d 100644 --- a/src/core/src/op/if.cpp +++ b/src/core/src/op/if.cpp @@ -17,7 +17,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::v8::If); ov::op::v8::If::If() : MultiSubGraphOp(2) {} ov::op::v8::If::If(const Output& execution_condition) : If() { diff --git a/src/core/src/op/interpolate.cpp b/src/core/src/op/interpolate.cpp index 9bf5efe635e..40e9ded1a6b 100644 --- a/src/core/src/op/interpolate.cpp +++ b/src/core/src/op/interpolate.cpp @@ -19,8 +19,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Interpolate); - op::v0::Interpolate::Interpolate(const Output& image, const Output& output_shape, const Attributes& attrs) : Op({image, output_shape}), m_attrs(attrs) { @@ -77,15 +75,9 @@ EnumNames::get() { {"area", ngraph::op::v0::Interpolate::InterpolateMode::AREA}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - } // namespace ov // Interpolate v4 - -BWDCMP_RTTI_DEFINITION(op::v4::Interpolate); - op::v4::Interpolate::Interpolate(const Output& image, const Output& output_shape, const Output& scales, @@ -504,8 +496,6 @@ EnumNames::get() { return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - template <> NGRAPH_API EnumNames& EnumNames::get() { @@ -515,7 +505,6 @@ EnumNames::get() { {"scales", ngraph::op::v4::Interpolate::ShapeCalcMode::SCALES}}); return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); template <> NGRAPH_API EnumNames& @@ -530,8 +519,6 @@ EnumNames::get() { return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - template <> NGRAPH_API EnumNames& EnumNames::get() { @@ -545,8 +532,6 @@ EnumNames::get() { return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - std::ostream& operator<<(std::ostream& s, const op::v4::Interpolate::InterpolateMode& type) { return s << as_string(type); } diff --git a/src/core/src/op/irdft.cpp b/src/core/src/op/irdft.cpp index 09602461b91..ffb79f3c9b0 100644 --- a/src/core/src/op/irdft.cpp +++ b/src/core/src/op/irdft.cpp @@ -11,8 +11,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::v9::IRDFT); - ov::op::v9::IRDFT::IRDFT(const Output& data, const Output& axes) : FFTBase(data, axes) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/less.cpp b/src/core/src/op/less.cpp index 96e4952f299..883bec65d79 100644 --- a/src/core/src/op/less.cpp +++ b/src/core/src/op/less.cpp @@ -51,9 +51,6 @@ bool evaluate_less(const HostTensorPtr& arg0, } // namespace lessop // ----------------------------- v1 -------------------------------------------- - -BWDCMP_RTTI_DEFINITION(op::v1::Less); - op::v1::Less::Less(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseComparison(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/less_eq.cpp b/src/core/src/op/less_eq.cpp index 222612830d7..63ec94898c2 100644 --- a/src/core/src/op/less_eq.cpp +++ b/src/core/src/op/less_eq.cpp @@ -13,8 +13,6 @@ using namespace ngraph; // ---------------------------------- v1 --------------------------------------- -BWDCMP_RTTI_DEFINITION(op::v1::LessEqual); - op::v1::LessEqual::LessEqual(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) diff --git a/src/core/src/op/log.cpp b/src/core/src/op/log.cpp index 71de8744269..2799c9aa6dc 100644 --- a/src/core/src/op/log.cpp +++ b/src/core/src/op/log.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Log); - op::Log::Log(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/log_softmax.cpp b/src/core/src/op/log_softmax.cpp index 545bbd140a4..0e8557db12d 100644 --- a/src/core/src/op/log_softmax.cpp +++ b/src/core/src/op/log_softmax.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v5::LogSoftmax); - op::v5::LogSoftmax::LogSoftmax(const Output& arg, const int64_t axis) : Op({arg}), m_axis(axis) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/logical_and.cpp b/src/core/src/op/logical_and.cpp index b484a7170b6..3fdf7d9ad8d 100644 --- a/src/core/src/op/logical_and.cpp +++ b/src/core/src/op/logical_and.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v1::LogicalAnd); - op::v1::LogicalAnd::LogicalAnd(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) diff --git a/src/core/src/op/logical_not.cpp b/src/core/src/op/logical_not.cpp index c9487010428..e6cdcfa4e75 100644 --- a/src/core/src/op/logical_not.cpp +++ b/src/core/src/op/logical_not.cpp @@ -13,8 +13,6 @@ using namespace ngraph; using namespace std; -BWDCMP_RTTI_DEFINITION(op::v1::LogicalNot); - op::v1::LogicalNot::LogicalNot(const Output& arg) : Op({arg}) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/logical_or.cpp b/src/core/src/op/logical_or.cpp index f8a9daa72a3..9966528f6da 100644 --- a/src/core/src/op/logical_or.cpp +++ b/src/core/src/op/logical_or.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::LogicalOr); - op::v1::LogicalOr::LogicalOr(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) diff --git a/src/core/src/op/loop.cpp b/src/core/src/op/loop.cpp index 766e10ea07f..cddb848771e 100644 --- a/src/core/src/op/loop.cpp +++ b/src/core/src/op/loop.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v5::Loop); - op::v5::Loop::Loop(const Output& trip_count, const Output& execution_condition) : SubGraphOp() { set_argument(0, trip_count); set_argument(1, execution_condition); @@ -377,5 +375,3 @@ void op::v5::Loop::clone_to(op::v5::Loop& dst, const OutputVector& new_args) con op::v5::Loop::Loop(const op::v5::Loop& other) : SubGraphOp() { other.clone_to(*this, other.input_values()); } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/op/lrn.cpp b/src/core/src/op/lrn.cpp index 7a212c9d4e6..53a81cfc569 100644 --- a/src/core/src/op/lrn.cpp +++ b/src/core/src/op/lrn.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::LRN); - op::LRN::LRN(const Output& arg, double alpha, double beta, double bias, size_t size) : LRN(arg, op::v0::Constant::create(element::i64, ov::Shape{1}, {1}), alpha, beta, bias, size) {} diff --git a/src/core/src/op/lstm_cell.cpp b/src/core/src/op/lstm_cell.cpp index b2bf165d988..290fc85345c 100644 --- a/src/core/src/op/lstm_cell.cpp +++ b/src/core/src/op/lstm_cell.cpp @@ -18,9 +18,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::LSTMCell); -BWDCMP_RTTI_DEFINITION(op::v4::LSTMCell); - op::v0::LSTMCell::LSTMCell() : m_input_forget(false), m_weights_format(LSTMWeightsFormat::IFCO) { m_activations = {"sigmoid", "tanh", "tanh"}; m_activation_f = get_activation_function(0); @@ -251,8 +248,6 @@ NGRAPH_API EnumNames& EnumNames); - ov::op::util::LSTMWeightsFormat op::convert_lstm_weights_enums(op::LSTMWeightsFormat format) { switch (format) { case LSTMWeightsFormat::FICO: diff --git a/src/core/src/op/lstm_sequence.cpp b/src/core/src/op/lstm_sequence.cpp index 0dfc8fef0bd..34117298a23 100644 --- a/src/core/src/op/lstm_sequence.cpp +++ b/src/core/src/op/lstm_sequence.cpp @@ -16,9 +16,6 @@ using namespace ngraph; using namespace std; -BWDCMP_RTTI_DEFINITION(op::v0::LSTMSequence); -BWDCMP_RTTI_DEFINITION(op::v5::LSTMSequence); - op::v0::LSTMSequence::LSTMSequence() : Op(), m_activations_alpha(), diff --git a/src/core/src/op/matmul.cpp b/src/core/src/op/matmul.cpp index 7996b810fc1..388163997b2 100644 --- a/src/core/src/op/matmul.cpp +++ b/src/core/src/op/matmul.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::MatMul); - op::MatMul::MatMul(const Output& A, const Output& B, const bool& transpose_a, const bool& transpose_b) : Op(OutputVector{A, B}), m_transpose_a{transpose_a}, diff --git a/src/core/src/op/matrix_nms.cpp b/src/core/src/op/matrix_nms.cpp index 047010dbc95..e946b94cc24 100644 --- a/src/core/src/op/matrix_nms.cpp +++ b/src/core/src/op/matrix_nms.cpp @@ -17,7 +17,6 @@ #include "ngraph/util.hpp" using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v8::MatrixNms); op::v8::MatrixNms::MatrixNms(const Output& boxes, const Output& scores, const Attributes& attrs) : Op({boxes, scores}), @@ -153,9 +152,6 @@ EnumNames::get() { {"linear", ngraph::op::v8::MatrixNms::DecayFunction::LINEAR}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - } // namespace ov std::ostream& ov::operator<<(std::ostream& s, const op::v8::MatrixNms::SortResultType& type) { @@ -172,7 +168,4 @@ NGRAPH_API EnumNames& EnumNames); - } // namespace ov diff --git a/src/core/src/op/max_pool.cpp b/src/core/src/op/max_pool.cpp index 3eef7a48034..0cb60f0e6c2 100644 --- a/src/core/src/op/max_pool.cpp +++ b/src/core/src/op/max_pool.cpp @@ -15,9 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::MaxPool); -BWDCMP_RTTI_DEFINITION(op::v8::MaxPool); - op::v1::MaxPool::MaxPool(const Output& arg, const Strides& strides, const ov::Shape& pads_begin, diff --git a/src/core/src/op/maximum.cpp b/src/core/src/op/maximum.cpp index 1eff16d7b3b..24cc91f5682 100644 --- a/src/core/src/op/maximum.cpp +++ b/src/core/src/op/maximum.cpp @@ -59,8 +59,6 @@ bool evaluate_maximum(const HostTensorPtr& arg0, // ------------------------------------ v1 ------------------------------------- -BWDCMP_RTTI_DEFINITION(op::v1::Maximum); - op::v1::Maximum::Maximum(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/minimum.cpp b/src/core/src/op/minimum.cpp index 5a0f9d304cd..ff262c8a500 100644 --- a/src/core/src/op/minimum.cpp +++ b/src/core/src/op/minimum.cpp @@ -59,8 +59,6 @@ bool evaluate_minimum(const HostTensorPtr& arg0, // ------------------------------ v1 ------------------------------------------- -BWDCMP_RTTI_DEFINITION(op::v1::Minimum); - op::v1::Minimum::Minimum(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/mish.cpp b/src/core/src/op/mish.cpp index ad0864944a8..c956f0c9413 100644 --- a/src/core/src/op/mish.cpp +++ b/src/core/src/op/mish.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v4::Mish); - op::v4::Mish::Mish(const Output& arg) : util::UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/mod.cpp b/src/core/src/op/mod.cpp index 3ef04559041..7063f3621a1 100644 --- a/src/core/src/op/mod.cpp +++ b/src/core/src/op/mod.cpp @@ -11,8 +11,6 @@ using namespace ngraph; // ------------------------------ v1 ------------------------------------------- -BWDCMP_RTTI_DEFINITION(op::v1::Mod); - op::v1::Mod::Mod(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/multiclass_nms.cpp b/src/core/src/op/multiclass_nms.cpp index 943c14f5544..d50a868da52 100644 --- a/src/core/src/op/multiclass_nms.cpp +++ b/src/core/src/op/multiclass_nms.cpp @@ -10,9 +10,6 @@ using namespace ngraph; using namespace op::util; -BWDCMP_RTTI_DEFINITION(op::v8::MulticlassNms); -BWDCMP_RTTI_DEFINITION(op::v9::MulticlassNms); - // ------------------------------ V8 ------------------------------ op::v8::MulticlassNms::MulticlassNms(const Output& boxes, const Output& scores, const Attributes& attrs) diff --git a/src/core/src/op/multiply.cpp b/src/core/src/op/multiply.cpp index e068b733787..a3834c330fe 100644 --- a/src/core/src/op/multiply.cpp +++ b/src/core/src/op/multiply.cpp @@ -54,9 +54,6 @@ bool evaluate_multiply(const HostTensorPtr& arg0, } // namespace multiplyop // ------------------------------------ v1 ------------------------------------- - -BWDCMP_RTTI_DEFINITION(op::v1::Multiply); - op::v1::Multiply::Multiply(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/mvn.cpp b/src/core/src/op/mvn.cpp index 8562ba60b15..572040c7b4c 100644 --- a/src/core/src/op/mvn.cpp +++ b/src/core/src/op/mvn.cpp @@ -13,9 +13,6 @@ using namespace std; using namespace ngraph; // ------------------------------ V0 ------------------------------ - -BWDCMP_RTTI_DEFINITION(op::v0::MVN); - op::v0::MVN::MVN(const Output& data, bool across_channels, bool normalize_variance, double eps) : Op({data}), m_eps{eps}, @@ -79,17 +76,12 @@ NGRAPH_API EnumNames& EnumNames: {{"OUTSIDE_SQRT", ngraph::op::MVNEpsMode::OUTSIDE_SQRT}, {"INSIDE_SQRT", ngraph::op::MVNEpsMode::INSIDE_SQRT}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - } // namespace ov std::ostream& ov::op::operator<<(std::ostream& s, const ngraph::op::MVNEpsMode& type) { return s << as_string(type); } -BWDCMP_RTTI_DEFINITION(op::v6::MVN); - op::v6::MVN::MVN(const Output& data, const Output& reduction_axes, bool normalize_variance, diff --git a/src/core/src/op/negative.cpp b/src/core/src/op/negative.cpp index 83ae829cf12..c16881cb4a8 100644 --- a/src/core/src/op/negative.cpp +++ b/src/core/src/op/negative.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Negative); - op::Negative::Negative(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/non_max_suppression.cpp b/src/core/src/op/non_max_suppression.cpp index 842fbc6957a..dcec15ba49f 100644 --- a/src/core/src/op/non_max_suppression.cpp +++ b/src/core/src/op/non_max_suppression.cpp @@ -21,8 +21,6 @@ using namespace ngraph; // ------------------------------ V1 ------------------------------ -BWDCMP_RTTI_DEFINITION(op::v1::NonMaxSuppression); - op::v1::NonMaxSuppression::NonMaxSuppression(const Output& boxes, const Output& scores, const Output& max_output_boxes_per_class, @@ -186,9 +184,6 @@ EnumNames::get() { {"center", ngraph::op::v1::NonMaxSuppression::BoxEncodingType::CENTER}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - } // namespace ov std::ostream& ov::operator<<(std::ostream& s, const op::v1::NonMaxSuppression::BoxEncodingType& type) { @@ -196,8 +191,6 @@ std::ostream& ov::operator<<(std::ostream& s, const op::v1::NonMaxSuppression::B } // ------------------------------ V3 ------------------------------ -BWDCMP_RTTI_DEFINITION(op::v3::NonMaxSuppression); - op::v3::NonMaxSuppression::NonMaxSuppression(const Output& boxes, const Output& scores, const Output& max_output_boxes_per_class, @@ -374,9 +367,6 @@ EnumNames::get() { {"center", ngraph::op::v3::NonMaxSuppression::BoxEncodingType::CENTER}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - } // namespace ov std::ostream& ov::operator<<(std::ostream& s, const op::v3::NonMaxSuppression::BoxEncodingType& type) { @@ -384,9 +374,6 @@ std::ostream& ov::operator<<(std::ostream& s, const op::v3::NonMaxSuppression::B } // ------------------------------ V4 ------------------------------ - -BWDCMP_RTTI_DEFINITION(op::v4::NonMaxSuppression); - op::v4::NonMaxSuppression::NonMaxSuppression(const Output& boxes, const Output& scores, const Output& max_output_boxes_per_class, @@ -471,9 +458,6 @@ void op::v4::NonMaxSuppression::validate_and_infer_types() { } // ------------------------------ V5 ------------------------------ - -BWDCMP_RTTI_DEFINITION(op::v5::NonMaxSuppression); - op::v5::NonMaxSuppression::NonMaxSuppression(const Output& boxes, const Output& scores, const op::v5::NonMaxSuppression::BoxEncodingType box_encoding, @@ -834,14 +818,9 @@ EnumNames::get() { {"center", ngraph::op::v5::NonMaxSuppression::BoxEncodingType::CENTER}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); } // namespace ov // ------------------------------ V9 ------------------------------ - -BWDCMP_RTTI_DEFINITION(op::v9::NonMaxSuppression); - op::v9::NonMaxSuppression::NonMaxSuppression(const Output& boxes, const Output& scores, const op::v9::NonMaxSuppression::BoxEncodingType box_encoding, @@ -1137,6 +1116,4 @@ EnumNames::get() { {"center", ngraph::op::v9::NonMaxSuppression::BoxEncodingType::CENTER}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); } // namespace ov diff --git a/src/core/src/op/non_zero.cpp b/src/core/src/op/non_zero.cpp index a155257b8f6..dc50b716236 100644 --- a/src/core/src/op/non_zero.cpp +++ b/src/core/src/op/non_zero.cpp @@ -16,8 +16,6 @@ using namespace ngraph; using namespace std; -BWDCMP_RTTI_DEFINITION(op::v3::NonZero); - op::v3::NonZero::NonZero(const Output& arg) : Op({arg}) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/normalize_l2.cpp b/src/core/src/op/normalize_l2.cpp index 7a06f3b22d2..2a6152fa466 100644 --- a/src/core/src/op/normalize_l2.cpp +++ b/src/core/src/op/normalize_l2.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::NormalizeL2); - op::v0::NormalizeL2::NormalizeL2(const Output& data, const Output& axes, float eps, EpsMode eps_mode) : Op({data, axes}), m_eps(eps), diff --git a/src/core/src/op/not_equal.cpp b/src/core/src/op/not_equal.cpp index 0d990e85576..533e7b740d0 100644 --- a/src/core/src/op/not_equal.cpp +++ b/src/core/src/op/not_equal.cpp @@ -52,9 +52,6 @@ bool evaluate_not_equal(const HostTensorPtr& arg0, } // namespace not_equalop // ----------------------------------- v1 -------------------------------------- - -BWDCMP_RTTI_DEFINITION(op::v1::NotEqual); - op::v1::NotEqual::NotEqual(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseComparison(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/nv12_to_bgr.cpp b/src/core/src/op/nv12_to_bgr.cpp index 64a74527d70..ad905df14ce 100644 --- a/src/core/src/op/nv12_to_bgr.cpp +++ b/src/core/src/op/nv12_to_bgr.cpp @@ -6,8 +6,6 @@ #include "itt.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::v8::NV12toBGR); - ov::op::v8::NV12toBGR::NV12toBGR(const Output& arg) : util::ConvertColorNV12Base(arg, util::ConvertColorNV12Base::ColorConversion::NV12_TO_BGR) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/nv12_to_rgb.cpp b/src/core/src/op/nv12_to_rgb.cpp index afe10eedb2e..370e1901258 100644 --- a/src/core/src/op/nv12_to_rgb.cpp +++ b/src/core/src/op/nv12_to_rgb.cpp @@ -6,8 +6,6 @@ #include "itt.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::v8::NV12toRGB); - ov::op::v8::NV12toRGB::NV12toRGB(const Output& arg) : util::ConvertColorNV12Base(arg, util::ConvertColorNV12Base::ColorConversion::NV12_TO_RGB) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/one_hot.cpp b/src/core/src/op/one_hot.cpp index 63411bc471b..dde7fbba3da 100644 --- a/src/core/src/op/one_hot.cpp +++ b/src/core/src/op/one_hot.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::OneHot); - op::v1::OneHot::OneHot(const Output& indices, const Output& depth, const Output& on_value, diff --git a/src/core/src/op/pad.cpp b/src/core/src/op/pad.cpp index 71d09c3471f..346654ba5f8 100644 --- a/src/core/src/op/pad.cpp +++ b/src/core/src/op/pad.cpp @@ -19,8 +19,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::Pad); - op::v1::Pad::Pad(const Output& arg, const Output& pads_begin, const Output& pads_end, diff --git a/src/core/src/op/parameter.cpp b/src/core/src/op/parameter.cpp index 52193974ecc..bc23b5e827a 100644 --- a/src/core/src/op/parameter.cpp +++ b/src/core/src/op/parameter.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Parameter); - op::Parameter::Parameter(const element::Type& element_type, const ov::PartialShape& pshape) : m_partial_shape(pshape), m_element_type(element_type), @@ -69,8 +67,6 @@ void op::Parameter::set_partial_shape(const PartialShape& partial_shape) { m_partial_shape = partial_shape; } -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); - ov::AttributeAdapter::AttributeAdapter(ParameterVector& ref) : m_ref(ref) {} bool ov::AttributeAdapter::visit_attributes(AttributeVisitor& visitor) { diff --git a/src/core/src/op/power.cpp b/src/core/src/op/power.cpp index b331263f08c..404a111fa26 100644 --- a/src/core/src/op/power.cpp +++ b/src/core/src/op/power.cpp @@ -54,9 +54,6 @@ bool evaluate_power(const HostTensorPtr& arg0, } // namespace power // ------------------------------ v1 ------------------------------------------- - -BWDCMP_RTTI_DEFINITION(op::v1::Power); - op::v1::Power::Power(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/prelu.cpp b/src/core/src/op/prelu.cpp index efc2386667c..f2f3c0c7bc2 100644 --- a/src/core/src/op/prelu.cpp +++ b/src/core/src/op/prelu.cpp @@ -11,8 +11,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::v0::PRelu); - ov::op::v0::PRelu::PRelu() : Op() {} ov::op::v0::PRelu::PRelu(const Output& data, const Output& slope) : Op({data, slope}) { diff --git a/src/core/src/op/prior_box.cpp b/src/core/src/op/prior_box.cpp index 30992cf7de0..4327e68998a 100644 --- a/src/core/src/op/prior_box.cpp +++ b/src/core/src/op/prior_box.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::PriorBox); - op::v0::PriorBox::PriorBox(const Output& layer_shape, const Output& image_shape, const PriorBox::Attributes& attrs) @@ -204,9 +202,6 @@ bool op::v0::PriorBox::has_evaluate() const { } // ------------------------------ V8 ------------------------------ - -BWDCMP_RTTI_DEFINITION(op::v8::PriorBox); - op::v8::PriorBox::PriorBox(const Output& layer_shape, const Output& image_shape, const PriorBox::Attributes& attrs) diff --git a/src/core/src/op/prior_box_clustered.cpp b/src/core/src/op/prior_box_clustered.cpp index 57e3f865b34..6f902d10012 100644 --- a/src/core/src/op/prior_box_clustered.cpp +++ b/src/core/src/op/prior_box_clustered.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::PriorBoxClustered); - ov::op::v0::PriorBoxClustered::PriorBoxClustered(const Output& layer_shape, const Output& image_shape, const Attributes& attrs) diff --git a/src/core/src/op/proposal.cpp b/src/core/src/op/proposal.cpp index 7d636b95e95..c29c1f9ee02 100644 --- a/src/core/src/op/proposal.cpp +++ b/src/core/src/op/proposal.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Proposal); - op::v0::Proposal::Proposal(const Output& class_probs, const Output& bbox_deltas, const Output& image_shape, @@ -79,8 +77,6 @@ bool op::v0::Proposal::visit_attributes(AttributeVisitor& visitor) { return true; } -BWDCMP_RTTI_DEFINITION(op::v4::Proposal); - op::v4::Proposal::Proposal(const Output& class_probs, const Output& class_bbox_deltas, const Output& image_shape, diff --git a/src/core/src/op/psroi_pooling.cpp b/src/core/src/op/psroi_pooling.cpp index f49364de1b2..10579f1aa48 100644 --- a/src/core/src/op/psroi_pooling.cpp +++ b/src/core/src/op/psroi_pooling.cpp @@ -10,8 +10,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::PSROIPooling); - ov::op::v0::PSROIPooling::PSROIPooling(const Output& input, const Output& coords, const size_t output_dim, diff --git a/src/core/src/op/random_uniform.cpp b/src/core/src/op/random_uniform.cpp index 4f945a864e6..0df2b7222f4 100644 --- a/src/core/src/op/random_uniform.cpp +++ b/src/core/src/op/random_uniform.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v8::RandomUniform); - op::v8::RandomUniform::RandomUniform(const Output& out_shape, const Output& min_val, const Output& max_val, diff --git a/src/core/src/op/range.cpp b/src/core/src/op/range.cpp index 1fd3e491c3c..32e268d70ca 100644 --- a/src/core/src/op/range.cpp +++ b/src/core/src/op/range.cpp @@ -44,8 +44,6 @@ check_value(T value) { return value == value && value_minus_value == value_minus_value; } -BWDCMP_RTTI_DEFINITION(op::v4::Range); - op::v4::Range::Range(const Output& start, const Output& stop, const Output& step, @@ -236,8 +234,6 @@ bool op::v4::Range::has_evaluate() const { return false; } -BWDCMP_RTTI_DEFINITION(op::v0::Range); - op::v0::Range::Range(const Output& start, const Output& stop, const Output& step) : Op({start, stop, step}) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/rdft.cpp b/src/core/src/op/rdft.cpp index 300bcb37580..c0ce51e9c3b 100644 --- a/src/core/src/op/rdft.cpp +++ b/src/core/src/op/rdft.cpp @@ -11,8 +11,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::v9::RDFT); - ov::op::v9::RDFT::RDFT(const Output& data, const Output& axes) : FFTBase(data, axes) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/read_value.cpp b/src/core/src/op/read_value.cpp index a3f6fd16422..d452bb30f5a 100644 --- a/src/core/src/op/read_value.cpp +++ b/src/core/src/op/read_value.cpp @@ -13,9 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v3::ReadValue); -BWDCMP_RTTI_DEFINITION(ov::op::v6::ReadValue); - op::v3::ReadValue::ReadValue(const Output& init_value, const std::string& variable_id) : ReadValueBase({init_value}), m_variable_id(variable_id) { diff --git a/src/core/src/op/reduce_l1.cpp b/src/core/src/op/reduce_l1.cpp index 15070e4dabf..ba007acdc21 100644 --- a/src/core/src/op/reduce_l1.cpp +++ b/src/core/src/op/reduce_l1.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v4::ReduceL1); - op::v4::ReduceL1::ReduceL1(const Output& arg, const Output& reduction_axes, bool keep_dims) : ArithmeticReductionKeepDims(arg, reduction_axes, keep_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/reduce_l2.cpp b/src/core/src/op/reduce_l2.cpp index 8b0a85c8e79..bfea40b3c77 100644 --- a/src/core/src/op/reduce_l2.cpp +++ b/src/core/src/op/reduce_l2.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v4::ReduceL2); - op::v4::ReduceL2::ReduceL2(const Output& arg, const Output& reduction_axes, bool keep_dims) : ArithmeticReductionKeepDims(arg, reduction_axes, keep_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/reduce_logical_and.cpp b/src/core/src/op/reduce_logical_and.cpp index 9803fc2a724..b9a077337a0 100644 --- a/src/core/src/op/reduce_logical_and.cpp +++ b/src/core/src/op/reduce_logical_and.cpp @@ -15,8 +15,6 @@ using namespace ngraph; using namespace std; -BWDCMP_RTTI_DEFINITION(op::v1::ReduceLogicalAnd); - op::v1::ReduceLogicalAnd::ReduceLogicalAnd(const Output& data, const Output& reduction_axes, const bool keep_dims) diff --git a/src/core/src/op/reduce_logical_or.cpp b/src/core/src/op/reduce_logical_or.cpp index 13aca9e7038..01cc6a5bc58 100644 --- a/src/core/src/op/reduce_logical_or.cpp +++ b/src/core/src/op/reduce_logical_or.cpp @@ -15,8 +15,6 @@ using namespace ngraph; using namespace std; -BWDCMP_RTTI_DEFINITION(op::v1::ReduceLogicalOr); - op::v1::ReduceLogicalOr::ReduceLogicalOr(const Output& data, const Output& reduction_axes, const bool keep_dims) diff --git a/src/core/src/op/reduce_max.cpp b/src/core/src/op/reduce_max.cpp index 762272f3e87..1d25555d2b2 100644 --- a/src/core/src/op/reduce_max.cpp +++ b/src/core/src/op/reduce_max.cpp @@ -42,8 +42,6 @@ bool evaluate_max(const HostTensorPtr& arg, const HostTensorPtr& out, const Axis } // namespace } // namespace maxop -BWDCMP_RTTI_DEFINITION(op::v1::ReduceMax); - op::v1::ReduceMax::ReduceMax(const Output& arg, const Output& reduction_axes, bool keep_dims) : ArithmeticReductionKeepDims(arg, reduction_axes, keep_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/reduce_mean.cpp b/src/core/src/op/reduce_mean.cpp index cca27bdb184..2647c6c4cf6 100644 --- a/src/core/src/op/reduce_mean.cpp +++ b/src/core/src/op/reduce_mean.cpp @@ -17,8 +17,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::ReduceMean); - op::v1::ReduceMean::ReduceMean(const Output& arg, const Output& reduction_axes, bool keep_dims) : ArithmeticReductionKeepDims(arg, reduction_axes, keep_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/reduce_min.cpp b/src/core/src/op/reduce_min.cpp index 4bcb9c8f8bc..eac33d4dba3 100644 --- a/src/core/src/op/reduce_min.cpp +++ b/src/core/src/op/reduce_min.cpp @@ -41,8 +41,6 @@ bool evaluate_min(const HostTensorPtr& arg, const HostTensorPtr& out, const Axis } // namespace } // namespace minop -BWDCMP_RTTI_DEFINITION(op::v1::ReduceMin); - op::v1::ReduceMin::ReduceMin(const Output& arg, const Output& reduction_axes, bool keep_dims) : ArithmeticReductionKeepDims(arg, reduction_axes, keep_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/reduce_prod.cpp b/src/core/src/op/reduce_prod.cpp index cf50424608f..92083e955a0 100644 --- a/src/core/src/op/reduce_prod.cpp +++ b/src/core/src/op/reduce_prod.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::ReduceProd); - op::v1::ReduceProd::ReduceProd(const Output& arg, const Output& reduction_axes, bool keep_dims) : ArithmeticReductionKeepDims(arg, reduction_axes, keep_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/reduce_sum.cpp b/src/core/src/op/reduce_sum.cpp index 5b148242803..7c1c2c30024 100644 --- a/src/core/src/op/reduce_sum.cpp +++ b/src/core/src/op/reduce_sum.cpp @@ -18,8 +18,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::ReduceSum); - op::v1::ReduceSum::ReduceSum(const Output& arg, const Output& reduction_axes, bool keep_dims) : ArithmeticReductionKeepDims(arg, reduction_axes, keep_dims) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/region_yolo.cpp b/src/core/src/op/region_yolo.cpp index 43ee7ba6251..a5d9f399707 100644 --- a/src/core/src/op/region_yolo.cpp +++ b/src/core/src/op/region_yolo.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::RegionYolo); - op::RegionYolo::RegionYolo(const Output& input, const size_t coords, const size_t classes, diff --git a/src/core/src/op/relu.cpp b/src/core/src/op/relu.cpp index a434cbcfa67..65ffc2fa0f4 100644 --- a/src/core/src/op/relu.cpp +++ b/src/core/src/op/relu.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Relu); - op::Relu::Relu(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/reorg_yolo.cpp b/src/core/src/op/reorg_yolo.cpp index 011009eabb4..17576218736 100644 --- a/src/core/src/op/reorg_yolo.cpp +++ b/src/core/src/op/reorg_yolo.cpp @@ -11,8 +11,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::ReorgYolo); - op::ReorgYolo::ReorgYolo(const Output& input, const Strides& strides) : Op({input}), m_strides(strides) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/reshape.cpp b/src/core/src/op/reshape.cpp index 725338fcb2b..94d5fae7a0d 100644 --- a/src/core/src/op/reshape.cpp +++ b/src/core/src/op/reshape.cpp @@ -42,8 +42,6 @@ void compute_output_shape(const HostTensorPtr& shape_pattern, std::vector& arg, const Output& shape_pattern, bool zero_flag) : Op({arg, shape_pattern}), m_special_zero(zero_flag) { diff --git a/src/core/src/op/result.cpp b/src/core/src/op/result.cpp index 692554cf7d3..ceec094deef 100644 --- a/src/core/src/op/result.cpp +++ b/src/core/src/op/result.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Result); - op::Result::Result(const Output& arg) : Op({arg}) { constructor_validate_and_infer_types(); } @@ -75,8 +73,6 @@ void op::Result::set_layout(const ov::Layout& layout) { ov::layout::set_layout(output(0), layout); } -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); - ov::AttributeAdapter::AttributeAdapter(ResultVector& ref) : m_ref(ref) {} bool ov::AttributeAdapter::visit_attributes(AttributeVisitor& visitor) { diff --git a/src/core/src/op/reverse.cpp b/src/core/src/op/reverse.cpp index a8155c63a11..cf8eebae87f 100644 --- a/src/core/src/op/reverse.cpp +++ b/src/core/src/op/reverse.cpp @@ -19,8 +19,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::Reverse); - op::v1::Reverse::Reverse(const Output& data, const Output& reversed_axes, const std::string& mode) : Op({data, reversed_axes}), m_mode{mode_from_string(mode)} { @@ -209,6 +207,4 @@ NGRAPH_API EnumNames& EnumNames); } // namespace ov diff --git a/src/core/src/op/reverse_sequence.cpp b/src/core/src/op/reverse_sequence.cpp index 267a94f1144..f7ff703e894 100644 --- a/src/core/src/op/reverse_sequence.cpp +++ b/src/core/src/op/reverse_sequence.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::ReverseSequence); - op::ReverseSequence::ReverseSequence(const Output& arg, const Output& seq_indices, int64_t batch_axis, diff --git a/src/core/src/op/rnn_cell.cpp b/src/core/src/op/rnn_cell.cpp index dc5d102ae7e..28c0b739e6d 100644 --- a/src/core/src/op/rnn_cell.cpp +++ b/src/core/src/op/rnn_cell.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::RNNCell); - op::v0::RNNCell::RNNCell() { m_activations = {"tanh"}; m_activation_f = get_activation_function(0); diff --git a/src/core/src/op/rnn_sequence.cpp b/src/core/src/op/rnn_sequence.cpp index a0ceb1f6e99..77ae8c769ba 100644 --- a/src/core/src/op/rnn_sequence.cpp +++ b/src/core/src/op/rnn_sequence.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v5::RNNSequence); - op::v5::RNNSequence::RNNSequence() : m_direction(op::RecurrentSequenceDirection::FORWARD) {} op::v5::RNNSequence::RNNSequence(const Output& X, diff --git a/src/core/src/op/roi_align.cpp b/src/core/src/op/roi_align.cpp index b95354cbfc5..075e9f2723e 100644 --- a/src/core/src/op/roi_align.cpp +++ b/src/core/src/op/roi_align.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::ROIAlign); - op::v3::ROIAlign::ROIAlign(const Output& input, const Output& rois, const Output& batch_indices, @@ -212,8 +210,6 @@ shared_ptr op::v9::ROIAlign::clone_with_new_inputs(const OutputVector& new } namespace ov { -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - template <> NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = EnumNames( diff --git a/src/core/src/op/roi_pooling.cpp b/src/core/src/op/roi_pooling.cpp index 1abdcf83d75..800f6f123ef 100644 --- a/src/core/src/op/roi_pooling.cpp +++ b/src/core/src/op/roi_pooling.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::ROIPooling); - op::ROIPooling::ROIPooling(const Output& input, const Output& coords, const ov::Shape& output_size, diff --git a/src/core/src/op/roll.cpp b/src/core/src/op/roll.cpp index 71ae31a9d1b..621a64f7426 100644 --- a/src/core/src/op/roll.cpp +++ b/src/core/src/op/roll.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v7::Roll); - op::v7::Roll::Roll(const Output& data, const Output& shift, const Output& axes) : Op({data, shift, axes}) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/round.cpp b/src/core/src/op/round.cpp index 5efe3997df1..a7e67daf34c 100644 --- a/src/core/src/op/round.cpp +++ b/src/core/src/op/round.cpp @@ -63,8 +63,6 @@ bool evaluate_round(const HostTensorPtr& arg0, } // namespace } // namespace roundop -BWDCMP_RTTI_DEFINITION(op::v5::Round); - op::v5::Round::Round(const Output& arg, RoundMode mode) : util::UnaryElementwiseArithmetic(arg), m_mode(mode) { constructor_validate_and_infer_types(); } @@ -128,6 +126,4 @@ NGRAPH_API EnumNames& EnumNames); } // namespace ov diff --git a/src/core/src/op/scatter_elements_update.cpp b/src/core/src/op/scatter_elements_update.cpp index 71b592a04de..cc57c049efc 100644 --- a/src/core/src/op/scatter_elements_update.cpp +++ b/src/core/src/op/scatter_elements_update.cpp @@ -15,8 +15,6 @@ using namespace ngraph; using namespace std; -BWDCMP_RTTI_DEFINITION(op::v3::ScatterElementsUpdate); - op::v3::ScatterElementsUpdate::ScatterElementsUpdate(const Output& data, const Output& indices, const Output& updates, diff --git a/src/core/src/op/scatter_nd_update.cpp b/src/core/src/op/scatter_nd_update.cpp index aa842492bcd..e37822c3f23 100644 --- a/src/core/src/op/scatter_nd_update.cpp +++ b/src/core/src/op/scatter_nd_update.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::ScatterNDUpdate); - shared_ptr op::v3::ScatterNDUpdate::clone_with_new_inputs(const OutputVector& new_args) const { OV_OP_SCOPE(v3_ScatterNDUpdate_clone_with_new_inputs); check_new_args_count(this, new_args); diff --git a/src/core/src/op/scatter_update.cpp b/src/core/src/op/scatter_update.cpp index 4ba6fefd0a5..54b5201a961 100644 --- a/src/core/src/op/scatter_update.cpp +++ b/src/core/src/op/scatter_update.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::ScatterUpdate); - op::v3::ScatterUpdate::ScatterUpdate(const Output& data, const Output& indices, const Output& updates, diff --git a/src/core/src/op/select.cpp b/src/core/src/op/select.cpp index b3bf13867c4..48d619f0c50 100644 --- a/src/core/src/op/select.cpp +++ b/src/core/src/op/select.cpp @@ -17,8 +17,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::Select); - op::v1::Select::Select(const Output& arg0, const Output& arg1, const Output& arg2, diff --git a/src/core/src/op/selu.cpp b/src/core/src/op/selu.cpp index 9f3082cfcc3..9e89d754645 100644 --- a/src/core/src/op/selu.cpp +++ b/src/core/src/op/selu.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Selu); - op::v0::Selu::Selu(const Output& data, const Output& alpha, const Output& lambda) : Op({data, alpha, lambda}) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/shape_of.cpp b/src/core/src/op/shape_of.cpp index 1683747e1eb..722638dbd2a 100644 --- a/src/core/src/op/shape_of.cpp +++ b/src/core/src/op/shape_of.cpp @@ -21,8 +21,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v3::ShapeOf); - op::v3::ShapeOf::ShapeOf(const Output& arg, element::Type output_type) : Op({arg}), m_output_type(output_type) { constructor_validate_and_infer_types(); } @@ -208,8 +206,6 @@ bool op::v3::ShapeOf::constant_fold(OutputVector& output_values, const OutputVec } // op::v0::ShapeOf -BWDCMP_RTTI_DEFINITION(op::v0::ShapeOf); - op::v0::ShapeOf::ShapeOf(const Output& arg) : Op({arg}) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/shuffle_channels.cpp b/src/core/src/op/shuffle_channels.cpp index 6fee3b5a6f4..b3bc9180d72 100644 --- a/src/core/src/op/shuffle_channels.cpp +++ b/src/core/src/op/shuffle_channels.cpp @@ -19,8 +19,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::ShuffleChannels); - op::ShuffleChannels::ShuffleChannels(const Output& data, const int64_t axis, const int64_t group) : Op({data}), m_axis(axis), diff --git a/src/core/src/op/sigmoid.cpp b/src/core/src/op/sigmoid.cpp index 13c4232d9b1..114df182448 100644 --- a/src/core/src/op/sigmoid.cpp +++ b/src/core/src/op/sigmoid.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::Sigmoid); - shared_ptr ov::op::v0::Sigmoid::clone_with_new_inputs(const OutputVector& new_args) const { OV_OP_SCOPE(v0_Sigmoid_clone_with_new_inputs); check_new_args_count(this, new_args); diff --git a/src/core/src/op/sign.cpp b/src/core/src/op/sign.cpp index 3431ba6bbfb..a8b587e1e6c 100644 --- a/src/core/src/op/sign.cpp +++ b/src/core/src/op/sign.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Sign); - op::Sign::Sign(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/sin.cpp b/src/core/src/op/sin.cpp index 7e5041fd7da..98a6aff3f90 100644 --- a/src/core/src/op/sin.cpp +++ b/src/core/src/op/sin.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Sin); - op::Sin::Sin(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/sinh.cpp b/src/core/src/op/sinh.cpp index 905e455b65a..5ff2b7a98ec 100644 --- a/src/core/src/op/sinh.cpp +++ b/src/core/src/op/sinh.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Sinh); - op::Sinh::Sinh(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/sink.cpp b/src/core/src/op/sink.cpp index ecedd265f86..275e6f8b644 100644 --- a/src/core/src/op/sink.cpp +++ b/src/core/src/op/sink.cpp @@ -6,6 +6,4 @@ using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::Sink); - op::Sink::~Sink() = default; diff --git a/src/core/src/op/slice.cpp b/src/core/src/op/slice.cpp index 791519be57c..1b8cd76f7b0 100644 --- a/src/core/src/op/slice.cpp +++ b/src/core/src/op/slice.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v8::Slice); - op::v8::Slice::Slice(const Output& data, const Output& start, const Output& stop, diff --git a/src/core/src/op/softmax.cpp b/src/core/src/op/softmax.cpp index a674ba7fe7e..cb41e650a17 100644 --- a/src/core/src/op/softmax.cpp +++ b/src/core/src/op/softmax.cpp @@ -40,7 +40,6 @@ bool evaluate_softmax(const HostTensorPtr& arg, const HostTensorPtr& out, const } // namespace // *** SOFTMAX OP SET V1 *** -BWDCMP_RTTI_DEFINITION(op::v1::Softmax); op::v1::Softmax::Softmax(const Output& arg, const size_t axis) : Op({arg}), m_axis(axis) { constructor_validate_and_infer_types(); @@ -95,8 +94,6 @@ bool op::v1::Softmax::has_evaluate() const { } // *** SOFTMAX OP SET V8 *** -BWDCMP_RTTI_DEFINITION(op::v8::Softmax); - op::v8::Softmax::Softmax(const Output& arg, const int64_t axis) : Op({arg}), m_axis(axis) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/softplus.cpp b/src/core/src/op/softplus.cpp index d9aee115dc8..dfe01d5e7c6 100644 --- a/src/core/src/op/softplus.cpp +++ b/src/core/src/op/softplus.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v4::SoftPlus); - op::v4::SoftPlus::SoftPlus(const Output& arg) : util::UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/softsign.cpp b/src/core/src/op/softsign.cpp index 9ecff5a0f8d..eccdd8496ff 100644 --- a/src/core/src/op/softsign.cpp +++ b/src/core/src/op/softsign.cpp @@ -35,8 +35,6 @@ bool evaluate_softsign(const ov::Tensor& arg, const ov::Tensor& out) { } } // namespace -BWDCMP_RTTI_DEFINITION(ov::op::v9::SoftSign); - ov::op::v9::SoftSign::SoftSign(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/space_to_batch.cpp b/src/core/src/op/space_to_batch.cpp index cca47591968..39098790ef0 100644 --- a/src/core/src/op/space_to_batch.cpp +++ b/src/core/src/op/space_to_batch.cpp @@ -23,8 +23,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::SpaceToBatch); - ngraph::op::v1::SpaceToBatch::SpaceToBatch(const ngraph::Output& data, const ngraph::Output& block_shape, const ngraph::Output& pads_begin, diff --git a/src/core/src/op/space_to_depth.cpp b/src/core/src/op/space_to_depth.cpp index 643091aed15..54d6ad97e83 100644 --- a/src/core/src/op/space_to_depth.cpp +++ b/src/core/src/op/space_to_depth.cpp @@ -18,8 +18,6 @@ using namespace ngraph; -BWDCMP_RTTI_DEFINITION(ov::op::v0::SpaceToDepth); - ov::op::v0::SpaceToDepth::SpaceToDepth(const Output& data, const SpaceToDepthMode& mode, size_t block_size) : Op({data}), m_blocksize(block_size), @@ -103,6 +101,4 @@ EnumNames::get() { {"depth_first", ngraph::op::v0::SpaceToDepth::SpaceToDepthMode::DEPTH_FIRST}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); } // namespace ov diff --git a/src/core/src/op/split.cpp b/src/core/src/op/split.cpp index a4f76118e4c..31e7234d28a 100644 --- a/src/core/src/op/split.cpp +++ b/src/core/src/op/split.cpp @@ -19,8 +19,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::Split); - op::v1::Split::Split(const Output& data, const Output& axis, const size_t num_splits) : Op({data, axis}), m_num_splits{num_splits} { diff --git a/src/core/src/op/sqrt.cpp b/src/core/src/op/sqrt.cpp index ee95fa21d64..6343d24fb48 100644 --- a/src/core/src/op/sqrt.cpp +++ b/src/core/src/op/sqrt.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Sqrt); - op::Sqrt::Sqrt(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/squared_difference.cpp b/src/core/src/op/squared_difference.cpp index ec816841424..1793fc1f97a 100644 --- a/src/core/src/op/squared_difference.cpp +++ b/src/core/src/op/squared_difference.cpp @@ -10,8 +10,6 @@ using namespace std; // ------------------------------ v0 ------------------------------------------- -BWDCMP_RTTI_DEFINITION(ov::op::v0::SquaredDifference); - ov::op::v0::SquaredDifference::SquaredDifference(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) diff --git a/src/core/src/op/squeeze.cpp b/src/core/src/op/squeeze.cpp index 13fa4084740..5218dea6eaa 100644 --- a/src/core/src/op/squeeze.cpp +++ b/src/core/src/op/squeeze.cpp @@ -18,8 +18,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Squeeze); - op::Squeeze::Squeeze() : Op() {} op::Squeeze::Squeeze(const Output& data, const Output& axes) : Op({data, axes}) { diff --git a/src/core/src/op/strided_slice.cpp b/src/core/src/op/strided_slice.cpp index 6800c30b53d..c82eef60bd7 100644 --- a/src/core/src/op/strided_slice.cpp +++ b/src/core/src/op/strided_slice.cpp @@ -25,8 +25,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::StridedSlice); - op::v1::StridedSlice::StridedSlice(const Output& data, const Output& begin, const Output& end, diff --git a/src/core/src/op/subtract.cpp b/src/core/src/op/subtract.cpp index 00a7ecefe15..213985daa6f 100644 --- a/src/core/src/op/subtract.cpp +++ b/src/core/src/op/subtract.cpp @@ -54,9 +54,6 @@ bool evaluate_subtract(const HostTensorPtr& arg0, } // namespace subtract // ------------------------------- v1 ------------------------------------------ - -BWDCMP_RTTI_DEFINITION(op::v1::Subtract); - op::v1::Subtract::Subtract(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseArithmetic(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/op/swish.cpp b/src/core/src/op/swish.cpp index e46c2ee853b..dadc5977cb3 100644 --- a/src/core/src/op/swish.cpp +++ b/src/core/src/op/swish.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v4::Swish); - op::v4::Swish::Swish(const Output& arg) : Op({arg}) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/tan.cpp b/src/core/src/op/tan.cpp index cff9e41bb9c..d19c0e84b59 100644 --- a/src/core/src/op/tan.cpp +++ b/src/core/src/op/tan.cpp @@ -14,8 +14,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Tan); - op::Tan::Tan(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/tanh.cpp b/src/core/src/op/tanh.cpp index 1fc9633dd13..7c0a5f155cc 100644 --- a/src/core/src/op/tanh.cpp +++ b/src/core/src/op/tanh.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Tanh); - op::Tanh::Tanh(const Output& arg) : UnaryElementwiseArithmetic(arg) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/tensor_iterator.cpp b/src/core/src/op/tensor_iterator.cpp index 77b53e19417..f994b746ac8 100644 --- a/src/core/src/op/tensor_iterator.cpp +++ b/src/core/src/op/tensor_iterator.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::TensorIterator); - op::v0::TensorIterator::TensorIterator(const OutputVector& values) : op::util::SubGraphOp(values) {} bool op::v0::TensorIterator::visit_attributes(AttributeVisitor& visitor) { diff --git a/src/core/src/op/tile.cpp b/src/core/src/op/tile.cpp index 499fa1a2b15..1cbeec270c1 100644 --- a/src/core/src/op/tile.cpp +++ b/src/core/src/op/tile.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Tile); - op::v0::Tile::Tile(const Output& data, const Output& repeats) : Op({data, repeats}) { ov::mark_as_precision_sensitive(input(1)); constructor_validate_and_infer_types(); diff --git a/src/core/src/op/topk.cpp b/src/core/src/op/topk.cpp index b1f054b38d2..570bac43498 100644 --- a/src/core/src/op/topk.cpp +++ b/src/core/src/op/topk.cpp @@ -140,8 +140,6 @@ size_t read_k_from_host_tensor(const HostTensorPtr& arg_k) { } // namespace topk // v1 version starts -BWDCMP_RTTI_DEFINITION(op::v1::TopK); - static const std::uint64_t UNKNOWN_NORMALIZED_AXIS = std::numeric_limits::max(); op::v1::TopK::TopK(const Output& data, @@ -406,8 +404,6 @@ bool op::v1::TopK::has_evaluate() const { } // v3 version starts -BWDCMP_RTTI_DEFINITION(op::v3::TopK); - op::v3::TopK::TopK(const Output& data, const Output& k, const int64_t axis, diff --git a/src/core/src/op/transpose.cpp b/src/core/src/op/transpose.cpp index 385dfb05a40..bcc4d67090d 100644 --- a/src/core/src/op/transpose.cpp +++ b/src/core/src/op/transpose.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::Transpose); - op::v1::Transpose::Transpose(const Output& arg, const Output& input_order) : Op({arg, input_order}) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/unsqueeze.cpp b/src/core/src/op/unsqueeze.cpp index e5bf025d394..164bc829624 100644 --- a/src/core/src/op/unsqueeze.cpp +++ b/src/core/src/op/unsqueeze.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v0::Unsqueeze); - op::v0::Unsqueeze::Unsqueeze(const Output& data, const Output& axes) : Op({data, axes}) { constructor_validate_and_infer_types(); } diff --git a/src/core/src/op/util/arithmetic_reduction.cpp b/src/core/src/op/util/arithmetic_reduction.cpp index 62c5a8b8cab..569ad0cbcdc 100644 --- a/src/core/src/op/util/arithmetic_reduction.cpp +++ b/src/core/src/op/util/arithmetic_reduction.cpp @@ -9,8 +9,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::ArithmeticReduction); - ov::op::util::ArithmeticReduction::ArithmeticReduction() = default; ov::op::util::ArithmeticReduction::ArithmeticReduction(const Output& arg, const Output& reduction_axes) diff --git a/src/core/src/op/util/arithmetic_reductions_keep_dims.cpp b/src/core/src/op/util/arithmetic_reductions_keep_dims.cpp index 8fd5b8e021f..e117f569bd3 100644 --- a/src/core/src/op/util/arithmetic_reductions_keep_dims.cpp +++ b/src/core/src/op/util/arithmetic_reductions_keep_dims.cpp @@ -11,8 +11,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::ArithmeticReductionKeepDims); - ov::op::util::ArithmeticReductionKeepDims::ArithmeticReductionKeepDims( const ngraph::Output& arg, const ngraph::Output& reduction_axes, diff --git a/src/core/src/op/util/assign_base.cpp b/src/core/src/op/util/assign_base.cpp index 4f77ff1c033..b9255787066 100644 --- a/src/core/src/op/util/assign_base.cpp +++ b/src/core/src/op/util/assign_base.cpp @@ -3,5 +3,3 @@ // #include "openvino/op/util/assign_base.hpp" - -BWDCMP_RTTI_DEFINITION(ov::op::util::AssignBase); diff --git a/src/core/src/op/util/attr_types.cpp b/src/core/src/op/util/attr_types.cpp index 37d40a51e5a..d1f14895aad 100644 --- a/src/core/src/op/util/attr_types.cpp +++ b/src/core/src/op/util/attr_types.cpp @@ -23,8 +23,6 @@ NGRAPH_API EnumNames& EnumNames::get() return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - template <> NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = EnumNames("ngraph::op::PadType", @@ -35,8 +33,6 @@ NGRAPH_API EnumNames& EnumNames::get() return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - template <> NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = EnumNames( @@ -45,8 +41,6 @@ NGRAPH_API EnumNames& EnumNames); - template <> NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = @@ -57,7 +51,6 @@ NGRAPH_API EnumNames& EnumNames); template <> NGRAPH_API EnumNames& EnumNames::get() { @@ -71,7 +64,6 @@ NGRAPH_API EnumNames& EnumNames); template <> NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = @@ -80,8 +72,6 @@ NGRAPH_API EnumNames& EnumNames::get() return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - template <> NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = EnumNames("ngraph::op::TopKSortType", @@ -98,9 +88,6 @@ NGRAPH_API EnumNames& EnumNames::get return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - bool AttributeAdapter::visit_attributes(AttributeVisitor& visitor) { // Maintain back-compatibility std::string name = visitor.finish_structure(); @@ -112,8 +99,6 @@ bool AttributeAdapter::visit_attributes(Attribute return true; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - bool AttributeAdapter::visit_attributes(AttributeVisitor& visitor) { // Maintain back-compatibility std::string name = visitor.finish_structure(); @@ -127,9 +112,6 @@ bool AttributeAdapter::visit_attributes(Attribute return true; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); template <> NGRAPH_API EnumNames& EnumNames::get() { static auto enum_names = EnumNames( diff --git a/src/core/src/op/util/binary_elementwise_arithmetic.cpp b/src/core/src/op/util/binary_elementwise_arithmetic.cpp index 57011477933..10f6e8541d3 100644 --- a/src/core/src/op/util/binary_elementwise_arithmetic.cpp +++ b/src/core/src/op/util/binary_elementwise_arithmetic.cpp @@ -12,8 +12,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::BinaryElementwiseArithmetic); - ov::op::util::BinaryElementwiseArithmetic::BinaryElementwiseArithmetic(const AutoBroadcastSpec& autob) : m_autob(autob) {} diff --git a/src/core/src/op/util/binary_elementwise_comparison.cpp b/src/core/src/op/util/binary_elementwise_comparison.cpp index b04f97f6a0f..d08563fb12e 100644 --- a/src/core/src/op/util/binary_elementwise_comparison.cpp +++ b/src/core/src/op/util/binary_elementwise_comparison.cpp @@ -10,8 +10,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::BinaryElementwiseComparison); - ov::op::util::BinaryElementwiseComparison::BinaryElementwiseComparison(const AutoBroadcastSpec& autob) : m_autob(autob) {} diff --git a/src/core/src/op/util/binary_elementwise_logical.cpp b/src/core/src/op/util/binary_elementwise_logical.cpp index cd76f4be027..d2d70c349b4 100644 --- a/src/core/src/op/util/binary_elementwise_logical.cpp +++ b/src/core/src/op/util/binary_elementwise_logical.cpp @@ -10,8 +10,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::BinaryElementwiseLogical); - ov::op::util::BinaryElementwiseLogical::BinaryElementwiseLogical() = default; ov::op::util::BinaryElementwiseLogical::BinaryElementwiseLogical(const Output& arg0, diff --git a/src/core/src/op/util/broadcast_base.cpp b/src/core/src/op/util/broadcast_base.cpp index 5f87e2e7585..e63863d6379 100644 --- a/src/core/src/op/util/broadcast_base.cpp +++ b/src/core/src/op/util/broadcast_base.cpp @@ -18,8 +18,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::BroadcastBase); - ov::op::util::BroadcastBase::BroadcastBase(const Output& arg, const Output& target_shape, const Output& axes_mapping, diff --git a/src/core/src/op/util/deformable_convolution_base.cpp b/src/core/src/op/util/deformable_convolution_base.cpp index a6960db6820..49265375591 100644 --- a/src/core/src/op/util/deformable_convolution_base.cpp +++ b/src/core/src/op/util/deformable_convolution_base.cpp @@ -13,8 +13,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::DeformableConvolutionBase); - ov::op::util::DeformableConvolutionBase::DeformableConvolutionBase(const OutputVector& arguments, const Strides& strides, const CoordinateDiff& pads_begin, diff --git a/src/core/src/op/util/embeddingbag_offsets_base.cpp b/src/core/src/op/util/embeddingbag_offsets_base.cpp index 63c0aa1a313..666ac62e0fc 100644 --- a/src/core/src/op/util/embeddingbag_offsets_base.cpp +++ b/src/core/src/op/util/embeddingbag_offsets_base.cpp @@ -10,8 +10,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::EmbeddingBagOffsetsBase); - ov::op::util::EmbeddingBagOffsetsBase::EmbeddingBagOffsetsBase(const Output& emb_table, const Output& indices, const Output& offsets, diff --git a/src/core/src/op/util/embeddingbag_packed_base.cpp b/src/core/src/op/util/embeddingbag_packed_base.cpp index 80686fd5af1..8f4d2c75bba 100644 --- a/src/core/src/op/util/embeddingbag_packed_base.cpp +++ b/src/core/src/op/util/embeddingbag_packed_base.cpp @@ -9,8 +9,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::EmbeddingBagPackedBase); - ov::op::util::EmbeddingBagPackedBase::EmbeddingBagPackedBase(const Output& emb_table, const Output& indices, const Output& per_sample_weights) diff --git a/src/core/src/op/util/fft_base.cpp b/src/core/src/op/util/fft_base.cpp index 07a495dea21..05c6c8bfeb5 100644 --- a/src/core/src/op/util/fft_base.cpp +++ b/src/core/src/op/util/fft_base.cpp @@ -12,8 +12,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::FFTBase); - ov::op::util::FFTBase::FFTBase(const Output& data, const Output& axes) : Op({data, axes}) {} ov::op::util::FFTBase::FFTBase(const Output& data, const Output& axes, const Output& signal_size) diff --git a/src/core/src/op/util/framework_node.cpp b/src/core/src/op/util/framework_node.cpp index f4b9743247f..10f39951909 100644 --- a/src/core/src/op/util/framework_node.cpp +++ b/src/core/src/op/util/framework_node.cpp @@ -6,8 +6,6 @@ #include "itt.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::util::FrameworkNode); - ov::op::util::FrameworkNode::FrameworkNode(const OutputVector& inputs, size_t output_size) : Op(inputs) { set_output_size(output_size); constructor_validate_and_infer_types(); diff --git a/src/core/src/op/util/gather_base.cpp b/src/core/src/op/util/gather_base.cpp index e65969752af..b5f8dc31284 100644 --- a/src/core/src/op/util/gather_base.cpp +++ b/src/core/src/op/util/gather_base.cpp @@ -17,8 +17,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::GatherBase); - ov::op::util::GatherBase::GatherBase(const Output& data, const Output& indices, const Output& axis, diff --git a/src/core/src/op/util/gather_nd_base.cpp b/src/core/src/op/util/gather_nd_base.cpp index fa1b62d49c3..c220ef84bf2 100644 --- a/src/core/src/op/util/gather_nd_base.cpp +++ b/src/core/src/op/util/gather_nd_base.cpp @@ -14,8 +14,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::GatherNDBase); - ov::op::util::GatherNDBase::GatherNDBase(const Output& data, const Output& indices, const size_t batch_dims) : Op({data, indices}), m_batch_dims(batch_dims) { diff --git a/src/core/src/op/util/logical_reduction.cpp b/src/core/src/op/util/logical_reduction.cpp index 06b42610d09..4753c4369ac 100644 --- a/src/core/src/op/util/logical_reduction.cpp +++ b/src/core/src/op/util/logical_reduction.cpp @@ -12,8 +12,6 @@ namespace ov { using namespace std; -BWDCMP_RTTI_DEFINITION(op::util::LogicalReduction); - op::util::LogicalReduction::LogicalReduction() = default; op::util::LogicalReduction::LogicalReduction(const Output& arg, const AxisSet& reduction_axes) diff --git a/src/core/src/op/util/logical_reduction_keep_dims.cpp b/src/core/src/op/util/logical_reduction_keep_dims.cpp index eea1feb3498..1916548adbd 100644 --- a/src/core/src/op/util/logical_reduction_keep_dims.cpp +++ b/src/core/src/op/util/logical_reduction_keep_dims.cpp @@ -11,8 +11,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::LogicalReductionKeepDims); - ov::op::util::LogicalReductionKeepDims::LogicalReductionKeepDims(const ngraph::Output& arg, const ngraph::Output& reduction_axes, const bool keep_dims) diff --git a/src/core/src/op/util/multi_subgraph_base.cpp b/src/core/src/op/util/multi_subgraph_base.cpp index 64771ce2ae0..62ccd27bc7b 100644 --- a/src/core/src/op/util/multi_subgraph_base.cpp +++ b/src/core/src/op/util/multi_subgraph_base.cpp @@ -7,13 +7,6 @@ #include "ngraph/graph_util.hpp" #include "ngraph/opsets/opset5.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::util::MultiSubGraphOp); -BWDCMP_RTTI_DEFINITION(ov::op::util::MultiSubGraphOp::SliceInputDescription); -BWDCMP_RTTI_DEFINITION(ov::op::util::MultiSubGraphOp::MergedInputDescription); -BWDCMP_RTTI_DEFINITION(ov::op::util::MultiSubGraphOp::InvariantInputDescription); -BWDCMP_RTTI_DEFINITION(ov::op::util::MultiSubGraphOp::BodyOutputDescription); -BWDCMP_RTTI_DEFINITION(ov::op::util::MultiSubGraphOp::ConcatOutputDescription); - ov::op::util::MultiSubGraphOp::InputDescription::InputDescription(uint64_t input_index, uint64_t body_parameter_index) : m_input_index(input_index), m_body_parameter_index(body_parameter_index) {} @@ -153,8 +146,3 @@ ov::Output ov::op::util::MultiSubGraphOp::set_body_outputs(const Resul validate_and_infer_types(); return Output(shared_from_this(), output_index); } - -namespace ov { -BWDCMP_RTTI_DEFINITION(AttributeAdapter>>); -BWDCMP_RTTI_DEFINITION(AttributeAdapter>>); -} // namespace ov diff --git a/src/core/src/op/util/multiclass_nms_base.cpp b/src/core/src/op/util/multiclass_nms_base.cpp index 7e0fec3ab41..1cc7089a4d2 100644 --- a/src/core/src/op/util/multiclass_nms_base.cpp +++ b/src/core/src/op/util/multiclass_nms_base.cpp @@ -8,8 +8,6 @@ using namespace ov; -BWDCMP_RTTI_DEFINITION(ov::op::util::MulticlassNmsBase); - op::util::MulticlassNmsBase::MulticlassNmsBase(const OutputVector& arguments, const Attributes& attrs) : Op(arguments), m_attrs{attrs} {} @@ -98,6 +96,4 @@ EnumNames::get() { {"none", op::util::MulticlassNmsBase::SortResultType::NONE}}); return enum_names; } - -BWDCMP_RTTI_DEFINITION(AttributeAdapter); } // namespace ov diff --git a/src/core/src/op/util/read_value_base.cpp b/src/core/src/op/util/read_value_base.cpp index b2e4983dc45..842711ad88d 100644 --- a/src/core/src/op/util/read_value_base.cpp +++ b/src/core/src/op/util/read_value_base.cpp @@ -3,5 +3,3 @@ // #include "openvino/op/util/read_value_base.hpp" - -BWDCMP_RTTI_DEFINITION(ov::op::util::ReadValueBase); diff --git a/src/core/src/op/util/reduction_base.cpp b/src/core/src/op/util/reduction_base.cpp index d2c85e758d9..0b7feeb9097 100644 --- a/src/core/src/op/util/reduction_base.cpp +++ b/src/core/src/op/util/reduction_base.cpp @@ -9,8 +9,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::ReductionBase); - ov::op::util::ReductionBase::ReductionBase() = default; ov::op::util::ReductionBase::ReductionBase(const Output& arg, const Output& reduction_axes) diff --git a/src/core/src/op/util/rnn_cell_base.cpp b/src/core/src/op/util/rnn_cell_base.cpp index 169efc80459..47d239c3fac 100644 --- a/src/core/src/op/util/rnn_cell_base.cpp +++ b/src/core/src/op/util/rnn_cell_base.cpp @@ -19,8 +19,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::RNNCellBase); - std::shared_ptr ov::op::util::convert_lstm_node_format(const Output& node, LSTMWeightsFormat from_format, LSTMWeightsFormat to_format, diff --git a/src/core/src/op/util/scatter_base.cpp b/src/core/src/op/util/scatter_base.cpp index 7a9554186f1..a953f6e4322 100644 --- a/src/core/src/op/util/scatter_base.cpp +++ b/src/core/src/op/util/scatter_base.cpp @@ -11,8 +11,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::ScatterBase); - ov::op::util::ScatterBase::ScatterBase(const Output& data, const Output& indices, const Output& updates, diff --git a/src/core/src/op/util/scatter_nd_base.cpp b/src/core/src/op/util/scatter_nd_base.cpp index 0cb6b2bc26a..83b0f376eb2 100644 --- a/src/core/src/op/util/scatter_nd_base.cpp +++ b/src/core/src/op/util/scatter_nd_base.cpp @@ -12,7 +12,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::op::util::ScatterNDBase); constexpr int ov::op::util::ScatterNDBase::INPUTS; constexpr int ov::op::util::ScatterNDBase::INDICES; constexpr int ov::op::util::ScatterNDBase::UPDATES; diff --git a/src/core/src/op/util/sub_graph_base.cpp b/src/core/src/op/util/sub_graph_base.cpp index 682a8d72751..d2757a73699 100644 --- a/src/core/src/op/util/sub_graph_base.cpp +++ b/src/core/src/op/util/sub_graph_base.cpp @@ -7,8 +7,6 @@ #include "ngraph/graph_util.hpp" #include "ngraph/opsets/opset5.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::util::SubGraphOp); - ov::op::util::SubGraphOp::SubGraphOp() : MultiSubGraphOp(1) {} ov::op::util::SubGraphOp::SubGraphOp(const OutputVector& args) : MultiSubGraphOp(args, 1) {} diff --git a/src/core/src/op/util/unary_elementwise_arithmetic.cpp b/src/core/src/op/util/unary_elementwise_arithmetic.cpp index 0d2facb9ed5..318d5dc5f4a 100644 --- a/src/core/src/op/util/unary_elementwise_arithmetic.cpp +++ b/src/core/src/op/util/unary_elementwise_arithmetic.cpp @@ -7,8 +7,6 @@ #include "itt.hpp" #include "ngraph/op/util/elementwise_args.hpp" -BWDCMP_RTTI_DEFINITION(ov::op::util::UnaryElementwiseArithmetic); - ov::op::util::UnaryElementwiseArithmetic::UnaryElementwiseArithmetic() : Op() {} ov::op::util::UnaryElementwiseArithmetic::UnaryElementwiseArithmetic(const Output& arg) : Op({arg}) {} diff --git a/src/core/src/op/util/variable.cpp b/src/core/src/op/util/variable.cpp deleted file mode 100644 index fd2fe103560..00000000000 --- a/src/core/src/op/util/variable.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (C) 2018-2022 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter>); diff --git a/src/core/src/op/variadic_split.cpp b/src/core/src/op/variadic_split.cpp index 6a44928d214..c8615abe269 100644 --- a/src/core/src/op/variadic_split.cpp +++ b/src/core/src/op/variadic_split.cpp @@ -15,8 +15,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::VariadicSplit); - op::v1::VariadicSplit::VariadicSplit(const Output& data, const Output& axis, const Output& split_lengths) diff --git a/src/core/src/op/xor.cpp b/src/core/src/op/xor.cpp index e92dd99ac0a..802ec7a8303 100644 --- a/src/core/src/op/xor.cpp +++ b/src/core/src/op/xor.cpp @@ -12,8 +12,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(op::v1::LogicalXor); - op::v1::LogicalXor::LogicalXor(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) @@ -77,8 +75,6 @@ bool op::v1::LogicalXor::has_evaluate() const { return false; } -BWDCMP_RTTI_DEFINITION(op::v0::Xor); - op::v0::Xor::Xor(const Output& arg0, const Output& arg1, const AutoBroadcastSpec& auto_broadcast) : BinaryElementwiseLogical(arg0, arg1, auto_broadcast) { constructor_validate_and_infer_types(); diff --git a/src/core/src/partial_shape.cpp b/src/core/src/partial_shape.cpp index d69c2befec3..bffd663d79a 100644 --- a/src/core/src/partial_shape.cpp +++ b/src/core/src/partial_shape.cpp @@ -388,5 +388,3 @@ ov::Dimension& ov::PartialShape::operator[](size_t i) { m_shape_type = ShapeType::SHAPE_IS_UPDATED; // We can't guarantee that the shape remains static or dynamic. return m_dimensions[i]; } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/pattern/op/any.cpp b/src/core/src/pattern/op/any.cpp index 4928dd85672..e5c6b6fdcc1 100644 --- a/src/core/src/pattern/op/any.cpp +++ b/src/core/src/pattern/op/any.cpp @@ -8,8 +8,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::pass::pattern::op::Any); - bool ov::pass::pattern::op::Any::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/any_of.cpp b/src/core/src/pattern/op/any_of.cpp index ba28705fee4..abc443b1e54 100644 --- a/src/core/src/pattern/op/any_of.cpp +++ b/src/core/src/pattern/op/any_of.cpp @@ -8,8 +8,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::pass::pattern::op::AnyOf); - bool ov::pass::pattern::op::AnyOf::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/any_output.cpp b/src/core/src/pattern/op/any_output.cpp index 2710a9b4ce9..6f5ac1aa00f 100644 --- a/src/core/src/pattern/op/any_output.cpp +++ b/src/core/src/pattern/op/any_output.cpp @@ -8,8 +8,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::pass::pattern::op::AnyOutput); - bool ov::pass::pattern::op::AnyOutput::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/branch.cpp b/src/core/src/pattern/op/branch.cpp index 20e3fa735c4..879dd3edfb8 100644 --- a/src/core/src/pattern/op/branch.cpp +++ b/src/core/src/pattern/op/branch.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(pattern::op::Branch); - bool pattern::op::Branch::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/capture.cpp b/src/core/src/pattern/op/capture.cpp index b0105528f48..e731956e246 100644 --- a/src/core/src/pattern/op/capture.cpp +++ b/src/core/src/pattern/op/capture.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(pattern::op::Capture); - bool pattern::op::Capture::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/label.cpp b/src/core/src/pattern/op/label.cpp index d062ab82e6d..b7822849408 100644 --- a/src/core/src/pattern/op/label.cpp +++ b/src/core/src/pattern/op/label.cpp @@ -10,8 +10,6 @@ using namespace std; -BWDCMP_RTTI_DEFINITION(ov::pass::pattern::op::Label); - ov::Output ov::pass::pattern::op::Label::wrap_values(const ov::OutputVector& wrapped_values) { switch (wrapped_values.size()) { case 0: diff --git a/src/core/src/pattern/op/or.cpp b/src/core/src/pattern/op/or.cpp index a1cb82c2966..b6e68b547ad 100644 --- a/src/core/src/pattern/op/or.cpp +++ b/src/core/src/pattern/op/or.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(pattern::op::Or); - bool pattern::op::Or::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/skip.cpp b/src/core/src/pattern/op/skip.cpp index 830fb9b9366..4ae62b6add3 100644 --- a/src/core/src/pattern/op/skip.cpp +++ b/src/core/src/pattern/op/skip.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(pattern::op::Skip); - bool pattern::op::Skip::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/true.cpp b/src/core/src/pattern/op/true.cpp index 7014619f73d..83afa772e53 100644 --- a/src/core/src/pattern/op/true.cpp +++ b/src/core/src/pattern/op/true.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(pattern::op::True); - bool pattern::op::True::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/pattern/op/wrap_type.cpp b/src/core/src/pattern/op/wrap_type.cpp index d3dc6b38e0a..1ca62ecfc3f 100644 --- a/src/core/src/pattern/op/wrap_type.cpp +++ b/src/core/src/pattern/op/wrap_type.cpp @@ -9,8 +9,6 @@ using namespace std; using namespace ngraph; -BWDCMP_RTTI_DEFINITION(pattern::op::WrapType); - bool pattern::op::WrapType::match_value(Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/runtime/aligned_buffer.cpp b/src/core/src/runtime/aligned_buffer.cpp index 3c44ce83a23..e58d1c1c8ba 100644 --- a/src/core/src/runtime/aligned_buffer.cpp +++ b/src/core/src/runtime/aligned_buffer.cpp @@ -59,8 +59,6 @@ runtime::AlignedBuffer& runtime::AlignedBuffer::operator=(AlignedBuffer&& other) } namespace ov { -BWDCMP_RTTI_DEFINITION(AttributeAdapter>); - AttributeAdapter>::AttributeAdapter( shared_ptr& value) : DirectValueAccessor>(value) {} diff --git a/src/core/src/shape.cpp b/src/core/src/shape.cpp index 660cb1d38ec..1146d62740f 100644 --- a/src/core/src/shape.cpp +++ b/src/core/src/shape.cpp @@ -68,5 +68,3 @@ std::string ov::Shape::to_string() const { shape_str_stream << *this; return shape_str_stream.str(); } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/strides.cpp b/src/core/src/strides.cpp index 81bc55f7788..b08583237a5 100644 --- a/src/core/src/strides.cpp +++ b/src/core/src/strides.cpp @@ -32,5 +32,3 @@ ov::Strides& ov::Strides::operator=(Strides&& v) noexcept { static_cast*>(this)->operator=(v); return *this; } - -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); diff --git a/src/core/src/type/element_type.cpp b/src/core/src/type/element_type.cpp index da4efa6a2a8..b3455a05d49 100644 --- a/src/core/src/type/element_type.cpp +++ b/src/core/src/type/element_type.cpp @@ -12,9 +12,6 @@ #include "ngraph/log.hpp" #include "ngraph/type/element_type_traits.hpp" -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); -BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter); - namespace { struct TypeInfo { size_t m_bitwidth; @@ -392,8 +389,6 @@ NGRAPH_API EnumNames& EnumNames::get() { return enum_names; } -BWDCMP_RTTI_DEFINITION(AttributeAdapter); - const std::string& AttributeAdapter::get() { return as_string(static_cast(m_ref)); } diff --git a/src/core/tests/control_dependencies.cpp b/src/core/tests/control_dependencies.cpp index 078af0447f2..1a0a17ff61c 100644 --- a/src/core/tests/control_dependencies.cpp +++ b/src/core/tests/control_dependencies.cpp @@ -27,12 +27,9 @@ using namespace ngraph; using namespace std; -class ControlDependencyOp : public ngraph::op::Op { +class ControlDependencyOp : public ov::op::Op { public: - static constexpr NodeTypeInfo type_info{"ControlDependencyOp", static_cast(0)}; - const NodeTypeInfo& get_type_info() const override { - return type_info; - } + OPENVINO_OP("ControlDependencyOp"); virtual std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override { auto clone = make_shared(new_args, std::set>{}); return move(clone); @@ -55,7 +52,6 @@ public: } } }; -constexpr NodeTypeInfo ControlDependencyOp::type_info; TEST(control_dependencies, cdep_ops) { auto A = make_shared(element::f32, Shape{}); diff --git a/src/core/tests/opset.cpp b/src/core/tests/opset.cpp index 56bfc9b36f3..2cf2e84e608 100644 --- a/src/core/tests/opset.cpp +++ b/src/core/tests/opset.cpp @@ -196,7 +196,6 @@ constexpr ov::DiscreteTypeInfo MyOpOld::type_info; class MyOpNewFromOld : public MyOpOld { public: OPENVINO_OP("MyOpNewFromOld", "custom_opset", MyOpOld); - BWDCMP_RTTI_DECLARATION; MyOpNewFromOld() = default; std::shared_ptr clone_with_new_inputs(const ov::OutputVector& inputs) const override { @@ -204,8 +203,6 @@ public: } }; -BWDCMP_RTTI_DEFINITION(MyOpNewFromOld); - class MyOpIncorrect : public MyOpOld { public: OPENVINO_OP("MyOpIncorrect", "custom_opset", MyOpOld); @@ -228,20 +225,11 @@ public: TEST(opset, custom_opset) { ov::OpSet opset; -#ifndef OPENVINO_STATIC_LIBRARY - opset.insert(); -#endif opset.insert(); opset.insert(); opset.insert(); -#ifdef OPENVINO_STATIC_LIBRARY - EXPECT_EQ(opset.get_types_info().size(), 2); -#else EXPECT_EQ(opset.get_types_info().size(), 3); - EXPECT_TRUE(opset.contains_type("MyOpOld")); - // TODO: why is it not registered? EXPECT_TRUE(opset.contains_type("MyOpNewFromOld")); -#endif EXPECT_TRUE(opset.contains_type("MyOpNew")); - EXPECT_FALSE(opset.contains_type("MyOpIncorrect")); + EXPECT_TRUE(opset.contains_type("MyOpIncorrect")); } diff --git a/src/core/tests/visitors/user_op.cpp b/src/core/tests/visitors/user_op.cpp index 3253c3bbd5f..85fe031e9d4 100644 --- a/src/core/tests/visitors/user_op.cpp +++ b/src/core/tests/visitors/user_op.cpp @@ -31,14 +31,9 @@ class AttributeAdapter : public EnumAttributeAdapterBase(value) {} - static constexpr DiscreteTypeInfo type_info{"AttributeAdapter", static_cast(0)}; - const DiscreteTypeInfo& get_type_info() const override { - return type_info; - } + OPENVINO_RTTI("AttributeAdapter"); }; -constexpr DiscreteTypeInfo AttributeAdapter::type_info; - struct Position { float x; float y; @@ -64,16 +59,11 @@ public: visitor.on_attribute("z", m_ref.z); return true; } - static constexpr DiscreteTypeInfo type_info{"AttributeAdapter", static_cast(0)}; - const DiscreteTypeInfo& get_type_info() const override { - return type_info; - } + OPENVINO_RTTI("AttributeAdapter"); protected: Position& m_ref; }; - -constexpr DiscreteTypeInfo AttributeAdapter::type_info; } // namespace ov // Given a Turing machine program and data, return scalar 1 if the program would diff --git a/src/frontends/onnx/frontend/include/onnx_import/core/null_node.hpp b/src/frontends/onnx/frontend/include/onnx_import/core/null_node.hpp index 53be30c1b56..72503ff1573 100644 --- a/src/frontends/onnx/frontend/include/onnx_import/core/null_node.hpp +++ b/src/frontends/onnx/frontend/include/onnx_import/core/null_node.hpp @@ -6,8 +6,8 @@ #include -#include "ngraph/node.hpp" #include "onnx_import/onnx_importer_visibility.hpp" +#include "openvino/op/op.hpp" namespace ngraph { namespace op { @@ -28,15 +28,14 @@ namespace onnx_import { /// /// More: /// https://github.com/onnx/onnx/blob/master/docs/IR.md#optional-inputs-and-outputs -class ONNX_IMPORTER_API NullNode : public ngraph::Node { +class ONNX_IMPORTER_API NullNode : public ov::op::Op { public: - static constexpr NodeTypeInfo type_info{"NullNode", static_cast(0)}; - const NodeTypeInfo& get_type_info() const override { - return type_info; + OPENVINO_OP("NullNode"); + NullNode() { + set_output_size(1); } - NullNode() : Node(1) {} - virtual std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; + virtual std::shared_ptr clone_with_new_inputs(const ov::OutputVector& new_args) const override; }; } // namespace onnx_import } // namespace ngraph diff --git a/src/frontends/onnx/frontend/src/core/null_node.cpp b/src/frontends/onnx/frontend/src/core/null_node.cpp index d2c4122b336..81b838a7cb4 100644 --- a/src/frontends/onnx/frontend/src/core/null_node.cpp +++ b/src/frontends/onnx/frontend/src/core/null_node.cpp @@ -10,9 +10,7 @@ namespace ngraph { namespace onnx_import { -constexpr NodeTypeInfo NullNode::type_info; - -std::shared_ptr NullNode::clone_with_new_inputs(const OutputVector& /* new_args */) const { +std::shared_ptr NullNode::clone_with_new_inputs(const ov::OutputVector& /* new_args */) const { return std::make_shared(); } } // namespace onnx_import diff --git a/src/frontends/paddle/include/openvino/frontend/paddle/node_context.hpp b/src/frontends/paddle/include/openvino/frontend/paddle/node_context.hpp index 545ac6391cf..e4da956f7c5 100644 --- a/src/frontends/paddle/include/openvino/frontend/paddle/node_context.hpp +++ b/src/frontends/paddle/include/openvino/frontend/paddle/node_context.hpp @@ -3,7 +3,6 @@ // #pragma once -#include "ngraph/compatibility.hpp" #include "openvino/core/any.hpp" #include "openvino/frontend/paddle/decoder.hpp" #include "openvino/frontend/paddle/exception.hpp" diff --git a/src/frontends/paddle/src/internal/op/conditional_block.cpp b/src/frontends/paddle/src/internal/op/conditional_block.cpp index c69bf9395a4..7cd45f15a42 100644 --- a/src/frontends/paddle/src/internal/op/conditional_block.cpp +++ b/src/frontends/paddle/src/internal/op/conditional_block.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ov; -BWDCMP_RTTI_DEFINITION(op::internal::ConditionalBlock); - op::internal::ConditionalBlock::ConditionalBlock( const Output& cond, bool is_scalar_condition, diff --git a/src/frontends/paddle/src/internal/op/conditional_block.hpp b/src/frontends/paddle/src/internal/op/conditional_block.hpp index 3711dbd4af6..8ed4bb865f8 100644 --- a/src/frontends/paddle/src/internal/op/conditional_block.hpp +++ b/src/frontends/paddle/src/internal/op/conditional_block.hpp @@ -12,7 +12,6 @@ namespace internal { class ConditionalBlock : public Op { public: OPENVINO_OP("ConditionalBlock", "internal"); - BWDCMP_RTTI_DECLARATION; ConditionalBlock() = default; diff --git a/src/frontends/paddle/src/internal/op/tensorarray_write.cpp b/src/frontends/paddle/src/internal/op/tensorarray_write.cpp index ca95e6d0ab2..529024e4303 100644 --- a/src/frontends/paddle/src/internal/op/tensorarray_write.cpp +++ b/src/frontends/paddle/src/internal/op/tensorarray_write.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ov; -BWDCMP_RTTI_DEFINITION(op::internal::TensorArrayWrite); - op::internal::TensorArrayWrite::TensorArrayWrite(const Output& input, const Output& index) : Op({input, index}) { constructor_validate_and_infer_types(); diff --git a/src/frontends/paddle/src/internal/op/tensorarray_write.hpp b/src/frontends/paddle/src/internal/op/tensorarray_write.hpp index f36431bba03..2efe4d199b7 100644 --- a/src/frontends/paddle/src/internal/op/tensorarray_write.hpp +++ b/src/frontends/paddle/src/internal/op/tensorarray_write.hpp @@ -12,7 +12,6 @@ namespace internal { class TensorArrayWrite : public Op { public: OPENVINO_OP("TensorArrayWrite", "internal"); - BWDCMP_RTTI_DECLARATION; TensorArrayWrite() = default; diff --git a/src/frontends/paddle/src/internal/op/while.cpp b/src/frontends/paddle/src/internal/op/while.cpp index 1455946bac4..09015c53638 100644 --- a/src/frontends/paddle/src/internal/op/while.cpp +++ b/src/frontends/paddle/src/internal/op/while.cpp @@ -13,8 +13,6 @@ using namespace std; using namespace ov; -BWDCMP_RTTI_DEFINITION(op::internal::While); - op::internal::While::While(const OutputVector& inputs, int32_t sub_block, const std::vector>& output_infos) diff --git a/src/frontends/paddle/src/internal/op/while.hpp b/src/frontends/paddle/src/internal/op/while.hpp index 56b89b06973..70667afc8fb 100644 --- a/src/frontends/paddle/src/internal/op/while.hpp +++ b/src/frontends/paddle/src/internal/op/while.hpp @@ -12,7 +12,6 @@ namespace internal { class While : public Op { public: OPENVINO_OP("While", "internal"); - BWDCMP_RTTI_DECLARATION; While() = default; diff --git a/src/inference/dev_api/exec_graph_info.hpp b/src/inference/dev_api/exec_graph_info.hpp index 7e34ae0c7ab..3ba5c8961ca 100644 --- a/src/inference/dev_api/exec_graph_info.hpp +++ b/src/inference/dev_api/exec_graph_info.hpp @@ -14,7 +14,7 @@ #include "ie_api.h" #include "ie_parameter.hpp" -#include "ngraph/node.hpp" +#include "openvino/op/op.hpp" /** * @brief A namespace with const values for Execution Graph parameters names. @@ -89,10 +89,9 @@ static const char RUNTIME_PRECISION[] = "runtimePrecision"; * - ExecGraphInfoSerialization::LAYER_TYPE * - ExecGraphInfoSerialization::RUNTIME_PRECISION */ -class INFERENCE_ENGINE_API_CLASS(ExecutionNode) : public ngraph::Node { +class INFERENCE_ENGINE_API_CLASS(ExecutionNode) : public ov::op::Op { public: - static constexpr ngraph::NodeTypeInfo type_info{"ExecutionNode", static_cast(0)}; - const ngraph::NodeTypeInfo& get_type_info() const override; + OPENVINO_OP("ExecutionNode"); /** * A default constructor with no node inputs and 0 output ports. @@ -105,7 +104,10 @@ public: * @param[in] arguments Inputs nodes * @param[in] output_size A number of output ports */ - ExecutionNode(const ngraph::OutputVector& arguments, size_t output_size = 1) : Node(arguments, output_size) {} + ExecutionNode(const ov::OutputVector& arguments, size_t output_size = 1) : ov::op::Op() { + set_arguments(arguments); + set_output_size(output_size); + } /** * @brief Creates a new execution node with the same state, but different input nodes @@ -114,7 +116,7 @@ public: * * @return A newly created execution node */ - std::shared_ptr clone_with_new_inputs(const ngraph::OutputVector& inputs) const override { + std::shared_ptr clone_with_new_inputs(const ov::OutputVector& inputs) const override { auto cloned = std::make_shared(); cloned->set_arguments(inputs); @@ -135,7 +137,7 @@ public: * * @return Returns `true` if an operation has completed successfully */ - bool visit_attributes(ngraph::AttributeVisitor& /*visitor*/) override { + bool visit_attributes(ov::AttributeVisitor& /*visitor*/) override { return true; } }; diff --git a/src/inference/src/ie_common.cpp b/src/inference/src/ie_common.cpp index e7961bef0e8..ce2e1ee06a6 100644 --- a/src/inference/src/ie_common.cpp +++ b/src/inference/src/ie_common.cpp @@ -18,17 +18,6 @@ #include "ie_parameter.hpp" #include "ngraph/opsets/opset.hpp" -namespace ExecGraphInfoSerialization { -// -// exec_graph_info.hpp -// -constexpr ngraph::NodeTypeInfo ExecutionNode::type_info; - -const ngraph::NodeTypeInfo& ExecutionNode::get_type_info() const { - return type_info; -} -} // namespace ExecGraphInfoSerialization - namespace InferenceEngine { // diff --git a/src/inference/tests/functional/ov_extension_test.cpp b/src/inference/tests/functional/ov_extension_test.cpp index 9a39e7133f4..8d22afd2909 100644 --- a/src/inference/tests/functional/ov_extension_test.cpp +++ b/src/inference/tests/functional/ov_extension_test.cpp @@ -194,10 +194,7 @@ std::string getIncorrectExtensionPath() { class CustomOldIdentity : public ngraph::op::Op { public: - static constexpr ngraph::NodeTypeInfo type_info{"Identity", static_cast(0)}; - const ngraph::NodeTypeInfo& get_type_info() const override { - return type_info; - } + OPENVINO_OP("Identity"); CustomOldIdentity() = default; CustomOldIdentity(const ngraph::Output& arg) : Op({arg}) { @@ -221,8 +218,6 @@ public: } }; -constexpr ngraph::NodeTypeInfo CustomOldIdentity::type_info; - class TestTileOldExtension : public InferenceEngine::IExtension { public: void GetVersion(const InferenceEngine::Version*& versionInfo) const noexcept override {} diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp index 156022db670..4fb926009bf 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp @@ -14,7 +14,6 @@ #include #include -#include #include "intel_gpu/plugin/device_config.hpp" diff --git a/src/tests/engines_util/execute_tools.cpp b/src/tests/engines_util/execute_tools.cpp index 6b34977298f..3327ddb500a 100644 --- a/src/tests/engines_util/execute_tools.cpp +++ b/src/tests/engines_util/execute_tools.cpp @@ -178,8 +178,6 @@ string get_results_str(const std::vector& ref_data, const std::vectorread(outputs[0]->get_data_ptr(), inputs[0]->get_size_in_bytes()); inputs[1]->read(outputs[1]->get_data_ptr(), inputs[1]->get_size_in_bytes()); diff --git a/src/tests/engines_util/execute_tools.hpp b/src/tests/engines_util/execute_tools.hpp index e31d8babb5d..156da189d3e 100644 --- a/src/tests/engines_util/execute_tools.hpp +++ b/src/tests/engines_util/execute_tools.hpp @@ -26,10 +26,7 @@ namespace ngraph { class TestOpMultiOut : public op::Op { public: - static constexpr NodeTypeInfo type_info{"TestOpMultiOut", static_cast(0)}; - const NodeTypeInfo& get_type_info() const override { - return type_info; - } + OPENVINO_OP("TestOpMultiOut"); TestOpMultiOut() = default; TestOpMultiOut(const Output& output_1, const Output& output_2) : Op({output_1, output_2}) {