diff --git a/src/common/low_precision_transformations/include/low_precision/markup_precisions.hpp b/src/common/low_precision_transformations/include/low_precision/markup_precisions.hpp index 783dcafb13f..97f3bc75699 100644 --- a/src/common/low_precision_transformations/include/low_precision/markup_precisions.hpp +++ b/src/common/low_precision_transformations/include/low_precision/markup_precisions.hpp @@ -39,12 +39,12 @@ public: class Restriction { public: explicit Restriction(const bool versionIsRequired) : versionIsRequired(versionIsRequired) {} - void add(const uint64_t version, const ngraph::pass::low_precision::PrecisionsRestriction::PrecisionsByPorts& precisions) { - precisionsByVersion.emplace(version, precisions); + void add(const std::string version_id, const ngraph::pass::low_precision::PrecisionsRestriction::PrecisionsByPorts& precisions) { + precisionsByVersion.emplace(version_id, precisions); } bool versionIsRequired; - std::unordered_map precisionsByVersion; + std::unordered_map precisionsByVersion; }; OPENVINO_RTTI("MarkupPrecisions", "0"); diff --git a/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp b/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp index 23558ec81a2..098da265cee 100644 --- a/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp +++ b/src/common/low_precision_transformations/include/low_precision/markup_quantization_granularity.hpp @@ -37,12 +37,12 @@ public: class PerTensorQuantization { public: explicit PerTensorQuantization(const bool versionIsRequired) : versionIsRequired(versionIsRequired) {} - void add(const uint64_t version, const std::vector& restrictions) { - portsByVersion.emplace(version, restrictions); + void add(const std::string version_id, const std::vector& restrictions) { + portsByVersion.emplace(version_id, restrictions); } bool versionIsRequired; - std::unordered_map> portsByVersion; + std::unordered_map> portsByVersion; }; OPENVINO_RTTI("MarkupPerTensorQuantization", "0"); diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/avg_pool_precision_preserved_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/avg_pool_precision_preserved_attribute.hpp index 4064edabf03..c7c84e21229 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/avg_pool_precision_preserved_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/avg_pool_precision_preserved_attribute.hpp @@ -23,7 +23,7 @@ namespace ngraph { */ class LP_TRANSFORMATIONS_API AvgPoolPrecisionPreservedAttribute : public PrecisionPreservedAttribute { public: - OPENVINO_RTTI("LowPrecision::AvgPoolPrecisionPreserved", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::AvgPoolPrecisionPreserved", "", ov::RuntimeAttribute); using PrecisionPreservedAttribute::PrecisionPreservedAttribute; void merge_attributes(std::vector& attributes); bool is_skipped() const; diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/intervals_alignment_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/intervals_alignment_attribute.hpp index dcdf5528560..99d6e814c2a 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/intervals_alignment_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/intervals_alignment_attribute.hpp @@ -58,7 +58,7 @@ public: */ class LP_TRANSFORMATIONS_API IntervalsAlignmentAttribute : public SharedAttribute { public: - OPENVINO_RTTI("LowPrecision::IntervalsAlignment", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::IntervalsAlignment", "", ov::RuntimeAttribute); IntervalsAlignmentAttribute() = default; IntervalsAlignmentAttribute(IntervalsAlignmentSharedValue::Interval combinedInterval, size_t levels); IntervalsAlignmentAttribute( diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/precision_preserved_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/precision_preserved_attribute.hpp index 13baf73c3eb..f5d14342a8f 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/precision_preserved_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/precision_preserved_attribute.hpp @@ -22,7 +22,7 @@ namespace ngraph { */ class LP_TRANSFORMATIONS_API PrecisionPreservedAttribute : public SharedAttribute { public: - OPENVINO_RTTI("LowPrecision::PrecisionPreserved", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::PrecisionPreserved", "", ov::RuntimeAttribute); PrecisionPreservedAttribute() = default; PrecisionPreservedAttribute(const bool value); diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/precisions_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/precisions_attribute.hpp index 41f88a290b6..0a69000b85e 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/precisions_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/precisions_attribute.hpp @@ -26,7 +26,7 @@ namespace ngraph { */ class LP_TRANSFORMATIONS_API PrecisionsAttribute : public SharedAttribute> { public: - OPENVINO_RTTI("LowPrecision::Precisions", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::Precisions", "", ov::RuntimeAttribute); PrecisionsAttribute(const std::vector& precisions); static ov::Any create( diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_alignment_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_alignment_attribute.hpp index 0c766b71885..30daa5f8073 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_alignment_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_alignment_attribute.hpp @@ -27,7 +27,7 @@ namespace ngraph { */ class LP_TRANSFORMATIONS_API QuantizationAlignmentAttribute : public SharedAttribute { public: - OPENVINO_RTTI("LowPrecision::QuantizationAlignment", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::QuantizationAlignment", "", ov::RuntimeAttribute); QuantizationAlignmentAttribute(const bool value = false); static ov::Any create( diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_granularity_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_granularity_attribute.hpp index 84f2bf474c8..df466ef041c 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_granularity_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_granularity_attribute.hpp @@ -22,7 +22,7 @@ namespace ngraph { */ class LP_TRANSFORMATIONS_API QuantizationGranularityAttribute : public ov::RuntimeAttribute { public: - OPENVINO_RTTI("LowPrecision::QuantizationGranularity", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::QuantizationGranularity", "", ov::RuntimeAttribute); enum class Granularity { PerChannel, diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_mode_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_mode_attribute.hpp index a3658061510..3c3a454e4b9 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_mode_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/quantization_mode_attribute.hpp @@ -12,7 +12,7 @@ namespace ngraph { class LP_TRANSFORMATIONS_API QuantizationModeAttribute : public ov::RuntimeAttribute { public: - OPENVINO_RTTI("LowPrecision::QuantizationModeAttribute", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::QuantizationModeAttribute", "", ov::RuntimeAttribute); enum class Mode { Asymmetric, diff --git a/src/common/low_precision_transformations/include/low_precision/rt_info/skip_cleanup_attribute.hpp b/src/common/low_precision_transformations/include/low_precision/rt_info/skip_cleanup_attribute.hpp index 1a11bbc2983..1b323ee9424 100644 --- a/src/common/low_precision_transformations/include/low_precision/rt_info/skip_cleanup_attribute.hpp +++ b/src/common/low_precision_transformations/include/low_precision/rt_info/skip_cleanup_attribute.hpp @@ -11,7 +11,7 @@ namespace ngraph { class LP_TRANSFORMATIONS_API SkipCleanupAttribute : public ov::RuntimeAttribute { public: - OPENVINO_RTTI("LowPrecision::SkipCleanup", "", ov::RuntimeAttribute, 0); + OPENVINO_RTTI("LowPrecision::SkipCleanup", "", ov::RuntimeAttribute); static ov::Any create(const std::shared_ptr& node); }; } // namespace ngraph diff --git a/src/common/low_precision_transformations/src/markup_precisions.cpp b/src/common/low_precision_transformations/src/markup_precisions.cpp index d5c168d4502..a1748036012 100644 --- a/src/common/low_precision_transformations/src/markup_precisions.cpp +++ b/src/common/low_precision_transformations/src/markup_precisions.cpp @@ -30,10 +30,10 @@ ngraph::pass::low_precision::MarkupPrecisions::MarkupPrecisions( OPENVINO_SUPPRESS_DEPRECATED_START if (it == restrictionsByOperation.end()) { Restriction r(restriction.specifyVersion); - r.precisionsByVersion.emplace(restriction.operationType.version, restriction.precisionsByPorts); + r.precisionsByVersion.emplace(restriction.operationType.version_id, restriction.precisionsByPorts); restrictionsByOperation.emplace(restriction.operationType.name, r); } else { - it->second.add(restriction.operationType.version, restriction.precisionsByPorts); + it->second.add(restriction.operationType.version_id, restriction.precisionsByPorts); } OPENVINO_SUPPRESS_DEPRECATED_END } @@ -108,9 +108,7 @@ bool ngraph::pass::low_precision::MarkupPrecisions::run_on_model(const std::shar if (it != restrictionsByOperation.end()) { const Restriction& r = it->second; if (r.versionIsRequired) { - OPENVINO_SUPPRESS_DEPRECATED_START - const auto it2 = r.precisionsByVersion.find(typeInfo.version); - OPENVINO_SUPPRESS_DEPRECATED_END + const auto it2 = r.precisionsByVersion.find(typeInfo.version_id); if (it2 == r.precisionsByVersion.end()) { continue; } diff --git a/src/common/low_precision_transformations/src/markup_quantization_granularity.cpp b/src/common/low_precision_transformations/src/markup_quantization_granularity.cpp index 7b86c1d2203..bbe448d8342 100644 --- a/src/common/low_precision_transformations/src/markup_quantization_granularity.cpp +++ b/src/common/low_precision_transformations/src/markup_quantization_granularity.cpp @@ -20,10 +20,10 @@ ngraph::pass::low_precision::MarkupQuantizationGranularity::MarkupQuantizationGr OPENVINO_SUPPRESS_DEPRECATED_START if (it == restrictionsByOperation.end()) { PerTensorQuantization r(restriction.specifyVersion); - r.portsByVersion.emplace(restriction.operationType.version, restriction.restrictions); + r.portsByVersion.emplace(restriction.operationType.version_id, restriction.restrictions); restrictionsByOperation.emplace(restriction.operationType.name, r); } else { - it->second.add(restriction.operationType.version, restriction.restrictions); + it->second.add(restriction.operationType.version_id, restriction.restrictions); } OPENVINO_SUPPRESS_DEPRECATED_END } @@ -74,9 +74,7 @@ bool ngraph::pass::low_precision::MarkupQuantizationGranularity::run_on_model(co } if (restriction.versionIsRequired) { - OPENVINO_SUPPRESS_DEPRECATED_START - const auto it2 = restriction.portsByVersion.find(node->get_type_info().version); - OPENVINO_SUPPRESS_DEPRECATED_END + const auto it2 = restriction.portsByVersion.find(node->get_type_info().version_id); if (it2 == restriction.portsByVersion.end()) { continue; } diff --git a/src/common/offline_transformations/include/mask_attribute.hpp b/src/common/offline_transformations/include/mask_attribute.hpp index 33ec516ded9..22ad9ba70d0 100644 --- a/src/common/offline_transformations/include/mask_attribute.hpp +++ b/src/common/offline_transformations/include/mask_attribute.hpp @@ -28,7 +28,7 @@ namespace ngraph { class Mask : public std::vector>, public std::enable_shared_from_this { public: static const ::ov::DiscreteTypeInfo& get_type_info_static() { - static const ::ov::DiscreteTypeInfo type_info_static{"Mask", 0, "0"}; + static const ::ov::DiscreteTypeInfo type_info_static{"Mask", "0"}; return type_info_static; } diff --git a/src/common/snippets/src/pass/common_optimizations.cpp b/src/common/snippets/src/pass/common_optimizations.cpp index 787fb8f650d..04278526ce8 100644 --- a/src/common/snippets/src/pass/common_optimizations.cpp +++ b/src/common/snippets/src/pass/common_optimizations.cpp @@ -17,7 +17,7 @@ #include "snippets/utils.hpp" #include "snippets/itt.hpp" -NGRAPH_RTTI_DEFINITION(ngraph::snippets::pass::CommonOptimizations, "Snippets::CommonOptimizations", 0); +NGRAPH_RTTI_DEFINITION(ngraph::snippets::pass::CommonOptimizations, "Snippets::CommonOptimizations"); namespace ngraph { namespace snippets { diff --git a/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp b/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp index 0c4f38628dc..31efd2533bc 100644 --- a/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp +++ b/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp @@ -29,14 +29,11 @@ namespace internal { template class NmsStaticShapeIE : public BaseNmsOp { public: - OPENVINO_SUPPRESS_DEPRECATED_START // TODO: it should be std::string("NmsStaticShapeIE_") + BaseNmsOp::get_type_info_static().name, // but currently it does not pass conversion to Legacy Opset correctly OPENVINO_RTTI(BaseNmsOp::get_type_info_static().name, "ie_internal_opset", - BaseNmsOp, - BaseNmsOp::get_type_info_static().version); - OPENVINO_SUPPRESS_DEPRECATED_END + BaseNmsOp); NmsStaticShapeIE() = default; diff --git a/src/common/transformations/include/ov_ops/type_relaxed.hpp b/src/common/transformations/include/ov_ops/type_relaxed.hpp index 47a791a4b0b..7bf5e663a0f 100644 --- a/src/common/transformations/include/ov_ops/type_relaxed.hpp +++ b/src/common/transformations/include/ov_ops/type_relaxed.hpp @@ -191,8 +191,7 @@ class TypeRelaxed : public BaseOp, public TypeRelaxedBase { public: OPENVINO_OP(BaseOp::get_type_info_static().name, BaseOp::get_type_info_static().version_id, - BaseOp, - BaseOp::get_type_info_static().version); + BaseOp); using BaseOp::BaseOp; diff --git a/src/common/transformations/tests/utils/compare_functions_test.cpp b/src/common/transformations/tests/utils/compare_functions_test.cpp index f27b30f18b9..c89eddb97a4 100644 --- a/src/common/transformations/tests/utils/compare_functions_test.cpp +++ b/src/common/transformations/tests/utils/compare_functions_test.cpp @@ -201,7 +201,7 @@ TEST(TransformationTests, CompareFunctoinsTINegative) { const auto fc = FunctionsComparator::with_default().enable(FunctionsComparator::ATTRIBUTES); auto res = fc(f, f_ref); EXPECT_FALSE(res.valid); - EXPECT_THAT(res.message, HasSubstr("LSTMCell/4 != Relu/0")); + EXPECT_THAT(res.message, HasSubstr("LSTMCell/opset4 != Relu/opset1")); } TEST(TransformationTests, CompareFunctoinsTINegativeDifferentElementTypeBetweenSubGraphsInputs) { @@ -514,7 +514,7 @@ public: DummyConstant& operator=(const DummyConstant&) = delete; const NodeTypeInfo& get_type_info() const override { - static const NodeTypeInfo type_info{typeid(this).name(), static_cast(0)}; + static const NodeTypeInfo type_info{typeid(this).name(), "0"}; return type_info; } diff --git a/src/core/include/ngraph/node.hpp b/src/core/include/ngraph/node.hpp index 776dcb6bebc..4cb26e7b764 100644 --- a/src/core/include/ngraph/node.hpp +++ b/src/core/include/ngraph/node.hpp @@ -150,18 +150,17 @@ using ov::check_new_args_count; } #endif -#define _NGRAPH_RTTI_DEFINITION_WITH_PARENT(CLASS, TYPE_NAME, _VERSION_INDEX, PARENT_CLASS) \ +#define _NGRAPH_RTTI_DEFINITION_WITH_PARENT(CLASS, TYPE_NAME, PARENT_CLASS) \ const ::ngraph::Node::type_info_t& CLASS::get_type_info_static() { \ static const ::ngraph::Node::type_info_t type_info_static{TYPE_NAME, \ - static_cast(_VERSION_INDEX), \ &PARENT_CLASS::get_type_info_static()}; \ return type_info_static; \ } \ _NGRAPH_RTTI_DEFINITION_COMMON(CLASS) -#define _NGRAPH_RTTI_DEFINITION_NO_PARENT(CLASS, TYPE_NAME, _VERSION_INDEX) \ +#define _NGRAPH_RTTI_DEFINITION_NO_PARENT(CLASS, TYPE_NAME) \ const ::ngraph::Node::type_info_t& CLASS::get_type_info_static() { \ - static const ::ngraph::Node::type_info_t type_info_static{TYPE_NAME, static_cast(_VERSION_INDEX)}; \ + static const ::ngraph::Node::type_info_t type_info_static{TYPE_NAME}; \ return type_info_static; \ } \ _NGRAPH_RTTI_DEFINITION_COMMON(CLASS) diff --git a/src/core/include/openvino/core/model.hpp b/src/core/include/openvino/core/model.hpp index 159a2c57533..e5d0158e538 100644 --- a/src/core/include/openvino/core/model.hpp +++ b/src/core/include/openvino/core/model.hpp @@ -47,7 +47,7 @@ class OPENVINO_API Model : public std::enable_shared_from_this { public: _OPENVINO_HIDDEN_METHOD static const ::ov::DiscreteTypeInfo& get_type_info_static() { - static const ::ov::DiscreteTypeInfo type_info_static{"Model", static_cast(0)}; + static const ::ov::DiscreteTypeInfo type_info_static{"Model"}; return type_info_static; } const ::ov::DiscreteTypeInfo& get_type_info() const { diff --git a/src/core/include/openvino/core/node.hpp b/src/core/include/openvino/core/node.hpp index 549fca57e2c..5662c336b4f 100644 --- a/src/core/include/openvino/core/node.hpp +++ b/src/core/include/openvino/core/node.hpp @@ -409,12 +409,8 @@ public: /// Get all the nodes that uses the current node NodeVector get_users(bool check_is_used = false) const; - /// \return Version of this node - OPENVINO_DEPRECATED("This method is deprecated and will be removed soon.") - virtual size_t get_version() const { - OPENVINO_SUPPRESS_DEPRECATED_START - return get_type_info().version; - OPENVINO_SUPPRESS_DEPRECATED_END + virtual std::shared_ptr get_default_value() const { + return nullptr; } /// Use instance ids for comparison instead of memory addresses to improve determinism diff --git a/src/core/include/openvino/core/rtti.hpp b/src/core/include/openvino/core/rtti.hpp index 505d6e687eb..06b541204d8 100644 --- a/src/core/include/openvino/core/rtti.hpp +++ b/src/core/include/openvino/core/rtti.hpp @@ -7,14 +7,14 @@ #include "openvino/core/type.hpp" #include "openvino/core/visibility.hpp" -#define _OPENVINO_RTTI_EXPAND(X) X -#define _OPENVINO_RTTI_DEFINITION_SELECTOR(_1, _2, _3, _4, NAME, ...) NAME +#define _OPENVINO_RTTI_EXPAND(X) X +#define _OPENVINO_RTTI_DEFINITION_SELECTOR(_1, _2, _3, NAME, ...) NAME #define _OPENVINO_RTTI_WITH_TYPE(TYPE_NAME) _OPENVINO_RTTI_WITH_TYPE_VERSION(TYPE_NAME, "util") #define _OPENVINO_RTTI_WITH_TYPE_VERSION(TYPE_NAME, VERSION_NAME) \ _OPENVINO_HIDDEN_METHOD static const ::ov::DiscreteTypeInfo& get_type_info_static() { \ - static ::ov::DiscreteTypeInfo type_info_static{TYPE_NAME, 0, VERSION_NAME}; \ + static ::ov::DiscreteTypeInfo type_info_static{TYPE_NAME, VERSION_NAME}; \ type_info_static.hash(); \ return type_info_static; \ } \ @@ -23,19 +23,18 @@ } #define _OPENVINO_RTTI_WITH_TYPE_VERSION_PARENT(TYPE_NAME, VERSION_NAME, PARENT_CLASS) \ - _OPENVINO_RTTI_WITH_TYPE_VERSIONS_PARENT(TYPE_NAME, VERSION_NAME, PARENT_CLASS, 0) + _OPENVINO_RTTI_WITH_TYPE_VERSIONS_PARENT(TYPE_NAME, VERSION_NAME, PARENT_CLASS) -#define _OPENVINO_RTTI_WITH_TYPE_VERSIONS_PARENT(TYPE_NAME, VERSION_NAME, PARENT_CLASS, OLD_VERSION) \ - _OPENVINO_HIDDEN_METHOD static const ::ov::DiscreteTypeInfo& get_type_info_static() { \ - static ::ov::DiscreteTypeInfo type_info_static{TYPE_NAME, \ - OLD_VERSION, \ - VERSION_NAME, \ - &PARENT_CLASS::get_type_info_static()}; \ - type_info_static.hash(); \ - return type_info_static; \ - } \ - const ::ov::DiscreteTypeInfo& get_type_info() const override { \ - return get_type_info_static(); \ +#define _OPENVINO_RTTI_WITH_TYPE_VERSIONS_PARENT(TYPE_NAME, VERSION_NAME, PARENT_CLASS) \ + _OPENVINO_HIDDEN_METHOD static const ::ov::DiscreteTypeInfo& get_type_info_static() { \ + static ::ov::DiscreteTypeInfo type_info_static{TYPE_NAME, \ + VERSION_NAME, \ + &PARENT_CLASS::get_type_info_static()}; \ + type_info_static.hash(); \ + return type_info_static; \ + } \ + const ::ov::DiscreteTypeInfo& get_type_info() const override { \ + return get_type_info_static(); \ } /// Helper macro that puts necessary declarations of RTTI block inside a class definition. @@ -92,11 +91,10 @@ /// OPENVINO_RTTI(name, version_id) /// OPENVINO_RTTI(name, version_id, parent) /// OPENVINO_RTTI(name, version_id, parent, old_version) -#define OPENVINO_RTTI(...) \ - _OPENVINO_RTTI_EXPAND(_OPENVINO_RTTI_DEFINITION_SELECTOR(__VA_ARGS__, \ - _OPENVINO_RTTI_WITH_TYPE_VERSIONS_PARENT, \ - _OPENVINO_RTTI_WITH_TYPE_VERSION_PARENT, \ - _OPENVINO_RTTI_WITH_TYPE_VERSION, \ +#define OPENVINO_RTTI(...) \ + _OPENVINO_RTTI_EXPAND(_OPENVINO_RTTI_DEFINITION_SELECTOR(__VA_ARGS__, \ + _OPENVINO_RTTI_WITH_TYPE_VERSION_PARENT, \ + _OPENVINO_RTTI_WITH_TYPE_VERSION, \ _OPENVINO_RTTI_WITH_TYPE)(__VA_ARGS__)) /// Note: Please don't use this macros for new operations diff --git a/src/core/include/openvino/core/runtime_attribute.hpp b/src/core/include/openvino/core/runtime_attribute.hpp index 4aca1b00330..5502c3eb8ff 100644 --- a/src/core/include/openvino/core/runtime_attribute.hpp +++ b/src/core/include/openvino/core/runtime_attribute.hpp @@ -20,7 +20,7 @@ class Any; class OPENVINO_API RuntimeAttribute { public: _OPENVINO_HIDDEN_METHOD static const DiscreteTypeInfo& get_type_info_static() { - static const ::ov::DiscreteTypeInfo type_info_static{"RuntimeAttribute", static_cast(0)}; + static const ::ov::DiscreteTypeInfo type_info_static{"RuntimeAttribute"}; return type_info_static; } virtual const DiscreteTypeInfo& get_type_info() const { diff --git a/src/core/include/openvino/core/type.hpp b/src/core/include/openvino/core/type.hpp index 6fa3e3d56f6..6ceaa39cbe0 100644 --- a/src/core/include/openvino/core/type.hpp +++ b/src/core/include/openvino/core/type.hpp @@ -30,14 +30,11 @@ namespace ov { */ struct OPENVINO_API DiscreteTypeInfo { const char* name; - OPENVINO_DEPRECATED("This member was deprecated. Please use version_id instead.") - uint64_t version; const char* version_id; // A pointer to a parent type info; used for casting and inheritance traversal, not for // exact type identification const DiscreteTypeInfo* parent; - OPENVINO_SUPPRESS_DEPRECATED_START DiscreteTypeInfo() = default; DiscreteTypeInfo(const DiscreteTypeInfo&) = default; DiscreteTypeInfo(DiscreteTypeInfo&&) = default; @@ -47,29 +44,16 @@ struct OPENVINO_API DiscreteTypeInfo { const char* _version_id, const DiscreteTypeInfo* _parent = nullptr) : name(_name), - version(0), version_id(_version_id), parent(_parent), hash_value(0) {} - constexpr DiscreteTypeInfo(const char* _name, uint64_t _version, const DiscreteTypeInfo* _parent = nullptr) + constexpr DiscreteTypeInfo(const char* _name, const DiscreteTypeInfo* _parent = nullptr) : name(_name), - version(_version), version_id(nullptr), parent(_parent), hash_value(0) {} - constexpr DiscreteTypeInfo(const char* _name, - uint64_t _version, - const char* _version_id, - const DiscreteTypeInfo* _parent = nullptr) - : name(_name), - version(_version), - version_id(_version_id), - parent(_parent), - hash_value(0) {} - OPENVINO_SUPPRESS_DEPRECATED_END - bool is_castable(const DiscreteTypeInfo& target_type) const; std::string get_version() const; diff --git a/src/core/include/openvino/op/acosh.hpp b/src/core/include/openvino/op/acosh.hpp index 97224708df1..59a2dd45e4b 100644 --- a/src/core/include/openvino/op/acosh.hpp +++ b/src/core/include/openvino/op/acosh.hpp @@ -16,7 +16,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Acosh : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("Acosh", "opset4", util::UnaryElementwiseArithmetic, 3); + OPENVINO_OP("Acosh", "opset4", util::UnaryElementwiseArithmetic); /// \brief Constructs an Acosh operation. Acosh() = default; diff --git a/src/core/include/openvino/op/add.hpp b/src/core/include/openvino/op/add.hpp index 0e2a812a9dc..054ec3302d8 100644 --- a/src/core/include/openvino/op/add.hpp +++ b/src/core/include/openvino/op/add.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Add : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Add", "opset1", util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Add", "opset1", util::BinaryElementwiseArithmetic); /// \brief Constructs an uninitialized addition operation Add() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/asinh.hpp b/src/core/include/openvino/op/asinh.hpp index 8fa8eedd687..96a7f02bfc7 100644 --- a/src/core/include/openvino/op/asinh.hpp +++ b/src/core/include/openvino/op/asinh.hpp @@ -15,7 +15,7 @@ namespace v3 { /// class OPENVINO_API Asinh : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("Asinh", "opset4", util::UnaryElementwiseArithmetic, 3); + OPENVINO_OP("Asinh", "opset4", util::UnaryElementwiseArithmetic); /// \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 7c5f2b477a5..2ba16d46195 100644 --- a/src/core/include/openvino/op/assign.hpp +++ b/src/core/include/openvino/op/assign.hpp @@ -14,7 +14,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Assign : public util::AssignBase { public: - OPENVINO_OP("Assign", "opset3", util::AssignBase, 3); + OPENVINO_OP("Assign", "opset3", util::AssignBase); Assign() = default; /// \brief Constructs an Assign operation. @@ -44,7 +44,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Assign : public util::AssignBase { public: - OPENVINO_OP("Assign", "opset6", util::AssignBase, 6); + OPENVINO_OP("Assign", "opset6", util::AssignBase); Assign() = default; /// \brief Constructs an Assign operation. diff --git a/src/core/include/openvino/op/atanh.hpp b/src/core/include/openvino/op/atanh.hpp index 5fc62facb56..4d4220b6fdc 100644 --- a/src/core/include/openvino/op/atanh.hpp +++ b/src/core/include/openvino/op/atanh.hpp @@ -16,7 +16,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Atanh : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("Atanh", "opset4", util::UnaryElementwiseArithmetic, 3); + OPENVINO_OP("Atanh", "opset4", util::UnaryElementwiseArithmetic); /// \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 a69e6cc8502..24298c8602b 100644 --- a/src/core/include/openvino/op/avg_pool.hpp +++ b/src/core/include/openvino/op/avg_pool.hpp @@ -14,7 +14,7 @@ namespace v1 { /// class OPENVINO_API AvgPool : public Op { public: - OPENVINO_OP("AvgPool", "opset1", op::Op, 1); + OPENVINO_OP("AvgPool", "opset1", op::Op); /// \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 7131f0078d6..3800090312c 100644 --- a/src/core/include/openvino/op/batch_norm.hpp +++ b/src/core/include/openvino/op/batch_norm.hpp @@ -59,7 +59,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API BatchNormInference : public Op { public: - OPENVINO_OP("BatchNormInference", "opset5", op::Op, 5); + OPENVINO_OP("BatchNormInference", "opset5", op::Op); 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 4d28c16d067..6609e539087 100644 --- a/src/core/include/openvino/op/batch_to_space.hpp +++ b/src/core/include/openvino/op/batch_to_space.hpp @@ -23,7 +23,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API BatchToSpace : public Op { public: - OPENVINO_OP("BatchToSpace", "opset2", op::Op, 1); + OPENVINO_OP("BatchToSpace", "opset2", op::Op); 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 0dbb2d494bd..8cdcd91e1b0 100644 --- a/src/core/include/openvino/op/binary_convolution.hpp +++ b/src/core/include/openvino/op/binary_convolution.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API BinaryConvolution : public Op { public: - OPENVINO_OP("BinaryConvolution", "opset1", op::Op, 1); + OPENVINO_OP("BinaryConvolution", "opset1", op::Op); enum class BinaryConvolutionMode { // Interpret input data and kernel values: 0 as -1, 1 as 1 diff --git a/src/core/include/openvino/op/broadcast.hpp b/src/core/include/openvino/op/broadcast.hpp index e41c7e6c601..fccffc5ed1d 100644 --- a/src/core/include/openvino/op/broadcast.hpp +++ b/src/core/include/openvino/op/broadcast.hpp @@ -17,7 +17,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Broadcast : public util::BroadcastBase { public: - OPENVINO_OP("Broadcast", "opset3", op::util::BroadcastBase, 3); + OPENVINO_OP("Broadcast", "opset3", op::util::BroadcastBase); /// \brief Constructs a broadcast operation. Broadcast() = default; @@ -81,7 +81,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Broadcast : public util::BroadcastBase { public: - OPENVINO_OP("Broadcast", "opset1", op::util::BroadcastBase, 1); + OPENVINO_OP("Broadcast", "opset1", op::util::BroadcastBase); /// \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 fa8d34579e7..33bbfbc8003 100644 --- a/src/core/include/openvino/op/bucketize.hpp +++ b/src/core/include/openvino/op/bucketize.hpp @@ -13,7 +13,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Bucketize : public Op { public: - OPENVINO_OP("Bucketize", "opset3", op::Op, 3); + OPENVINO_OP("Bucketize", "opset3", op::Op); Bucketize() = default; /// \brief Constructs a Bucketize node diff --git a/src/core/include/openvino/op/convert_like.hpp b/src/core/include/openvino/op/convert_like.hpp index 27bd89c6e9f..2621a1ce860 100644 --- a/src/core/include/openvino/op/convert_like.hpp +++ b/src/core/include/openvino/op/convert_like.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ConvertLike : public Op { public: - OPENVINO_OP("ConvertLike", "opset1", op::Op, 1); + OPENVINO_OP("ConvertLike", "opset1", op::Op); /// \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 87c17f8167c..f340fbb544c 100644 --- a/src/core/include/openvino/op/convolution.hpp +++ b/src/core/include/openvino/op/convolution.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Convolution : public Op { public: - OPENVINO_OP("Convolution", "opset1", op::Op, 1); + OPENVINO_OP("Convolution", "opset1", op::Op); /// \brief Constructs a batched convolution operation. Convolution() = default; @@ -129,7 +129,7 @@ private: /// \ingroup ov_ops_cpp_api class OPENVINO_API ConvolutionBackpropData : public Op { public: - OPENVINO_OP("ConvolutionBackpropData", "opset1", op::Op, 1); + OPENVINO_OP("ConvolutionBackpropData", "opset1", op::Op); /// \brief Constructs a batched-convolution data batch-backprop operation. ConvolutionBackpropData() = default; 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 4846f750cea..e07493a7811 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 @@ -14,7 +14,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API CTCGreedyDecoderSeqLen : public Op { public: - OPENVINO_OP("CTCGreedyDecoderSeqLen", "opset6", op::Op, 6); + OPENVINO_OP("CTCGreedyDecoderSeqLen", "opset6", op::Op); 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 21f143608fc..3a1077d9394 100644 --- a/src/core/include/openvino/op/ctc_loss.hpp +++ b/src/core/include/openvino/op/ctc_loss.hpp @@ -14,7 +14,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API CTCLoss : public Op { public: - OPENVINO_OP("CTCLoss", "opset4", op::Op, 4); + OPENVINO_OP("CTCLoss", "opset4", op::Op); CTCLoss() = default; /// \brief Constructs a CTCLoss operation diff --git a/src/core/include/openvino/op/deformable_convolution.hpp b/src/core/include/openvino/op/deformable_convolution.hpp index 3eb673cd340..993c779e5cb 100644 --- a/src/core/include/openvino/op/deformable_convolution.hpp +++ b/src/core/include/openvino/op/deformable_convolution.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API DeformableConvolution : public op::util::DeformableConvolutionBase { public: - OPENVINO_OP("DeformableConvolution", "opset1", op::util::DeformableConvolutionBase, 1); + OPENVINO_OP("DeformableConvolution", "opset1", op::util::DeformableConvolutionBase); /// \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 60bc07f3dd2..3e3315a95b9 100644 --- a/src/core/include/openvino/op/deformable_psroi_pooling.hpp +++ b/src/core/include/openvino/op/deformable_psroi_pooling.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API DeformablePSROIPooling : public Op { public: - OPENVINO_OP("DeformablePSROIPooling", "opset1", op::Op, 1); + OPENVINO_OP("DeformablePSROIPooling", "opset1", op::Op); DeformablePSROIPooling() = default; /// \brief Constructs a DeformablePSROIPooling operation diff --git a/src/core/include/openvino/op/dft.hpp b/src/core/include/openvino/op/dft.hpp index 6072f711650..b87262fd78b 100644 --- a/src/core/include/openvino/op/dft.hpp +++ b/src/core/include/openvino/op/dft.hpp @@ -29,7 +29,7 @@ namespace v7 { /// \ingroup ov_ops_cpp_api class OPENVINO_API DFT : public util::FFTBase { public: - OPENVINO_OP("DFT", "opset7", util::FFTBase, 7); + OPENVINO_OP("DFT", "opset7", util::FFTBase); 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 c4ef648683c..4d83d0043f4 100644 --- a/src/core/include/openvino/op/divide.hpp +++ b/src/core/include/openvino/op/divide.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Divide : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Divide", "opset1", util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Divide", "opset1", util::BinaryElementwiseArithmetic); /// \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 e42cdc0a94f..9d1c179c2c5 100644 --- a/src/core/include/openvino/op/einsum.hpp +++ b/src/core/include/openvino/op/einsum.hpp @@ -13,7 +13,7 @@ namespace v7 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Einsum : public Op { public: - OPENVINO_OP("Einsum", "opset7", op::Op, 7); + OPENVINO_OP("Einsum", "opset7", op::Op); Einsum() = default; diff --git a/src/core/include/openvino/op/embedding_segments_sum.hpp b/src/core/include/openvino/op/embedding_segments_sum.hpp index 8601bd9ac4e..55108f6ccb9 100644 --- a/src/core/include/openvino/op/embedding_segments_sum.hpp +++ b/src/core/include/openvino/op/embedding_segments_sum.hpp @@ -14,7 +14,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API EmbeddingSegmentsSum : public Op { public: - OPENVINO_OP("EmbeddingSegmentsSum", "opset3", op::Op, 3); + OPENVINO_OP("EmbeddingSegmentsSum", "opset3", op::Op); /// \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 0d88bdbd21a..7c3ad7a7b74 100644 --- a/src/core/include/openvino/op/embeddingbag_offsets_sum.hpp +++ b/src/core/include/openvino/op/embeddingbag_offsets_sum.hpp @@ -15,7 +15,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API EmbeddingBagOffsetsSum : public util::EmbeddingBagOffsetsBase { public: - OPENVINO_OP("EmbeddingBagOffsetsSum", "opset3", util::EmbeddingBagOffsetsBase, 3); + OPENVINO_OP("EmbeddingBagOffsetsSum", "opset3", util::EmbeddingBagOffsetsBase); /// \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 169b44484cb..b095b226a9e 100644 --- a/src/core/include/openvino/op/embeddingbag_packedsum.hpp +++ b/src/core/include/openvino/op/embeddingbag_packedsum.hpp @@ -15,7 +15,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API EmbeddingBagPackedSum : public util::EmbeddingBagPackedBase { public: - OPENVINO_OP("EmbeddingBagPackedSum", "opset3", util::EmbeddingBagPackedBase, 3); + OPENVINO_OP("EmbeddingBagPackedSum", "opset3", util::EmbeddingBagPackedBase); /// \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 c8e2af9cd57..ae16f6c6d52 100644 --- a/src/core/include/openvino/op/equal.hpp +++ b/src/core/include/openvino/op/equal.hpp @@ -29,7 +29,7 @@ namespace v1 { // clang-format on class OPENVINO_API Equal : public util::BinaryElementwiseComparison { public: - OPENVINO_OP("Equal", "opset1", op::util::BinaryElementwiseComparison, 1); + OPENVINO_OP("Equal", "opset1", op::util::BinaryElementwiseComparison); /// \brief Constructs an equal operation. Equal() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} /// \brief Constructs an equal operation. 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 c8e84bd6f09..17221d907cb 100644 --- a/src/core/include/openvino/op/experimental_detectron_detection_output.hpp +++ b/src/core/include/openvino/op/experimental_detectron_detection_output.hpp @@ -20,7 +20,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ExperimentalDetectronDetectionOutput : public Op { public: - OPENVINO_OP("ExperimentalDetectronDetectionOutput", "opset6", op::Op, 6); + OPENVINO_OP("ExperimentalDetectronDetectionOutput", "opset6", op::Op); /// \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 83bf6f769c7..af2bfe1511f 100644 --- a/src/core/include/openvino/op/experimental_detectron_generate_proposals.hpp +++ b/src/core/include/openvino/op/experimental_detectron_generate_proposals.hpp @@ -19,7 +19,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ExperimentalDetectronGenerateProposalsSingleImage : public Op { public: - OPENVINO_OP("ExperimentalDetectronGenerateProposalsSingleImage", "opset6", op::Op, 6); + OPENVINO_OP("ExperimentalDetectronGenerateProposalsSingleImage", "opset6", op::Op); /// \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 0dd697aec21..0865654a3dc 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 @@ -19,7 +19,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ExperimentalDetectronPriorGridGenerator : public Op { public: - OPENVINO_OP("ExperimentalDetectronPriorGridGenerator", "opset6", op::Op, 6); + OPENVINO_OP("ExperimentalDetectronPriorGridGenerator", "opset6", op::Op); /// \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 109115d08ab..b6b3d73b47d 100644 --- a/src/core/include/openvino/op/experimental_detectron_roi_feature.hpp +++ b/src/core/include/openvino/op/experimental_detectron_roi_feature.hpp @@ -20,7 +20,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ExperimentalDetectronROIFeatureExtractor : public Op { public: - OPENVINO_OP("ExperimentalDetectronROIFeatureExtractor", "opset6", op::Op, 6); + OPENVINO_OP("ExperimentalDetectronROIFeatureExtractor", "opset6", op::Op); /// \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 c12e1dcb374..90bb99ebc5c 100644 --- a/src/core/include/openvino/op/experimental_detectron_topkrois.hpp +++ b/src/core/include/openvino/op/experimental_detectron_topkrois.hpp @@ -19,7 +19,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ExperimentalDetectronTopKROIs : public Op { public: - OPENVINO_OP("ExperimentalDetectronTopKROIs", "opset6", op::Op, 6); + OPENVINO_OP("ExperimentalDetectronTopKROIs", "opset6", op::Op); 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 d9a0ca6ff6b..37d506fe189 100644 --- a/src/core/include/openvino/op/extractimagepatches.hpp +++ b/src/core/include/openvino/op/extractimagepatches.hpp @@ -14,7 +14,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ExtractImagePatches : public Op { public: - OPENVINO_OP("ExtractImagePatches", "opset3", op::Op, 3); + OPENVINO_OP("ExtractImagePatches", "opset3", op::Op); ExtractImagePatches() = default; /// \brief Constructs a ExtractImagePatches operation diff --git a/src/core/include/openvino/op/floor_mod.hpp b/src/core/include/openvino/op/floor_mod.hpp index 2216de28b61..4df54f3bcd7 100644 --- a/src/core/include/openvino/op/floor_mod.hpp +++ b/src/core/include/openvino/op/floor_mod.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API FloorMod : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("FloorMod", "opset1", op::util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("FloorMod", "opset1", op::util::BinaryElementwiseArithmetic); /// \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 55564080af1..e752259271c 100644 --- a/src/core/include/openvino/op/gather.hpp +++ b/src/core/include/openvino/op/gather.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Gather : public op::util::GatherBase { public: - OPENVINO_OP("Gather", "opset1", op::util::GatherBase, 1); + OPENVINO_OP("Gather", "opset1", op::util::GatherBase); static constexpr int64_t AXIS_NOT_SET_VALUE = std::numeric_limits::max(); Gather() = default; /// \param data The tensor from which slices are gathered @@ -33,7 +33,7 @@ namespace v7 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Gather : public op::util::GatherBase { public: - OPENVINO_OP("Gather", "opset7", op::util::GatherBase, 7); + OPENVINO_OP("Gather", "opset7", op::util::GatherBase); 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 c184d86e362..4d8c419e616 100644 --- a/src/core/include/openvino/op/gather_elements.hpp +++ b/src/core/include/openvino/op/gather_elements.hpp @@ -14,7 +14,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API GatherElements : public Op { public: - OPENVINO_OP("GatherElements", "opset6", op::Op, 6); + OPENVINO_OP("GatherElements", "opset6", op::Op); 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 146a1511664..59680a37d4e 100644 --- a/src/core/include/openvino/op/gather_nd.hpp +++ b/src/core/include/openvino/op/gather_nd.hpp @@ -13,7 +13,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API GatherND : public op::util::GatherNDBase { public: - OPENVINO_OP("GatherND", "opset5", op::util::GatherNDBase, 5); + OPENVINO_OP("GatherND", "opset5", op::util::GatherNDBase); 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 67f455be8a2..bc2169019a8 100644 --- a/src/core/include/openvino/op/gather_tree.hpp +++ b/src/core/include/openvino/op/gather_tree.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API GatherTree : public Op { public: - OPENVINO_OP("GatherTree", "opset1", op::Op, 1); + OPENVINO_OP("GatherTree", "opset1", op::Op); 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 021a7e0ef8b..ae868e3909b 100644 --- a/src/core/include/openvino/op/gelu.hpp +++ b/src/core/include/openvino/op/gelu.hpp @@ -15,7 +15,7 @@ namespace v0 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Gelu : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("Gelu", "opset2", util::UnaryElementwiseArithmetic, 0); + OPENVINO_OP("Gelu", "opset2", util::UnaryElementwiseArithmetic); Gelu(); /// \brief Constructs a Gelu operation. @@ -43,7 +43,7 @@ namespace v7 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Gelu : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("Gelu", "opset7", util::UnaryElementwiseArithmetic, 7); + OPENVINO_OP("Gelu", "opset7", util::UnaryElementwiseArithmetic); Gelu() = default; /// \brief Constructs a Gelu operation. diff --git a/src/core/include/openvino/op/greater.hpp b/src/core/include/openvino/op/greater.hpp index 1693c09579b..de889a0acae 100644 --- a/src/core/include/openvino/op/greater.hpp +++ b/src/core/include/openvino/op/greater.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Greater : public util::BinaryElementwiseComparison { public: - OPENVINO_OP("Greater", "opset1", op::util::BinaryElementwiseComparison, 1); + OPENVINO_OP("Greater", "opset1", op::util::BinaryElementwiseComparison); /// \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 f4731a2da74..1f5fe1f984c 100644 --- a/src/core/include/openvino/op/greater_eq.hpp +++ b/src/core/include/openvino/op/greater_eq.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API GreaterEqual : public util::BinaryElementwiseComparison { public: - OPENVINO_OP("GreaterEqual", "opset1", op::util::BinaryElementwiseComparison, 1); + OPENVINO_OP("GreaterEqual", "opset1", op::util::BinaryElementwiseComparison); /// \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/group_conv.hpp b/src/core/include/openvino/op/group_conv.hpp index f01c2a7f3dc..a37a26e480e 100644 --- a/src/core/include/openvino/op/group_conv.hpp +++ b/src/core/include/openvino/op/group_conv.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \brief Batched convolution operation, with optional window dilation and stride. class OPENVINO_API GroupConvolution : public Op { public: - OPENVINO_OP("GroupConvolution", "opset1", op::Op, 1); + OPENVINO_OP("GroupConvolution", "opset1", op::Op); /// \brief Constructs a batched convolution operation. GroupConvolution() = default; @@ -126,7 +126,7 @@ private: /// \brief Data batch backprop for batched convolution operation. class OPENVINO_API GroupConvolutionBackpropData : public Op { public: - OPENVINO_OP("GroupConvolutionBackpropData", "opset1", op::Op, 1); + OPENVINO_OP("GroupConvolutionBackpropData", "opset1", op::Op); /// \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 2610c4731ae..15543eec2b9 100644 --- a/src/core/include/openvino/op/gru_cell.hpp +++ b/src/core/include/openvino/op/gru_cell.hpp @@ -24,7 +24,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API GRUCell : public util::RNNCellBase { public: - OPENVINO_OP("GRUCell", "opset3", op::util::RNNCellBase, 3); + OPENVINO_OP("GRUCell", "opset3", op::util::RNNCellBase); 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 1fc9e7c9147..fae54509ad0 100644 --- a/src/core/include/openvino/op/gru_sequence.hpp +++ b/src/core/include/openvino/op/gru_sequence.hpp @@ -19,7 +19,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API GRUSequence : public util::RNNCellBase { public: - OPENVINO_OP("GRUSequence", "opset5", op::Op, 5); + OPENVINO_OP("GRUSequence", "opset5", op::Op); GRUSequence(); GRUSequence(const Output& X, diff --git a/src/core/include/openvino/op/hsigmoid.hpp b/src/core/include/openvino/op/hsigmoid.hpp index abf8d2e1cf8..71b07ada902 100644 --- a/src/core/include/openvino/op/hsigmoid.hpp +++ b/src/core/include/openvino/op/hsigmoid.hpp @@ -17,7 +17,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API HSigmoid : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("HSigmoid", "opset5", op::util::UnaryElementwiseArithmetic, 5); + OPENVINO_OP("HSigmoid", "opset5", op::util::UnaryElementwiseArithmetic); 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 b20e3498b90..34cff2955b5 100644 --- a/src/core/include/openvino/op/hswish.hpp +++ b/src/core/include/openvino/op/hswish.hpp @@ -17,7 +17,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API HSwish : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("HSwish", "opset4", op::util::UnaryElementwiseArithmetic, 4); + OPENVINO_OP("HSwish", "opset4", op::util::UnaryElementwiseArithmetic); HSwish() = default; /// \brief Constructs a HSwish (hard version of Swish) operation. diff --git a/src/core/include/openvino/op/idft.hpp b/src/core/include/openvino/op/idft.hpp index ea6b0a737a4..1fd0948bc9c 100644 --- a/src/core/include/openvino/op/idft.hpp +++ b/src/core/include/openvino/op/idft.hpp @@ -17,7 +17,7 @@ namespace v7 { /// \ingroup ov_ops_cpp_api class OPENVINO_API IDFT : public util::FFTBase { public: - OPENVINO_OP("IDFT", "opset7", util::FFTBase, 7); + OPENVINO_OP("IDFT", "opset7", util::FFTBase); IDFT() = default; /// \brief Constructs a IDFT operation. IDFT is performed for full size axes. diff --git a/src/core/include/openvino/op/interpolate.hpp b/src/core/include/openvino/op/interpolate.hpp index cec3a88e3f5..d6e32cc28cb 100644 --- a/src/core/include/openvino/op/interpolate.hpp +++ b/src/core/include/openvino/op/interpolate.hpp @@ -83,7 +83,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Interpolate : public util::InterpolateBase { public: - OPENVINO_OP("Interpolate", "opset4", util::InterpolateBase, 4); + OPENVINO_OP("Interpolate", "opset4", util::InterpolateBase); Interpolate() = default; /// \brief Constructs a Interpolate operation without 'axes' input. @@ -190,7 +190,7 @@ namespace v11 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Interpolate : public util::InterpolateBase { public: - OPENVINO_OP("Interpolate", "opset11", util::InterpolateBase, 11); + OPENVINO_OP("Interpolate", "opset11", util::InterpolateBase); Interpolate() = default; /// \brief Constructs a Interpolate operation without 'axes' input. /// diff --git a/src/core/include/openvino/op/less.hpp b/src/core/include/openvino/op/less.hpp index d11285b871e..3d87ab9b6ff 100644 --- a/src/core/include/openvino/op/less.hpp +++ b/src/core/include/openvino/op/less.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Less : public util::BinaryElementwiseComparison { public: - OPENVINO_OP("Less", "opset1", op::util::BinaryElementwiseComparison, 1); + OPENVINO_OP("Less", "opset1", op::util::BinaryElementwiseComparison); /// \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 6b725f749c2..111f4c07140 100644 --- a/src/core/include/openvino/op/less_eq.hpp +++ b/src/core/include/openvino/op/less_eq.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LessEqual : public util::BinaryElementwiseComparison { public: - OPENVINO_OP("LessEqual", "opset1", op::util::BinaryElementwiseComparison, 1); + OPENVINO_OP("LessEqual", "opset1", op::util::BinaryElementwiseComparison); /// \brief Constructs a less-than-or-equal operation. LessEqual() : util::BinaryElementwiseComparison(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/log_softmax.hpp b/src/core/include/openvino/op/log_softmax.hpp index d441e645998..b4bca830a08 100644 --- a/src/core/include/openvino/op/log_softmax.hpp +++ b/src/core/include/openvino/op/log_softmax.hpp @@ -14,7 +14,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LogSoftmax : public Op { public: - OPENVINO_OP("LogSoftmax", "opset5", op::Op, 5); + OPENVINO_OP("LogSoftmax", "opset5", op::Op); 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 8580accfe46..6d55f8f3585 100644 --- a/src/core/include/openvino/op/logical_and.hpp +++ b/src/core/include/openvino/op/logical_and.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LogicalAnd : public util::BinaryElementwiseLogical { public: - OPENVINO_OP("LogicalAnd", "opset1", util::BinaryElementwiseLogical, 1); + OPENVINO_OP("LogicalAnd", "opset1", util::BinaryElementwiseLogical); /// \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 9b50a8e2ecc..c5421b8db14 100644 --- a/src/core/include/openvino/op/logical_not.hpp +++ b/src/core/include/openvino/op/logical_not.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LogicalNot : public Op { public: - OPENVINO_OP("LogicalNot", "opset1", op::Op, 1); + OPENVINO_OP("LogicalNot", "opset1", op::Op); /// \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 379b773d376..15c00eea04b 100644 --- a/src/core/include/openvino/op/logical_or.hpp +++ b/src/core/include/openvino/op/logical_or.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LogicalOr : public util::BinaryElementwiseLogical { public: - OPENVINO_OP("LogicalOr", "opset1", util::BinaryElementwiseLogical, 1); + OPENVINO_OP("LogicalOr", "opset1", util::BinaryElementwiseLogical); 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 9e94a1756f9..41ad89abca2 100644 --- a/src/core/include/openvino/op/logical_xor.hpp +++ b/src/core/include/openvino/op/logical_xor.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LogicalXor : public util::BinaryElementwiseLogical { public: - OPENVINO_OP("LogicalXor", "opset2", util::BinaryElementwiseLogical, 1); + OPENVINO_OP("LogicalXor", "opset2", util::BinaryElementwiseLogical); 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 7bbc00dc75c..cb174d588b7 100644 --- a/src/core/include/openvino/op/loop.hpp +++ b/src/core/include/openvino/op/loop.hpp @@ -31,7 +31,7 @@ public: int64_t body_condition_output_idx = -1; }; - OPENVINO_OP("Loop", "opset5", op::util::SubGraphOp, 5); + OPENVINO_OP("Loop", "opset5", op::util::SubGraphOp); /// \brief Constructs a Loop operation. Loop() = default; diff --git a/src/core/include/openvino/op/lstm_cell.hpp b/src/core/include/openvino/op/lstm_cell.hpp index 3c9e53be10c..249b3dccdc2 100644 --- a/src/core/include/openvino/op/lstm_cell.hpp +++ b/src/core/include/openvino/op/lstm_cell.hpp @@ -278,7 +278,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LSTMCell : public util::RNNCellBase { public: - OPENVINO_OP("LSTMCell", "opset4", op::util::RNNCellBase, 4); + OPENVINO_OP("LSTMCell", "opset4", op::util::RNNCellBase); LSTMCell(); /// diff --git a/src/core/include/openvino/op/lstm_sequence.hpp b/src/core/include/openvino/op/lstm_sequence.hpp index 3296bd54208..1e7599a35ba 100644 --- a/src/core/include/openvino/op/lstm_sequence.hpp +++ b/src/core/include/openvino/op/lstm_sequence.hpp @@ -127,7 +127,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API LSTMSequence : public util::RNNCellBase { public: - OPENVINO_OP("LSTMSequence", "opset5", util::RNNCellBase, 5); + OPENVINO_OP("LSTMSequence", "opset5", util::RNNCellBase); LSTMSequence() = default; using direction = RecurrentSequenceDirection; diff --git a/src/core/include/openvino/op/max_pool.hpp b/src/core/include/openvino/op/max_pool.hpp index 2acfdb9d12b..c1741eef6cb 100644 --- a/src/core/include/openvino/op/max_pool.hpp +++ b/src/core/include/openvino/op/max_pool.hpp @@ -15,7 +15,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API MaxPool : public op::util::MaxPoolBase { public: - OPENVINO_OP("MaxPool", "opset1", op::util::MaxPoolBase, 1); + OPENVINO_OP("MaxPool", "opset1", op::util::MaxPoolBase); /// \brief Constructs a batched max pooling operation. MaxPool() = default; diff --git a/src/core/include/openvino/op/maximum.hpp b/src/core/include/openvino/op/maximum.hpp index 5c21463c2ec..742878b09c4 100644 --- a/src/core/include/openvino/op/maximum.hpp +++ b/src/core/include/openvino/op/maximum.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Maximum : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Maximum", "opset1", op::util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Maximum", "opset1", op::util::BinaryElementwiseArithmetic); /// \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 afd75c41ea5..c8cfc5c9d7c 100644 --- a/src/core/include/openvino/op/minimum.hpp +++ b/src/core/include/openvino/op/minimum.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Minimum : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Minimum", "opset1", op::util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Minimum", "opset1", op::util::BinaryElementwiseArithmetic); /// \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 1d3a53ca753..455bd713166 100644 --- a/src/core/include/openvino/op/mish.hpp +++ b/src/core/include/openvino/op/mish.hpp @@ -15,7 +15,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Mish : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("Mish", "opset4", util::UnaryElementwiseArithmetic, 4); + OPENVINO_OP("Mish", "opset4", util::UnaryElementwiseArithmetic); 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 749a7ae2b7e..5e58a2ec03d 100644 --- a/src/core/include/openvino/op/mod.hpp +++ b/src/core/include/openvino/op/mod.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Mod : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Mod", "opset1", op::util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Mod", "opset1", op::util::BinaryElementwiseArithmetic); /// \brief Constructs a Mod node. Mod() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/multiply.hpp b/src/core/include/openvino/op/multiply.hpp index 259c0b9f03a..2e2f3bd4c73 100644 --- a/src/core/include/openvino/op/multiply.hpp +++ b/src/core/include/openvino/op/multiply.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Multiply : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Multiply", "opset1", util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Multiply", "opset1", util::BinaryElementwiseArithmetic); /// \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 c9a3920aedb..7f198ec1444 100644 --- a/src/core/include/openvino/op/mvn.hpp +++ b/src/core/include/openvino/op/mvn.hpp @@ -99,7 +99,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API MVN : public Op { public: - OPENVINO_OP("MVN", "opset6", op::Op, 6); + OPENVINO_OP("MVN", "opset6", op::Op); MVN() = default; /// \brief Constructs an MVN operation. diff --git a/src/core/include/openvino/op/non_max_suppression.hpp b/src/core/include/openvino/op/non_max_suppression.hpp index 143df579e0a..5216c537006 100644 --- a/src/core/include/openvino/op/non_max_suppression.hpp +++ b/src/core/include/openvino/op/non_max_suppression.hpp @@ -16,7 +16,7 @@ class OPENVINO_API NonMaxSuppression : public Op { public: enum class BoxEncodingType { CORNER, CENTER }; - OPENVINO_OP("NonMaxSuppression", "opset1", op::Op, 1); + OPENVINO_OP("NonMaxSuppression", "opset1", op::Op); NonMaxSuppression() = default; @@ -86,7 +86,7 @@ class OPENVINO_API NonMaxSuppression : public Op { public: enum class BoxEncodingType { CORNER, CENTER }; - OPENVINO_OP("NonMaxSuppression", "opset3", op::Op, 3); + OPENVINO_OP("NonMaxSuppression", "opset3", op::Op); NonMaxSuppression() = default; /// \brief Constructs a NonMaxSuppression operation. @@ -166,7 +166,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API NonMaxSuppression : public op::v3::NonMaxSuppression { public: - OPENVINO_OP("NonMaxSuppression", "opset4", op::v3::NonMaxSuppression, 4); + OPENVINO_OP("NonMaxSuppression", "opset4", op::v3::NonMaxSuppression); NonMaxSuppression() = default; /// \brief Constructs a NonMaxSuppression operation. @@ -217,7 +217,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API NonMaxSuppression : public Op { public: - OPENVINO_OP("NonMaxSuppression", "opset5", op::Op, 5); + OPENVINO_OP("NonMaxSuppression", "opset5", op::Op); enum class BoxEncodingType { CORNER, CENTER }; NonMaxSuppression() = default; @@ -365,7 +365,7 @@ namespace v9 { /// class OPENVINO_API NonMaxSuppression : public Op { public: - OPENVINO_OP("NonMaxSuppression", "opset9", op::Op, 9); + OPENVINO_OP("NonMaxSuppression", "opset9", op::Op); enum class BoxEncodingType { CORNER, CENTER }; NonMaxSuppression() = default; diff --git a/src/core/include/openvino/op/non_zero.hpp b/src/core/include/openvino/op/non_zero.hpp index f45ae824a47..e14d757e5ff 100644 --- a/src/core/include/openvino/op/non_zero.hpp +++ b/src/core/include/openvino/op/non_zero.hpp @@ -20,7 +20,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API NonZero : public Op { public: - OPENVINO_OP("NonZero", "opset3", op::Op, 3); + OPENVINO_OP("NonZero", "opset3", op::Op); /// \brief Constructs a NonZero operation. NonZero() = default; /// \brief Constructs a NonZero operation. diff --git a/src/core/include/openvino/op/not_equal.hpp b/src/core/include/openvino/op/not_equal.hpp index 930244094d3..dfae8b59a8f 100644 --- a/src/core/include/openvino/op/not_equal.hpp +++ b/src/core/include/openvino/op/not_equal.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API NotEqual : public util::BinaryElementwiseComparison { public: - OPENVINO_OP("NotEqual", "opset1", op::util::BinaryElementwiseComparison, 1); + OPENVINO_OP("NotEqual", "opset1", op::util::BinaryElementwiseComparison); /// \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/one_hot.hpp b/src/core/include/openvino/op/one_hot.hpp index e911d838a52..621fd8483c0 100644 --- a/src/core/include/openvino/op/one_hot.hpp +++ b/src/core/include/openvino/op/one_hot.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API OneHot : public Op { public: - OPENVINO_OP("OneHot", "opset1", op::Op, 1); + OPENVINO_OP("OneHot", "opset1", op::Op); /// \brief Constructs a one-hot operation. OneHot() = default; diff --git a/src/core/include/openvino/op/op.hpp b/src/core/include/openvino/op/op.hpp index c0a57a90323..79640071807 100644 --- a/src/core/include/openvino/op/op.hpp +++ b/src/core/include/openvino/op/op.hpp @@ -16,7 +16,6 @@ #define OPENVINO_OP(...) \ _OPENVINO_RTTI_EXPAND(_OPENVINO_RTTI_DEFINITION_SELECTOR(__VA_ARGS__, \ - _OPENVINO_RTTI_WITH_TYPE_VERSIONS_PARENT, \ _OPENVINO_RTTI_WITH_TYPE_VERSION_PARENT, \ _OPENVINO_RTTI_OP_WITH_TYPE_VERSION, \ _OPENVINO_RTTI_OP_WITH_TYPE)(__VA_ARGS__)) \ @@ -40,7 +39,7 @@ protected: public: _OPENVINO_HIDDEN_METHOD static const ::ov::Node::type_info_t& get_type_info_static() { - static ::ov::Node::type_info_t info{"Op", 0, "util"}; + static ::ov::Node::type_info_t info{"Op", "util"}; info.hash(); return info; } diff --git a/src/core/include/openvino/op/pad.hpp b/src/core/include/openvino/op/pad.hpp index 4f8779f6d16..a45c1f33dd5 100644 --- a/src/core/include/openvino/op/pad.hpp +++ b/src/core/include/openvino/op/pad.hpp @@ -15,7 +15,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Pad : public Op { public: - OPENVINO_OP("Pad", "opset1", op::Op, 1); + OPENVINO_OP("Pad", "opset1", op::Op); /// \brief Constructs a generic padding operation. /// diff --git a/src/core/include/openvino/op/power.hpp b/src/core/include/openvino/op/power.hpp index c2bb08f4154..c89a98c61a2 100644 --- a/src/core/include/openvino/op/power.hpp +++ b/src/core/include/openvino/op/power.hpp @@ -28,7 +28,7 @@ namespace v1 { // clang-format on class OPENVINO_API Power : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Power", "opset1", op::util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Power", "opset1", op::util::BinaryElementwiseArithmetic); Power() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/proposal.hpp b/src/core/include/openvino/op/proposal.hpp index 6f7960133d3..c09282594d3 100644 --- a/src/core/include/openvino/op/proposal.hpp +++ b/src/core/include/openvino/op/proposal.hpp @@ -78,7 +78,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Proposal : public op::v0::Proposal { public: - OPENVINO_OP("Proposal", "opset4", op::Op, 4); + OPENVINO_OP("Proposal", "opset4", op::Op); Proposal() = default; /// \brief Constructs a Proposal operation /// diff --git a/src/core/include/openvino/op/range.hpp b/src/core/include/openvino/op/range.hpp index 1cd44aed49f..1222d14874d 100644 --- a/src/core/include/openvino/op/range.hpp +++ b/src/core/include/openvino/op/range.hpp @@ -13,7 +13,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Range : public Op { public: - OPENVINO_OP("Range", "opset4", op::Op, 4); + OPENVINO_OP("Range", "opset4", op::Op); /// \brief Constructs an unitialized range operation. Range() = default; diff --git a/src/core/include/openvino/op/read_value.hpp b/src/core/include/openvino/op/read_value.hpp index 87a861b4a1e..38c539427b0 100644 --- a/src/core/include/openvino/op/read_value.hpp +++ b/src/core/include/openvino/op/read_value.hpp @@ -15,7 +15,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReadValue : public util::ReadValueBase { public: - OPENVINO_OP("ReadValue", "opset3", util::ReadValueBase, 3); + OPENVINO_OP("ReadValue", "opset3", util::ReadValueBase); ReadValue() = default; /// \brief Constructs a ReadValue operation. @@ -45,7 +45,7 @@ namespace v6 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReadValue : public util::ReadValueBase { public: - OPENVINO_OP("ReadValue", "opset6", util::ReadValueBase, 6); + OPENVINO_OP("ReadValue", "opset6", util::ReadValueBase); 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 a9f5024c6aa..4889e5c52a6 100644 --- a/src/core/include/openvino/op/reduce_l1.hpp +++ b/src/core/include/openvino/op/reduce_l1.hpp @@ -16,7 +16,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceL1 : public util::ArithmeticReductionKeepDims { public: - OPENVINO_OP("ReduceL1", "opset4", util::ArithmeticReductionKeepDims, 4); + OPENVINO_OP("ReduceL1", "opset4", util::ArithmeticReductionKeepDims); /// \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 c2a18ac3668..9f9b38b7dc5 100644 --- a/src/core/include/openvino/op/reduce_l2.hpp +++ b/src/core/include/openvino/op/reduce_l2.hpp @@ -15,7 +15,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceL2 : public util::ArithmeticReductionKeepDims { public: - OPENVINO_OP("ReduceL2", "opset4", util::ArithmeticReductionKeepDims, 4); + OPENVINO_OP("ReduceL2", "opset4", util::ArithmeticReductionKeepDims); /// \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 b7e839ab106..1358702a1fd 100644 --- a/src/core/include/openvino/op/reduce_logical_and.hpp +++ b/src/core/include/openvino/op/reduce_logical_and.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceLogicalAnd : public util::LogicalReductionKeepDims { public: - OPENVINO_OP("ReduceLogicalAnd", "opset1", util::LogicalReductionKeepDims, 1); + OPENVINO_OP("ReduceLogicalAnd", "opset1", util::LogicalReductionKeepDims); 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 67fe065db45..36a3fd34759 100644 --- a/src/core/include/openvino/op/reduce_logical_or.hpp +++ b/src/core/include/openvino/op/reduce_logical_or.hpp @@ -16,7 +16,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceLogicalOr : public util::LogicalReductionKeepDims { public: - OPENVINO_OP("ReduceLogicalOr", "opset1", util::LogicalReductionKeepDims, 1); + OPENVINO_OP("ReduceLogicalOr", "opset1", util::LogicalReductionKeepDims); 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 b1579ad5ccb..499dec82bb9 100644 --- a/src/core/include/openvino/op/reduce_max.hpp +++ b/src/core/include/openvino/op/reduce_max.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceMax : public util::ArithmeticReductionKeepDims { public: - OPENVINO_OP("ReduceMax", "opset1", util::ArithmeticReductionKeepDims, 1); + OPENVINO_OP("ReduceMax", "opset1", util::ArithmeticReductionKeepDims); /// \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 41459857e08..7b50dd57b7d 100644 --- a/src/core/include/openvino/op/reduce_mean.hpp +++ b/src/core/include/openvino/op/reduce_mean.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceMean : public util::ArithmeticReductionKeepDims { public: - OPENVINO_OP("ReduceMean", "opset1", util::ArithmeticReductionKeepDims, 1); + OPENVINO_OP("ReduceMean", "opset1", util::ArithmeticReductionKeepDims); 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 464b232ed5f..830021a0bb2 100644 --- a/src/core/include/openvino/op/reduce_min.hpp +++ b/src/core/include/openvino/op/reduce_min.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceMin : public util::ArithmeticReductionKeepDims { public: - OPENVINO_OP("ReduceMin", "opset1", util::ArithmeticReductionKeepDims, 1); + OPENVINO_OP("ReduceMin", "opset1", util::ArithmeticReductionKeepDims); /// \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 c8697c81bcd..4a9af6339b6 100644 --- a/src/core/include/openvino/op/reduce_prod.hpp +++ b/src/core/include/openvino/op/reduce_prod.hpp @@ -15,7 +15,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ReduceProd : public util::ArithmeticReductionKeepDims { public: - OPENVINO_OP("ReduceProd", "opset1", util::ArithmeticReductionKeepDims, 1); + OPENVINO_OP("ReduceProd", "opset1", util::ArithmeticReductionKeepDims); /// \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 60622fd2b7e..7a3221c68e5 100644 --- a/src/core/include/openvino/op/reduce_sum.hpp +++ b/src/core/include/openvino/op/reduce_sum.hpp @@ -61,7 +61,7 @@ namespace v1 { // clang-format on class OPENVINO_API ReduceSum : public util::ArithmeticReductionKeepDims { public: - OPENVINO_OP("ReduceSum", "opset1", util::ArithmeticReductionKeepDims, 1); + OPENVINO_OP("ReduceSum", "opset1", util::ArithmeticReductionKeepDims); /// \brief Constructs a summation operation. ReduceSum() = default; /// \brief Constructs a summation operation. diff --git a/src/core/include/openvino/op/reshape.hpp b/src/core/include/openvino/op/reshape.hpp index 2905e4ad5ec..9d4ecc18da1 100644 --- a/src/core/include/openvino/op/reshape.hpp +++ b/src/core/include/openvino/op/reshape.hpp @@ -17,7 +17,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Reshape : public Op { public: - OPENVINO_OP("Reshape", "opset1", op::Op, 1); + OPENVINO_OP("Reshape", "opset1", op::Op); Reshape() = default; /// \brief Constructs a dynamic reshape operation. This operation does not perform /// transpose. diff --git a/src/core/include/openvino/op/reverse.hpp b/src/core/include/openvino/op/reverse.hpp index 37266573f72..7b1a904aacf 100644 --- a/src/core/include/openvino/op/reverse.hpp +++ b/src/core/include/openvino/op/reverse.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Reverse : public Op { public: - OPENVINO_OP("Reverse", "opset1", op::Op, 1); + OPENVINO_OP("Reverse", "opset1", op::Op); enum class Mode { INDEX, MASK }; diff --git a/src/core/include/openvino/op/rnn_sequence.hpp b/src/core/include/openvino/op/rnn_sequence.hpp index 44eaf247281..0ee55436874 100644 --- a/src/core/include/openvino/op/rnn_sequence.hpp +++ b/src/core/include/openvino/op/rnn_sequence.hpp @@ -18,7 +18,7 @@ namespace v5 { /// \ingroup ov_ops_cpp_api class OPENVINO_API RNNSequence : public util::RNNCellBase { public: - OPENVINO_OP("RNNSequence", "opset5", util::RNNCellBase, 4); + OPENVINO_OP("RNNSequence", "opset5", util::RNNCellBase); RNNSequence(); diff --git a/src/core/include/openvino/op/roi_align.hpp b/src/core/include/openvino/op/roi_align.hpp index 2922a7bc001..ba1ceefe09d 100644 --- a/src/core/include/openvino/op/roi_align.hpp +++ b/src/core/include/openvino/op/roi_align.hpp @@ -14,7 +14,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ROIAlign : public Op { public: - OPENVINO_OP("ROIAlign", "opset3", op::Op, 3); + OPENVINO_OP("ROIAlign", "opset3", op::Op); enum class PoolingMode { AVG, MAX }; ROIAlign() = default; diff --git a/src/core/include/openvino/op/roll.hpp b/src/core/include/openvino/op/roll.hpp index 35344dffbad..844a39b19cf 100644 --- a/src/core/include/openvino/op/roll.hpp +++ b/src/core/include/openvino/op/roll.hpp @@ -13,7 +13,7 @@ namespace v7 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Roll : public Op { public: - OPENVINO_OP("Roll", "opset7", op::Op, 7); + OPENVINO_OP("Roll", "opset7", op::Op); Roll() = default; diff --git a/src/core/include/openvino/op/round.hpp b/src/core/include/openvino/op/round.hpp index 994b5507ca9..c63cee37384 100644 --- a/src/core/include/openvino/op/round.hpp +++ b/src/core/include/openvino/op/round.hpp @@ -18,7 +18,7 @@ namespace v5 { 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); + OPENVINO_OP("Round", "opset5", util::UnaryElementwiseArithmetic); /// \brief Constructs a round operation. Round() = default; diff --git a/src/core/include/openvino/op/scatter_elements_update.hpp b/src/core/include/openvino/op/scatter_elements_update.hpp index 903b1fb9bab..4172e99afc5 100644 --- a/src/core/include/openvino/op/scatter_elements_update.hpp +++ b/src/core/include/openvino/op/scatter_elements_update.hpp @@ -14,7 +14,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ScatterElementsUpdate : public Op { public: - OPENVINO_OP("ScatterElementsUpdate", "opset3", op::Op, 3); + OPENVINO_OP("ScatterElementsUpdate", "opset3", op::Op); 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 1c7ac4355e1..ab28cd374df 100644 --- a/src/core/include/openvino/op/scatter_nd_update.hpp +++ b/src/core/include/openvino/op/scatter_nd_update.hpp @@ -13,7 +13,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ScatterNDUpdate : public util::ScatterNDBase { public: - OPENVINO_OP("ScatterNDUpdate", "opset4", util::ScatterNDBase, 3); + OPENVINO_OP("ScatterNDUpdate", "opset4", util::ScatterNDBase); 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 66936cf2f73..4e29bf9ab2a 100644 --- a/src/core/include/openvino/op/scatter_update.hpp +++ b/src/core/include/openvino/op/scatter_update.hpp @@ -15,7 +15,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ScatterUpdate : public util::ScatterBase { public: - OPENVINO_OP("ScatterUpdate", "opset3", util::ScatterBase, 3); + OPENVINO_OP("ScatterUpdate", "opset3", util::ScatterBase); 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 5d2bec70d67..78e8e802ab9 100644 --- a/src/core/include/openvino/op/select.hpp +++ b/src/core/include/openvino/op/select.hpp @@ -30,7 +30,7 @@ namespace v1 { // clang-format on class OPENVINO_API Select : public Op { public: - OPENVINO_OP("Select", "opset1", op::Op, 1); + OPENVINO_OP("Select", "opset1", op::Op); /// \brief Constructs a selection operation. Select() : m_auto_broadcast(AutoBroadcastSpec(AutoBroadcastType::NUMPY)) {} diff --git a/src/core/include/openvino/op/shape_of.hpp b/src/core/include/openvino/op/shape_of.hpp index 5e2cace77f9..e7ec34c1c87 100644 --- a/src/core/include/openvino/op/shape_of.hpp +++ b/src/core/include/openvino/op/shape_of.hpp @@ -13,7 +13,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API ShapeOf : public util::ShapeOfBase { public: - OPENVINO_OP("ShapeOf", "opset3", util::ShapeOfBase, 3); + OPENVINO_OP("ShapeOf", "opset3", util::ShapeOfBase); ShapeOf() = default; /// \brief Constructs a shape-of operation. ShapeOf(const Output& arg, const element::Type output_type = element::i64); diff --git a/src/core/include/openvino/op/softmax.hpp b/src/core/include/openvino/op/softmax.hpp index fc9c414df5a..8a43c6dae7b 100644 --- a/src/core/include/openvino/op/softmax.hpp +++ b/src/core/include/openvino/op/softmax.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Softmax : public Op { public: - OPENVINO_OP("Softmax", "opset1", op::Op, 1); + OPENVINO_OP("Softmax", "opset1", op::Op); 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 d3358268ac3..aaff04caa53 100644 --- a/src/core/include/openvino/op/softplus.hpp +++ b/src/core/include/openvino/op/softplus.hpp @@ -15,7 +15,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API SoftPlus : public util::UnaryElementwiseArithmetic { public: - OPENVINO_OP("SoftPlus", "opset4", util::UnaryElementwiseArithmetic, 4); + OPENVINO_OP("SoftPlus", "opset4", util::UnaryElementwiseArithmetic); SoftPlus() = default; /// \brief Constructs an SoftPlus operation. diff --git a/src/core/include/openvino/op/space_to_batch.hpp b/src/core/include/openvino/op/space_to_batch.hpp index ceaac33345b..83d47b96ba4 100644 --- a/src/core/include/openvino/op/space_to_batch.hpp +++ b/src/core/include/openvino/op/space_to_batch.hpp @@ -23,7 +23,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API SpaceToBatch : public Op { public: - OPENVINO_OP("SpaceToBatch", "opset2", op::Op, 1); + OPENVINO_OP("SpaceToBatch", "opset2", op::Op); SpaceToBatch() = default; diff --git a/src/core/include/openvino/op/split.hpp b/src/core/include/openvino/op/split.hpp index 6a2b70434af..918457c0d84 100644 --- a/src/core/include/openvino/op/split.hpp +++ b/src/core/include/openvino/op/split.hpp @@ -17,7 +17,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Split : public Op { public: - OPENVINO_OP("Split", "opset1", op::Op, 1); + OPENVINO_OP("Split", "opset1", op::Op); /// \brief Constructs a split operation. Split() = default; diff --git a/src/core/include/openvino/op/strided_slice.hpp b/src/core/include/openvino/op/strided_slice.hpp index f52b095424c..5535e292580 100644 --- a/src/core/include/openvino/op/strided_slice.hpp +++ b/src/core/include/openvino/op/strided_slice.hpp @@ -18,7 +18,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API StridedSlice : public Op { public: - OPENVINO_OP("StridedSlice", "opset1", op::Op, 1); + OPENVINO_OP("StridedSlice", "opset1", op::Op); StridedSlice() = default; diff --git a/src/core/include/openvino/op/subtract.hpp b/src/core/include/openvino/op/subtract.hpp index 3c129cb1f9b..5fd58da3bd6 100644 --- a/src/core/include/openvino/op/subtract.hpp +++ b/src/core/include/openvino/op/subtract.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Subtract : public util::BinaryElementwiseArithmetic { public: - OPENVINO_OP("Subtract", "opset1", util::BinaryElementwiseArithmetic, 1); + OPENVINO_OP("Subtract", "opset1", util::BinaryElementwiseArithmetic); Subtract() : util::BinaryElementwiseArithmetic(AutoBroadcastType::NUMPY) {} diff --git a/src/core/include/openvino/op/swish.hpp b/src/core/include/openvino/op/swish.hpp index 1395e62e409..bc9935d7f3e 100644 --- a/src/core/include/openvino/op/swish.hpp +++ b/src/core/include/openvino/op/swish.hpp @@ -16,7 +16,7 @@ namespace v4 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Swish : public Op { public: - OPENVINO_OP("Swish", "opset4", op::Op, 4); + OPENVINO_OP("Swish", "opset4", op::Op); Swish() = default; /// \brief Constructs an Swish operation. diff --git a/src/core/include/openvino/op/topk.hpp b/src/core/include/openvino/op/topk.hpp index 2af15c7baef..9c2ec7a9ce1 100644 --- a/src/core/include/openvino/op/topk.hpp +++ b/src/core/include/openvino/op/topk.hpp @@ -18,7 +18,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API TopK : public util::TopKBase { public: - OPENVINO_OP("TopK", "opset1", op::util::TopKBase, 1); + OPENVINO_OP("TopK", "opset1", op::util::TopKBase); using SortType = TopKSortType; using Mode = TopKMode; @@ -69,7 +69,7 @@ namespace v3 { /// \ingroup ov_ops_cpp_api class OPENVINO_API TopK : public util::TopKBase { public: - OPENVINO_OP("TopK", "opset3", op::util::TopKBase, 3); + OPENVINO_OP("TopK", "opset3", op::util::TopKBase); /// \brief Constructs a TopK operation TopK() = default; /// \brief Constructs a TopK operation with two outputs: values and indices. @@ -111,7 +111,7 @@ namespace v11 { /// \ingroup ov_ops_cpp_api class OPENVINO_API TopK : public util::TopKBase { public: - OPENVINO_OP("TopK", "opset11", op::util::TopKBase, 11); + OPENVINO_OP("TopK", "opset11", op::util::TopKBase); /// \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 341906128d3..2b4af853893 100644 --- a/src/core/include/openvino/op/transpose.hpp +++ b/src/core/include/openvino/op/transpose.hpp @@ -13,7 +13,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API Transpose : public Op { public: - OPENVINO_OP("Transpose", "opset1", op::Op, 1); + OPENVINO_OP("Transpose", "opset1", op::Op); Transpose() = default; /// diff --git a/src/core/include/openvino/op/variadic_split.hpp b/src/core/include/openvino/op/variadic_split.hpp index 8c5034cf031..2d6f751d48d 100644 --- a/src/core/include/openvino/op/variadic_split.hpp +++ b/src/core/include/openvino/op/variadic_split.hpp @@ -14,7 +14,7 @@ namespace v1 { /// \ingroup ov_ops_cpp_api class OPENVINO_API VariadicSplit : public Op { public: - OPENVINO_OP("VariadicSplit", "opset1", op::Op, 1); + OPENVINO_OP("VariadicSplit", "opset1", op::Op); /// \brief Constructs a variadic split operation. VariadicSplit() = default; diff --git a/src/core/src/node.cpp b/src/core/src/node.cpp index 70b18e710f4..2a9baaeb90d 100644 --- a/src/core/src/node.cpp +++ b/src/core/src/node.cpp @@ -385,9 +385,13 @@ std::ostream& ov::Node::write_description(std::ostream& out, uint32_t depth) con if (depth == 0) { out << get_friendly_name(); } else { - OPENVINO_SUPPRESS_DEPRECATED_START - out << "v" << get_type_info().version << "::" << get_type_info().name << " " << get_friendly_name() << " ("; - OPENVINO_SUPPRESS_DEPRECATED_END + auto version = get_type_info().version_id; + if (version) + out << "v" << version << "::" << get_type_info().name << " " << get_friendly_name() << " ("; + else + out << "v" + << " " + << "::" << get_type_info().name << " " << get_friendly_name() << " ("; string sep = ""; for (const auto& arg : input_values()) { out << sep << arg; diff --git a/src/core/src/pass/low_latency.cpp b/src/core/src/pass/low_latency.cpp index 455adc024cd..5364b08fd8a 100644 --- a/src/core/src/pass/low_latency.cpp +++ b/src/core/src/pass/low_latency.cpp @@ -18,7 +18,7 @@ #include NGRAPH_SUPPRESS_DEPRECATED_START -NGRAPH_RTTI_DEFINITION(ngraph::pass::LowLatency, "LowLatency", 0); +NGRAPH_RTTI_DEFINITION(ngraph::pass::LowLatency, "LowLatency"); using namespace std; diff --git a/src/core/src/pass/pass.cpp b/src/core/src/pass/pass.cpp index 01f24f05fba..6b246959ac3 100644 --- a/src/core/src/pass/pass.cpp +++ b/src/core/src/pass/pass.cpp @@ -57,6 +57,6 @@ ov::pass::ModelPass::~ModelPass() = default; OPENVINO_SUPPRESS_DEPRECATED_START -NGRAPH_RTTI_DEFINITION(ngraph::pass::NodePass, "ngraph::pass::NodePass", 0); +NGRAPH_RTTI_DEFINITION(ngraph::pass::NodePass, "ngraph::pass::NodePass"); ngraph::pass::NodePass::~NodePass() = default; diff --git a/src/core/src/pass/serialize.cpp b/src/core/src/pass/serialize.cpp index 81d2618e122..dc7f634488b 100644 --- a/src/core/src/pass/serialize.cpp +++ b/src/core/src/pass/serialize.cpp @@ -1002,11 +1002,9 @@ void ngfunction_2_ir(pugi::xml_node& netXml, // WA for LSTMCellv0, peephole input shall not be serialized if (e.to_port == 6) { const auto& type_info = ordered_ops[e.to_layer]->get_type_info(); - OPENVINO_SUPPRESS_DEPRECATED_START - if (!strcmp(type_info.name, "LSTMCell") && type_info.version == 0) { + if (!strcmp(type_info.name, "LSTMCell")) { continue; } - OPENVINO_SUPPRESS_DEPRECATED_END } pugi::xml_node edge = edges.append_child("edge"); edge.append_attribute("from-layer").set_value(e.from_layer); diff --git a/src/core/src/type.cpp b/src/core/src/type.cpp index 3def4c0adde..be48b68f1fe 100644 --- a/src/core/src/type.cpp +++ b/src/core/src/type.cpp @@ -18,12 +18,9 @@ size_t DiscreteTypeInfo::hash() const { if (hash_value != 0) return hash_value; size_t name_hash = name ? std::hash()(std::string(name)) : 0; - OPENVINO_SUPPRESS_DEPRECATED_START - size_t version_hash = std::hash()(version); - OPENVINO_SUPPRESS_DEPRECATED_END size_t version_id_hash = version_id ? std::hash()(std::string(version_id)) : 0; - return ov::util::hash_combine(std::vector{name_hash, version_hash, version_id_hash}); + return ov::util::hash_combine(std::vector{name_hash, version_id_hash}); } size_t DiscreteTypeInfo::hash() { @@ -40,9 +37,7 @@ std::string DiscreteTypeInfo::get_version() const { if (version_id) { return std::string(version_id); } - OPENVINO_SUPPRESS_DEPRECATED_START - return std::to_string(version); - OPENVINO_SUPPRESS_DEPRECATED_END + return nullptr; } DiscreteTypeInfo::operator std::string() const { @@ -51,10 +46,7 @@ DiscreteTypeInfo::operator std::string() const { std::ostream& operator<<(std::ostream& s, const DiscreteTypeInfo& info) { std::string version_id = info.version_id ? info.version_id : "(empty)"; - OPENVINO_SUPPRESS_DEPRECATED_START - s << "DiscreteTypeInfo{name: " << info.name << ", version_id: " << version_id << ", old_version: " << info.version - << ", parent: "; - OPENVINO_SUPPRESS_DEPRECATED_END + s << "DiscreteTypeInfo{name: " << info.name << ", version_id: " << version_id << ", parent: "; if (!info.parent) s << info.parent; else @@ -66,10 +58,7 @@ std::ostream& operator<<(std::ostream& s, const DiscreteTypeInfo& info) { // parent is commented to fix type relaxed operations bool DiscreteTypeInfo::operator<(const DiscreteTypeInfo& b) const { - OPENVINO_SUPPRESS_DEPRECATED_START - if (version < b.version) - return true; - if (version == b.version && name != nullptr && b.name != nullptr) { + if (name != nullptr && b.name != nullptr) { int cmp_status = strcmp(name, b.name); if (cmp_status < 0) return true; @@ -81,15 +70,20 @@ bool DiscreteTypeInfo::operator<(const DiscreteTypeInfo& b) const { } } - OPENVINO_SUPPRESS_DEPRECATED_END return false; } bool DiscreteTypeInfo::operator==(const DiscreteTypeInfo& b) const { if (hash_value != 0 && b.hash_value != 0) return hash() == b.hash(); - OPENVINO_SUPPRESS_DEPRECATED_START - return version == b.version && strcmp(name, b.name) == 0; - OPENVINO_SUPPRESS_DEPRECATED_END + if (name != nullptr && b.name != nullptr) { + if (strcmp(name, b.name) == 0) { + std::string v_id(version_id == nullptr ? "" : version_id); + std::string bv_id(b.version_id == nullptr ? "" : b.version_id); + if (v_id == bv_id) + return true; + } + } + return false; } bool DiscreteTypeInfo::operator<=(const DiscreteTypeInfo& b) const { return *this == b || *this < b; diff --git a/src/core/tests/graph_rewrite.cpp b/src/core/tests/graph_rewrite.cpp index c7fb67d243c..d85146b1ffd 100644 --- a/src/core/tests/graph_rewrite.cpp +++ b/src/core/tests/graph_rewrite.cpp @@ -55,9 +55,9 @@ public: Anchor() : GraphRewrite() {} }; -NGRAPH_RTTI_DEFINITION(TestPass, "TestPass", 0); -NGRAPH_RTTI_DEFINITION(Anchor, "Anchor", 0); -NGRAPH_RTTI_DEFINITION(GatherNodesPass, "GatherNodesPass", 0); +NGRAPH_RTTI_DEFINITION(TestPass, "TestPass"); +NGRAPH_RTTI_DEFINITION(Anchor, "Anchor"); +NGRAPH_RTTI_DEFINITION(GatherNodesPass, "GatherNodesPass"); std::shared_ptr get_function() { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{3, 1, 2}); @@ -165,7 +165,7 @@ public: using ngraph::opset3::Divide::Divide; }; -NGRAPH_RTTI_DEFINITION(PrivateDivide, "PrivateDivide", 0, ngraph::opset3::Divide); +NGRAPH_RTTI_DEFINITION(PrivateDivide, "PrivateDivide", ngraph::opset3::Divide); std::shared_ptr get_derived_function() { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{3, 1, 2}); @@ -434,7 +434,7 @@ public: } }; -NGRAPH_RTTI_DEFINITION(CheckConsumers, "CheckConsumers", 0); +NGRAPH_RTTI_DEFINITION(CheckConsumers, "CheckConsumers"); TEST(GraphRewriteTest, nodes_use_count) { auto f = get_function(); diff --git a/src/core/tests/opset.cpp b/src/core/tests/opset.cpp index cfc5cb7250b..289ae1188ce 100644 --- a/src/core/tests/opset.cpp +++ b/src/core/tests/opset.cpp @@ -72,7 +72,7 @@ INSTANTIATE_TEST_SUITE_P(opset, class MyOpOld : public ov::op::Op { public: - static constexpr ov::DiscreteTypeInfo type_info{"MyOpOld", static_cast(0)}; + static constexpr ov::DiscreteTypeInfo type_info{"MyOpOld"}; const ov::DiscreteTypeInfo& get_type_info() const override { return type_info; } @@ -121,7 +121,7 @@ TEST(opset, custom_opset) { opset.insert(); opset.insert(); EXPECT_EQ(opset.get_types_info().size(), 3); - EXPECT_TRUE(opset.contains_type("MyOpNewFromOld")); - EXPECT_TRUE(opset.contains_type("MyOpNew")); - EXPECT_TRUE(opset.contains_type("MyOpIncorrect")); + EXPECT_TRUE(opset.contains_type(std::string("MyOpNewFromOld"))); + EXPECT_TRUE(opset.contains_type(std::string("MyOpNew"))); + EXPECT_TRUE(opset.contains_type(std::string("MyOpIncorrect"))); } diff --git a/src/core/tests/pass_config.cpp b/src/core/tests/pass_config.cpp index 3c9395aedc2..e2c0d15e943 100644 --- a/src/core/tests/pass_config.cpp +++ b/src/core/tests/pass_config.cpp @@ -32,7 +32,7 @@ public: } }; -NGRAPH_RTTI_DEFINITION(RenameReLU, "RenameReLU", 0); +NGRAPH_RTTI_DEFINITION(RenameReLU, "RenameReLU"); class RenameSigmoid : public ngraph::pass::MatcherPass { public: @@ -50,7 +50,7 @@ public: } }; -NGRAPH_RTTI_DEFINITION(RenameSigmoid, "RenameSigmoid", 0); +NGRAPH_RTTI_DEFINITION(RenameSigmoid, "RenameSigmoid"); class TestFunctionPass : public ngraph::pass::FunctionPass { public: @@ -67,7 +67,7 @@ public: } }; -NGRAPH_RTTI_DEFINITION(TestFunctionPass, "TestFunctionPass", 0); +NGRAPH_RTTI_DEFINITION(TestFunctionPass, "TestFunctionPass"); class TestGraphRewritePass : public ngraph::pass::GraphRewrite { public: @@ -78,7 +78,7 @@ public: } }; -NGRAPH_RTTI_DEFINITION(TestGraphRewritePass, "TestGraphRewritePass", 0); +NGRAPH_RTTI_DEFINITION(TestGraphRewritePass, "TestGraphRewritePass"); std::tuple, std::shared_ptr, std::shared_ptr> get_test_function() { auto data = std::make_shared(ngraph::element::f32, ngraph::Shape{3, 1, 2}); @@ -289,7 +289,7 @@ public: } }; -NGRAPH_RTTI_DEFINITION(TestNestedMatcher, "TestNestedMatcher", 0); +NGRAPH_RTTI_DEFINITION(TestNestedMatcher, "TestNestedMatcher"); class TestNestedGraphRewrite : public pass::GraphRewrite { public: @@ -299,7 +299,7 @@ public: } }; -NGRAPH_RTTI_DEFINITION(TestNestedGraphRewrite, "TestNestedGraphRewrite", 0); +NGRAPH_RTTI_DEFINITION(TestNestedGraphRewrite, "TestNestedGraphRewrite"); TEST(PassConfig, EnableDisablePasses10) { std::shared_ptr f; diff --git a/src/core/tests/rtti.cpp b/src/core/tests/rtti.cpp index bb0362f52a3..e5a1619e75d 100644 --- a/src/core/tests/rtti.cpp +++ b/src/core/tests/rtti.cpp @@ -42,7 +42,7 @@ public: class OpTypeVersionParentOld : public OpType { public: - OPENVINO_OP("OpTypeVersionParentOld", "my_version1", OpType, 1); + OPENVINO_OP("OpTypeVersionParentOld", "my_version1", OpType); OpTypeVersionParentOld() = default; std::shared_ptr clone_with_new_inputs(const OutputVector& inputs) const override { @@ -56,7 +56,6 @@ TEST(rtti, op_with_type) { auto type_info = op.get_type_info(); ASSERT_EQ(type_info, OpType::get_type_info_static()); ASSERT_EQ(strcmp(type_info.name, "OpType"), 0); - ASSERT_EQ(type_info.version, 0); ASSERT_EQ(strcmp(type_info.version_id, "extension"), 0); ASSERT_NE(type_info.parent, nullptr); ASSERT_EQ(*type_info.parent, ngraph::op::Op::get_type_info_static()); @@ -67,7 +66,6 @@ TEST(rtti, op_with_type_version) { auto type_info = op.get_type_info(); ASSERT_EQ(type_info, OpTypeVersion::get_type_info_static()); ASSERT_EQ(strcmp(type_info.name, "OpTypeVersion"), 0); - ASSERT_EQ(type_info.version, 0); ASSERT_EQ(strcmp(type_info.version_id, "my_version"), 0); ASSERT_NE(type_info.parent, nullptr); ASSERT_EQ(*type_info.parent, ngraph::op::Op::get_type_info_static()); @@ -78,7 +76,6 @@ TEST(rtti, op_with_type_version_parent) { auto type_info = op.get_type_info(); ASSERT_EQ(type_info, OpTypeVersionParent::get_type_info_static()); ASSERT_EQ(strcmp(type_info.name, "OpTypeVersionParent"), 0); - ASSERT_EQ(type_info.version, 0); ASSERT_EQ(strcmp(type_info.version_id, "my_version"), 0); ASSERT_NE(type_info.parent, nullptr); ASSERT_EQ(*type_info.parent, OpType::get_type_info_static()); @@ -90,7 +87,6 @@ TEST(rtti, op_with_type_version_parent_old) { ASSERT_EQ(type_info, OpTypeVersionParentOld::get_type_info_static()); ASSERT_EQ(strcmp(type_info.name, "OpTypeVersionParentOld"), 0); ASSERT_EQ(strcmp(type_info.version_id, "my_version1"), 0); - ASSERT_EQ(type_info.version, 1); ASSERT_NE(type_info.parent, nullptr); ASSERT_EQ(*type_info.parent, OpType::get_type_info_static()); } diff --git a/src/core/tests/type_info.cpp b/src/core/tests/type_info.cpp index 1beac34b305..98c1f9c8e14 100644 --- a/src/core/tests/type_info.cpp +++ b/src/core/tests/type_info.cpp @@ -10,11 +10,11 @@ OPENVINO_SUPPRESS_DEPRECATED_START TEST(type_info, compare_old_type) { - ov::DiscreteTypeInfo type1("type1", static_cast(0)); - ov::DiscreteTypeInfo type2("type2", static_cast(0)); - ov::DiscreteTypeInfo type3("type1", 1ul); - ov::DiscreteTypeInfo type4("type3", static_cast(0), &type1); - ov::DiscreteTypeInfo type5("type3", static_cast(0), &type2); + ov::DiscreteTypeInfo type1("type1"); + ov::DiscreteTypeInfo type2("type2"); + ov::DiscreteTypeInfo type3("type1"); + ov::DiscreteTypeInfo type4("type3", &type1); + ov::DiscreteTypeInfo type5("type3", &type2); ASSERT_TRUE(type1 != type2); ASSERT_TRUE(type1 == type1); ASSERT_TRUE(type1 < type2); @@ -46,40 +46,37 @@ TEST(type_info, compare_new_type) { } TEST(type_info, compare_new_with_old_type) { - ov::DiscreteTypeInfo type1("type1", static_cast(0), "version1"); - ov::DiscreteTypeInfo type1_o("type1", static_cast(0)); + ov::DiscreteTypeInfo type1("type1", "version1"); + ov::DiscreteTypeInfo type1_o("type1", "version1"); ASSERT_TRUE(type1 == type1_o); } TEST(type_info, check_hash_value) { - const auto& hash_val = [](const char* name, const char* version_id, uint64_t version) -> size_t { + const auto& hash_val = [](const char* name, const char* version_id) -> size_t { size_t name_hash = name ? std::hash()(std::string(name)) : 0; - size_t version_hash = std::hash()(version); size_t version_id_hash = version_id ? std::hash()(std::string(version_id)) : 0; // don't use parent for hash calculation, it is not a part of type (yet) - return ov::util::hash_combine(std::vector{name_hash, version_hash, version_id_hash}); + return ov::util::hash_combine(std::vector{name_hash, version_id_hash}); }; - ov::DiscreteTypeInfo type("type1", 0, "version1"); - ov::DiscreteTypeInfo type_old("type1", 1); - ov::DiscreteTypeInfo type_with_version("type1", 1, "version1"); - ov::DiscreteTypeInfo type_empty_name("", static_cast(0)); - ov::DiscreteTypeInfo type_empty_ver("type", static_cast(0), ""); - EXPECT_EQ(hash_val(type.name, type.version_id, type.version), type.hash()); - EXPECT_EQ(hash_val(type_old.name, type_old.version_id, type_old.version), type_old.hash()); - EXPECT_EQ(hash_val(type_with_version.name, type_with_version.version_id, type_with_version.version), - type_with_version.hash()); - EXPECT_EQ(hash_val(type_empty_name.name, type_empty_name.version_id, type_empty_name.version), - type_empty_name.hash()); - EXPECT_EQ(hash_val(type_empty_ver.name, type_empty_ver.version_id, type_empty_ver.version), type_empty_ver.hash()); + ov::DiscreteTypeInfo type("type1", "version1"); + ov::DiscreteTypeInfo type_old("type1"); + ov::DiscreteTypeInfo type_with_version("type1", "version1"); + ov::DiscreteTypeInfo type_empty_name(""); + ov::DiscreteTypeInfo type_empty_ver("type", ""); + EXPECT_EQ(hash_val(type.name, type.version_id), type.hash()); + EXPECT_EQ(hash_val(type_old.name, type_old.version_id), type_old.hash()); + EXPECT_EQ(hash_val(type_with_version.name, type_with_version.version_id), type_with_version.hash()); + EXPECT_EQ(hash_val(type_empty_name.name, type_empty_name.version_id), type_empty_name.hash()); + EXPECT_EQ(hash_val(type_empty_ver.name, type_empty_ver.version_id), type_empty_ver.hash()); } TEST(type_info, find_in_map) { std::vector vector_names; - ov::DiscreteTypeInfo a("Mod", 1ul, "opset1"); - ov::DiscreteTypeInfo b("Prelu", static_cast(0), "opset1"); - ov::DiscreteTypeInfo c("Vector", static_cast(0)); - ov::DiscreteTypeInfo d("Mod", 1ul, "opset3"); - ov::DiscreteTypeInfo f("Mod", 2ul); + ov::DiscreteTypeInfo a("Mod", "opset1"); + ov::DiscreteTypeInfo b("Prelu", "opset1"); + ov::DiscreteTypeInfo c("Vector"); + ov::DiscreteTypeInfo d("Mod", "opset3"); + ov::DiscreteTypeInfo f("Mod", "opset2"); std::map test_map; test_map[a] = 1; @@ -94,20 +91,20 @@ TEST(type_info, find_in_map) { test_map[type] = 2; std::string name = type.name; vector_names.emplace_back(name); - ov::DiscreteTypeInfo t(vector_names.rbegin()->c_str(), 1000); - ov::DiscreteTypeInfo t2(vector_names.rbegin()->c_str(), static_cast(0)); + ov::DiscreteTypeInfo t(vector_names.rbegin()->c_str()); + ov::DiscreteTypeInfo t2(vector_names.rbegin()->c_str()); test_map[t] = 3; test_map[t2] = 4; std::string name1 = "a" + name; vector_names.emplace_back(name1); - ov::DiscreteTypeInfo t3(vector_names.rbegin()->c_str(), 1000); - ov::DiscreteTypeInfo t4(vector_names.rbegin()->c_str(), static_cast(0)); + ov::DiscreteTypeInfo t3(vector_names.rbegin()->c_str()); + ov::DiscreteTypeInfo t4(vector_names.rbegin()->c_str()); test_map[t3] = 5; test_map[t4] = 6; std::string name2 = name + "z"; vector_names.emplace_back(name2); - ov::DiscreteTypeInfo t5(vector_names.rbegin()->c_str(), 1000); - ov::DiscreteTypeInfo t6(vector_names.rbegin()->c_str(), static_cast(0)); + ov::DiscreteTypeInfo t5(vector_names.rbegin()->c_str()); + ov::DiscreteTypeInfo t6(vector_names.rbegin()->c_str()); test_map[t5] = 7; test_map[t6] = 8; } diff --git a/src/core/tests/type_prop/broadcast.cpp b/src/core/tests/type_prop/broadcast.cpp index e4a82aefb31..e587512b4e7 100644 --- a/src/core/tests/type_prop/broadcast.cpp +++ b/src/core/tests/type_prop/broadcast.cpp @@ -613,7 +613,6 @@ TEST(type_prop, broadcast_v3_bidirectional_mode_string) { const auto broadcast_v3 = make_shared(arg, shape, "BIDIRECTIONAL"); ASSERT_EQ(broadcast_v3->get_broadcast_spec(), op::BroadcastType::BIDIRECTIONAL); - ASSERT_EQ(broadcast_v3->get_version(), 3); } TEST(type_prop, broadcast_v3_shape_unexpected_axes_mapping_input) { diff --git a/src/frontends/ir/src/ir_deserializer.cpp b/src/frontends/ir/src/ir_deserializer.cpp index 72eaeb9b07a..0a4ece0aae5 100644 --- a/src/frontends/ir/src/ir_deserializer.cpp +++ b/src/frontends/ir/src/ir_deserializer.cpp @@ -771,7 +771,7 @@ std::shared_ptr XmlDeserializer::create_node( const std::string& type_name = translate_type_name(params.type); std::shared_ptr ngraphNode; - ov::DiscreteTypeInfo type(type_name.c_str(), 0, params.version.c_str()); + ov::DiscreteTypeInfo type(type_name.c_str(), params.version.c_str()); auto extensionIt = m_extensions.find(type); if (extensionIt != m_extensions.end()) { @@ -885,7 +885,7 @@ std::shared_ptr XmlDeserializer::create_node( item.print(ss); IE_THROW() << "rt_info attribute: " << attribute_name << " has no \"version\" field: " << ss.str(); } - const auto& type_info = ov::DiscreteTypeInfo(attribute_name.c_str(), 0, attribute_version.c_str()); + const auto& type_info = ov::DiscreteTypeInfo(attribute_name.c_str(), attribute_version.c_str()); auto attr = attrs_factory.create_by_type_info(type_info); if (!attr.empty()) { if (attr.is()) { diff --git a/src/inference/src/ie_network_reader.cpp b/src/inference/src/ie_network_reader.cpp index 6baf232df80..16bfdc7d883 100644 --- a/src/inference/src/ie_network_reader.cpp +++ b/src/inference/src/ie_network_reader.cpp @@ -47,7 +47,7 @@ public: : m_ext(ext), m_opset_name(opset), m_type(name), - m_ext_type(m_type.c_str(), 0, m_opset_name.c_str()) {} + m_ext_type(m_type.c_str(), m_opset_name.c_str()) {} const ov::DiscreteTypeInfo& get_type_info() const override { return m_ext_type; diff --git a/src/plugins/intel_cpu/src/ngraph_transformations/swap_convert_transpose.cpp b/src/plugins/intel_cpu/src/ngraph_transformations/swap_convert_transpose.cpp index f03806a7ade..8a836b46f9c 100755 --- a/src/plugins/intel_cpu/src/ngraph_transformations/swap_convert_transpose.cpp +++ b/src/plugins/intel_cpu/src/ngraph_transformations/swap_convert_transpose.cpp @@ -10,7 +10,7 @@ #include "itt.hpp" -NGRAPH_RTTI_DEFINITION(ov::intel_cpu::SwapConvertTranspose, "SwapConvertTranspose", 0); +NGRAPH_RTTI_DEFINITION(ov::intel_cpu::SwapConvertTranspose, "SwapConvertTranspose"); ov::intel_cpu::SwapConvertTranspose::SwapConvertTranspose() { MATCHER_SCOPE(SwapConvertTranspose); diff --git a/src/plugins/intel_cpu/src/nodes/if.cpp b/src/plugins/intel_cpu/src/nodes/if.cpp index b1f93795cf8..84856a3e6a9 100644 --- a/src/plugins/intel_cpu/src/nodes/if.cpp +++ b/src/plugins/intel_cpu/src/nodes/if.cpp @@ -48,7 +48,7 @@ void If::PortMapHelper::redefineTo() { bool If::isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept { try { if (!one_of(op->get_type_info(), ov::op::v8::If::get_type_info_static())) { - errorMessage = "Not supported If operation version " + std::to_string(op->get_type_info().version) + + errorMessage = "Not supported If operation version " + std::string(op->get_type_info().version_id) + " with name '" + op->get_friendly_name() + "'. Node If supports only opset8 version."; return false; } diff --git a/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp b/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp index 780e6eb4607..67400590ce4 100644 --- a/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp +++ b/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp @@ -600,7 +600,7 @@ NonMaxSuppression::NonMaxSuppression(const std::shared_ptr& op, co sortResultDescending = nmsIe->m_sort_result_descending; } else { const auto &typeInfo = op->get_type_info(); - IE_THROW() << errorPrefix << " doesn't support NMS: " << typeInfo.name << " v" << typeInfo.version; + IE_THROW() << errorPrefix << " doesn't support NMS: " << typeInfo.name << " v" << typeInfo.version_id; } const auto &boxes_dims = getInputShapeAtPort(NMS_BOXES).getDims(); diff --git a/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/onehot_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/onehot_ie.hpp index e295e25e06e..e06f8c5a528 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/onehot_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/onehot_ie.hpp @@ -32,12 +32,6 @@ public: float off_value, element::Type type); - OPENVINO_SUPPRESS_DEPRECATED_START - size_t get_version() const override { - return 1; - } - OPENVINO_SUPPRESS_DEPRECATED_END - void validate_and_infer_types() override; std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; bool visit_attributes(AttributeVisitor& visitor) override; diff --git a/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/pad_ie.hpp b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/pad_ie.hpp index 4f6b98c27be..076280819e3 100644 --- a/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/pad_ie.hpp +++ b/src/plugins/intel_gna/legacy/include/legacy/ngraph_ops/pad_ie.hpp @@ -29,12 +29,6 @@ public: Shape output_shape, float pad_value); - OPENVINO_SUPPRESS_DEPRECATED_START - size_t get_version() const override { - return 1; - } - OPENVINO_SUPPRESS_DEPRECATED_END - void validate_and_infer_types() override; bool visit_attributes(AttributeVisitor& visitor) override; std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; diff --git a/src/plugins/intel_gna/legacy/tests/convert_ngraph_to_cnn_network_tests.cpp b/src/plugins/intel_gna/legacy/tests/convert_ngraph_to_cnn_network_tests.cpp index 295f75ccaeb..74d73a777c9 100644 --- a/src/plugins/intel_gna/legacy/tests/convert_ngraph_to_cnn_network_tests.cpp +++ b/src/plugins/intel_gna/legacy/tests/convert_ngraph_to_cnn_network_tests.cpp @@ -234,10 +234,10 @@ TEST(ConvertFunctionToCNNNetworkTests, UnsupportedDynamicOps) { } catch (InferenceEngine::Exception& e) { EXPECT_THAT(e.what(), testing::HasSubstr(std::string("Unsupported dynamic ops: \n" - "v0::Parameter param () -> (f32[...])\n" - "v0::Relu relu (param[0]:f32[...]) -> (f32[...])\n" - "v3::NonZero non_zero (relu[0]:f32[...]) -> (i64[?,?])\n" - "v0::Result result (non_zero[0]:i64[?,?]) -> (i64[?,?])"))); + "vopset1::Parameter param () -> (f32[...])\n" + "vopset1::Relu relu (param[0]:f32[...]) -> (f32[...])\n" + "vopset3::NonZero non_zero (relu[0]:f32[...]) -> (i64[?,?])\n" + "vopset1::Result result (non_zero[0]:i64[?,?]) -> (i64[?,?])"))); } } diff --git a/src/plugins/intel_gna/src/transformations/insert_copy_layer.cpp b/src/plugins/intel_gna/src/transformations/insert_copy_layer.cpp index 809af60bc60..c4c1fd18f74 100644 --- a/src/plugins/intel_gna/src/transformations/insert_copy_layer.cpp +++ b/src/plugins/intel_gna/src/transformations/insert_copy_layer.cpp @@ -20,11 +20,11 @@ using namespace ov::intel_gna::pass; using namespace ov::intel_gna::ngraph_util; using namespace ov::opset9; -NGRAPH_RTTI_DEFINITION(InsertCopyBeforeAssignLayer, "InsertCopyBeforeAssignLayer", 0); -NGRAPH_RTTI_DEFINITION(InsertCopyBeforeConcatLayer, "InsertCopyBeforeConcatLayer", 0); -NGRAPH_RTTI_DEFINITION(HandleMultiConnectedLayerToConcatAndMemory, "HandleMultiConnectedLayerToConcatAndMemory", 0); -NGRAPH_RTTI_DEFINITION(MatchNonComputationalLayers, "MatchNonComputationalLayers", 0); -NGRAPH_RTTI_DEFINITION(HandleNonFunctionalSubgraphs, "HandleNonFunctionalSubgraphs", 0); +NGRAPH_RTTI_DEFINITION(InsertCopyBeforeAssignLayer, "InsertCopyBeforeAssignLayer"); +NGRAPH_RTTI_DEFINITION(InsertCopyBeforeConcatLayer, "InsertCopyBeforeConcatLayer"); +NGRAPH_RTTI_DEFINITION(HandleMultiConnectedLayerToConcatAndMemory, "HandleMultiConnectedLayerToConcatAndMemory"); +NGRAPH_RTTI_DEFINITION(MatchNonComputationalLayers, "MatchNonComputationalLayers"); +NGRAPH_RTTI_DEFINITION(HandleNonFunctionalSubgraphs, "HandleNonFunctionalSubgraphs"); namespace { void insert_copy_layer_between(std::shared_ptr input_op, diff --git a/src/plugins/intel_gna/src/transformations/pwl_approximation.cpp b/src/plugins/intel_gna/src/transformations/pwl_approximation.cpp index 100e0c00ba5..d2bcfa13c72 100644 --- a/src/plugins/intel_gna/src/transformations/pwl_approximation.cpp +++ b/src/plugins/intel_gna/src/transformations/pwl_approximation.cpp @@ -25,8 +25,8 @@ using namespace ov::intel_gna; using namespace ov::intel_gna::pass; using namespace ov::intel_gna::common; -NGRAPH_RTTI_DEFINITION(PWLApproximation, "PWLApproximation", 0); -NGRAPH_RTTI_DEFINITION(PWLApproximationWithFq, "PWLApproximationWithFq", 0); +NGRAPH_RTTI_DEFINITION(PWLApproximation, "PWLApproximation"); +NGRAPH_RTTI_DEFINITION(PWLApproximationWithFq, "PWLApproximationWithFq"); template double get_break_bound() { diff --git a/src/plugins/intel_gpu/src/plugin/program.cpp b/src/plugins/intel_gpu/src/plugin/program.cpp index cffe8a8c7b1..6e75d68d012 100644 --- a/src/plugins/intel_gpu/src/plugin/program.cpp +++ b/src/plugins/intel_gpu/src/plugin/program.cpp @@ -418,7 +418,7 @@ bool Program::IsOpSupported(const InferenceEngine::CNNNetwork& network, const st void Program::CreateSingleLayerPrimitive(cldnn::topology& topology, const std::shared_ptr& op) { OV_ITT_SCOPED_TASK(itt::domains::intel_gpu_plugin, "Program::CreateSingleLayerPrimitive"); - GPU_DEBUG_LOG << "Process " << "op::v" << op->get_type_info().version << "::" << op->get_type_name() << " operation " + GPU_DEBUG_LOG << "Process " << "op::v" << op->get_type_info().version_id << "::" << op->get_type_name() << " operation " << "(friendly_name=" << op->get_friendly_name() << ")" << std::endl; bool is_created = false; @@ -442,7 +442,7 @@ void Program::CreateSingleLayerPrimitive(cldnn::topology& topology, const std::s if (!is_created) { IE_THROW() << "Operation: " << op->get_friendly_name() << " of type " << op->get_type_name() - << "(op::v" << op->get_type_info().version << ") is not supported"; + << "(op::v" << op->get_type_info().version_id << ") is not supported"; } } @@ -560,7 +560,7 @@ void validate_inputs_count(const std::shared_ptr& op, std::vector< IE_THROW() << "Invalid inputs count (" << op->get_input_size() << ") in " << op->get_friendly_name() << " (" << op->get_type_name() - << " op::v" << op->get_type_info().version << ")"; + << " op::v" << op->get_type_info().version_id << ")"; } } // namespace intel_gpu diff --git a/src/tests/ie_test_utils/common_test_utils/graph_comparator.cpp b/src/tests/ie_test_utils/common_test_utils/graph_comparator.cpp index 54b2c4abdc0..00636bca0d8 100644 --- a/src/tests/ie_test_utils/common_test_utils/graph_comparator.cpp +++ b/src/tests/ie_test_utils/common_test_utils/graph_comparator.cpp @@ -34,11 +34,9 @@ bool is_type_relaxed(const std::string& type) { } bool compare_type_info(const ngraph::DiscreteTypeInfo& info1, const ngraph::DiscreteTypeInfo& info2) { - OPENVINO_SUPPRESS_DEPRECATED_START - if (!is_type_relaxed(info1.name) && !is_type_relaxed(info2.name) && (info1.version != info2.version)) { + if (!is_type_relaxed(info1.name) && !is_type_relaxed(info2.name) && (std::strcmp(info1.version_id, info2.version_id) != 0)) { return false; } - OPENVINO_SUPPRESS_DEPRECATED_END const std::string info1Name = is_type_relaxed(info1.name) && (info1.parent != nullptr) ? info1.parent->name : info1.name; @@ -89,9 +87,7 @@ bool less_by_parent_name(const std::shared_ptr& l, } std::string typeInfoToStr(const ngraph::Node::type_info_t& typeInfo) { - OPENVINO_SUPPRESS_DEPRECATED_START - return std::string(typeInfo.name) + "/" + to_str(typeInfo.version); - OPENVINO_SUPPRESS_DEPRECATED_END + return std::string(typeInfo.name) + "/" + std::string(typeInfo.version_id); } std::string tensor_names(const ngraph::descriptor::Tensor& t) { diff --git a/src/tests/ngraph_helpers/ngraph_functions/src/utils/ngraph_helpers.cpp b/src/tests/ngraph_helpers/ngraph_functions/src/utils/ngraph_helpers.cpp index c6a7caefeb5..b6cd1dc3c15 100644 --- a/src/tests/ngraph_helpers/ngraph_functions/src/utils/ngraph_helpers.cpp +++ b/src/tests/ngraph_helpers/ngraph_functions/src/utils/ngraph_helpers.cpp @@ -274,9 +274,7 @@ std::vector>> getCons namespace { std::string toString(const NodeTypeInfo& typeInfo) { - OPENVINO_SUPPRESS_DEPRECATED_START - return std::string(typeInfo.name) + " ver. " + std::to_string(typeInfo.version); - OPENVINO_SUPPRESS_DEPRECATED_END + return std::string(typeInfo.name) + " ver. " + std::string(typeInfo.version_id); } void CompareShapes(const PartialShape& actual, const PartialShape& expected) { @@ -337,9 +335,7 @@ std::shared_ptr getNodeSharedPtr(const ngraph::NodeTypeInfo &type_ ngraphNode->validate_and_infer_types(); return ngraphNode; } - OPENVINO_SUPPRESS_DEPRECATED_START - NGRAPH_UNREACHABLE("supported opsets does not contain op with name: ", type_info.name, " version: ", type_info.version); - OPENVINO_SUPPRESS_DEPRECATED_END + NGRAPH_UNREACHABLE("supported opsets does not contain op with name: ", type_info.name, " version: ", type_info.version_id); } bool is_tensor_iterator_exist(const std::shared_ptr & func) {