nGraph and CPU plugin opset rtti (#6445)

inference-engine/src/mkldnn_plugin/ngraph_transformations/op/fully_connected.hpp

@@ -13,6 +13,7 @@ namespace MKLDNNPlugin {
 class FullyConnectedNode : public ngraph::op::Op {
 public:
     static constexpr ngraph::NodeTypeInfo type_info{"FullyConnected", 0};
+    static constexpr const ::ngraph::Node::type_info_t& get_type_info_static() { return type_info; }
     const ngraph::NodeTypeInfo& get_type_info() const override { return type_info; }
 
     FullyConnectedNode() = default;

inference-engine/src/mkldnn_plugin/ngraph_transformations/op/leaky_relu.hpp

@@ -11,6 +11,7 @@ namespace MKLDNNPlugin {
 class LeakyReluNode : public ngraph::op::Op {
 public:
     static constexpr ngraph::NodeTypeInfo type_info{"LeakyRelu", 0};
+    static constexpr const ::ngraph::Node::type_info_t& get_type_info_static() { return type_info; }
     const ngraph::NodeTypeInfo& get_type_info() const override { return type_info; }
 
     LeakyReluNode(const ngraph::Output<ngraph::Node> &data, const float &negative_slope, const ngraph::element::Type output_type);

inference-engine/src/mkldnn_plugin/ngraph_transformations/op/power_static.hpp

@@ -11,6 +11,7 @@ namespace MKLDNNPlugin {
 class PowerStaticNode : public ngraph::op::Op {
 public:
     static constexpr ngraph::NodeTypeInfo type_info{"PowerStatic", 0};
+    static constexpr const ::ngraph::Node::type_info_t& get_type_info_static() { return type_info; }
     const ngraph::NodeTypeInfo& get_type_info() const override { return type_info; }
 
     PowerStaticNode(const ngraph::Output<ngraph::Node> &data, const float &power, const float &scale, const float &shift,

inference-engine/src/mkldnn_plugin/ngraph_transformations/op/swish_cpu.hpp

@@ -11,6 +11,7 @@ namespace MKLDNNPlugin {
 class SwishNode : public ngraph::op::Op {
 public:
     static constexpr ngraph::NodeTypeInfo type_info{"SwishCPU", 0};
+    static constexpr const ::ngraph::Node::type_info_t& get_type_info_static() { return type_info; }
     const ngraph::NodeTypeInfo &get_type_info() const override { return type_info; }
 
     explicit SwishNode(const ngraph::Output<Node> &input, float alpha = 1.0);

ngraph/core/include/ngraph/op/binary_convolution.hpp

@@ -17,8 +17,8 @@ namespace ngraph
             class NGRAPH_API BinaryConvolution : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"BinaryConvolution", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 enum class BinaryConvolutionMode
                 {
                     // Interpret input data and kernel values: 0 as -1, 1 as 1

ngraph/core/include/ngraph/op/broadcast.hpp

@@ -85,8 +85,8 @@ namespace ngraph
             class NGRAPH_API Broadcast : public util::BroadcastBase
             {
             public:
-                static constexpr NodeTypeInfo type_info{"Broadcast", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 /// \brief Constructs a broadcast operation.
                 Broadcast() = default;
                 /// \brief Constructs a broadcast operation.

ngraph/core/include/ngraph/op/constant.hpp

@@ -26,8 +26,8 @@ namespace ngraph
             class NGRAPH_API Constant : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"Constant", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 Constant() = default;
 
                 /// \brief Initialize a constant from tensor

ngraph/core/include/ngraph/op/convert_like.hpp

@@ -16,8 +16,8 @@ namespace ngraph
             class NGRAPH_API ConvertLike : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"ConvertLike", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 /// \brief Constructs a conversion operation.
                 ConvertLike() = default;
                 /// \brief Constructs a conversion operation.

ngraph/core/include/ngraph/op/ctc_greedy_decoder.hpp

@@ -15,8 +15,8 @@ namespace ngraph
             class NGRAPH_API CTCGreedyDecoder : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"CTCGreedyDecoder", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 CTCGreedyDecoder() = default;
                 /// \brief Constructs a CTCGreedyDecoder operation
                 ///

ngraph/core/include/ngraph/op/deformable_convolution.hpp

@@ -18,8 +18,8 @@ namespace ngraph
             class NGRAPH_API DeformableConvolution : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"DeformableConvolution", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 /// \brief Constructs a conversion operation.
                 DeformableConvolution() = default;
                 /// \brief Constructs a conversion operation.

ngraph/core/include/ngraph/op/deformable_psroi_pooling.hpp

@@ -15,8 +15,8 @@ namespace ngraph
             class NGRAPH_API DeformablePSROIPooling : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"DeformablePSROIPooling", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 DeformablePSROIPooling() = default;
                 /// \brief Constructs a DeformablePSROIPooling operation
                 ///

ngraph/core/include/ngraph/op/detection_output.hpp

@@ -37,8 +37,8 @@ namespace ngraph
             class NGRAPH_API DetectionOutput : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"DetectionOutput", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 DetectionOutput() = default;
                 /// \brief Constructs a DetectionOutput operation
                 ///

ngraph/core/include/ngraph/op/elu.hpp

@@ -20,8 +20,8 @@ namespace ngraph
             class NGRAPH_API Elu : public ngraph::op::Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"Elu", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 Elu() = default;
                 /// \brief Constructs an Elu operation.
                 ///

ngraph/core/include/ngraph/op/gather_tree.hpp

@@ -17,8 +17,8 @@ namespace ngraph
             class NGRAPH_API GatherTree : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"GatherTree", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 GatherTree() = default;
                 /// \param step_ids     Tensor of shape [MAX_TIME, BATCH_SIZE, BEAM_WIDTH] with
                 ///                     indices from per each step

ngraph/core/include/ngraph/op/grn.hpp

@@ -22,8 +22,8 @@ namespace ngraph
             class NGRAPH_API GRN : public ngraph::op::util::FusedOp
             {
             public:
-                static constexpr NodeTypeInfo type_info{"GRN", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 GRN();
                 /// \brief      Constructs a GRN operation.
                 ///

ngraph/core/include/ngraph/op/hard_sigmoid.hpp

@@ -21,8 +21,8 @@ namespace ngraph
             class NGRAPH_API HardSigmoid : public ngraph::op::util::FusedOp
             {
             public:
-                static constexpr NodeTypeInfo type_info{"HardSigmoid", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 HardSigmoid();
 
                 /// \brief      Constructs a HardSigmoid operation.

ngraph/core/include/ngraph/op/lrn.hpp

@@ -30,8 +30,8 @@ namespace ngraph
             class NGRAPH_API LRN : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"LRN", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 /// \brief Constructs a LRN operation.
                 LRN() = default;
                 /// \brief Constructs a LRN operation.

ngraph/core/include/ngraph/op/lstm_cell.hpp

@@ -58,8 +58,8 @@ namespace ngraph
             class NGRAPH_API LSTMCell : public util::RNNCellBase
             {
             public:
-                static constexpr NodeTypeInfo type_info{"LSTMCell", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 LSTMCell();
                 ///
                 /// \brief      Constructs LSTMCell node.
@@ -280,8 +280,8 @@ namespace ngraph
             class NGRAPH_API LSTMCell : public util::RNNCellBase
             {
             public:
-                static constexpr NodeTypeInfo type_info{"LSTMCell", 4};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 LSTMCell();
                 ///
                 /// \brief      Constructs LSTMCell node.

ngraph/core/include/ngraph/op/non_max_suppression.hpp

@@ -23,8 +23,8 @@ namespace ngraph
                     CENTER
                 };
 
-                static constexpr NodeTypeInfo type_info{"NonMaxSuppression", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 NonMaxSuppression() = default;
 
                 /// \brief Constructs a NonMaxSuppression operation.

ngraph/core/include/ngraph/op/one_hot.hpp

@@ -15,8 +15,8 @@ namespace ngraph
             class NGRAPH_API OneHot : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"OneHot", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 /// \brief Constructs a one-hot operation.
                 OneHot() = default;
                 /// \brief Constructs a one-hot operation.

ngraph/core/include/ngraph/op/pad.hpp

@@ -18,8 +18,8 @@ namespace ngraph
             class NGRAPH_API Pad : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"Pad", 1};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 /// \brief Constructs a generic padding operation.
                 ///
                 /// \param arg The output producing input tensor to be padded.

ngraph/core/include/ngraph/op/prior_box.hpp

@@ -42,8 +42,8 @@ namespace ngraph
             class NGRAPH_API PriorBox : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"PriorBox", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 PriorBox() = default;
                 /// \brief Constructs a PriorBox operation
                 ///

ngraph/core/include/ngraph/op/prior_box_clustered.hpp

@@ -35,8 +35,8 @@ namespace ngraph
             class NGRAPH_API PriorBoxClustered : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"PriorBoxClustered", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 PriorBoxClustered() = default;
                 /// \brief Constructs a PriorBoxClustered operation
                 ///

ngraph/core/include/ngraph/op/psroi_pooling.hpp

@@ -15,8 +15,8 @@ namespace ngraph
             class NGRAPH_API PSROIPooling : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"PSROIPooling", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 PSROIPooling() = default;
                 /// \brief Constructs a PSROIPooling operation
                 ///

ngraph/core/include/ngraph/op/range.hpp

@@ -57,8 +57,8 @@ namespace ngraph
             class NGRAPH_API Range : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"Range", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 /// \brief Constructs an unitialized range operation.
                 Range() = default;
 

ngraph/core/include/ngraph/op/region_yolo.hpp

@@ -15,8 +15,8 @@ namespace ngraph
             class NGRAPH_API RegionYolo : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"RegionYolo", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 RegionYolo() = default;
                 ///
                 /// \brief      Constructs a RegionYolo operation

ngraph/core/include/ngraph/op/reorg_yolo.hpp

@@ -15,8 +15,8 @@ namespace ngraph
             class NGRAPH_API ReorgYolo : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"ReorgYolo", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 ReorgYolo() = default;
                 /// \brief Constructs a ReorgYolo operation
                 ///

ngraph/core/include/ngraph/op/reverse_sequence.hpp

@@ -15,8 +15,8 @@ namespace ngraph
             class NGRAPH_API ReverseSequence : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"ReverseSequence", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 ReverseSequence() = default;
                 /// \brief Constructs a ReverseSequence operation.
                 ///

ngraph/core/include/ngraph/op/rnn_cell.hpp

@@ -41,8 +41,8 @@ namespace ngraph
             class NGRAPH_API RNNCell : public util::RNNCellBase
             {
             public:
-                static constexpr NodeTypeInfo type_info{"RNNCell", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 RNNCell();
                 ///
                 /// \brief      Constructs RNNCell node.

ngraph/core/include/ngraph/op/space_to_depth.hpp

@@ -24,8 +24,8 @@ namespace ngraph
             class NGRAPH_API SpaceToDepth : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"SpaceToDepth", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 enum class SpaceToDepthMode
                 {
                     // The output depth is gathered from [block_size, ..., block_size, C]

ngraph/core/include/ngraph/op/tensor_iterator.hpp

@@ -20,8 +20,8 @@ namespace ngraph
             class NGRAPH_API TensorIterator : public op::util::SubGraphOp
             {
             public:
-                static constexpr NodeTypeInfo type_info{"TensorIterator", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 bool visit_attributes(AttributeVisitor& visitor) override;
 
                 TensorIterator() = default;

ngraph/core/include/ngraph/op/tile.hpp

@@ -18,8 +18,8 @@ namespace ngraph
             class NGRAPH_API Tile : public Op
             {
             public:
-                static constexpr NodeTypeInfo type_info{"Tile", 0};
+                NGRAPH_RTTI_DECLARATION;
-                const NodeTypeInfo& get_type_info() const override { return type_info; }
+
                 Tile() = default;
                 /// \brief Perform dynamic padding of a tensor
                 ///

ngraph/core/include/ngraph/op/util/broadcast_base.hpp

@@ -44,6 +44,8 @@ namespace ngraph
                               const BroadcastModeSpec& broadcast_mode = BroadcastType::NUMPY);
 
             public:
+                NGRAPH_RTTI_DECLARATION;
+
                 void validate_and_infer_types() override;
                 /// \return true and the AxisSet if broadcast axes can be fully determined.
                 virtual std::pair<bool, AxisSet> get_broadcast_axes() const;

ngraph/core/include/ngraph/op/util/fused_op.hpp

@@ -21,6 +21,8 @@ namespace ngraph
                 : public Op
             {
             public:
+                NGRAPH_RTTI_DECLARATION;
+
                 // Fused op decomposition can be performed in the presence of
                 // partial shapes
                 virtual bool can_decompose_with_partial_shapes() { return false; }

ngraph/core/include/ngraph/op/util/rnn_cell_base.hpp

@@ -54,6 +54,8 @@ namespace ngraph
             class NGRAPH_API RNNCellBase : public Op
             {
             public:
+                NGRAPH_RTTI_DECLARATION;
+
                 ///
                 /// \brief      Constructs a RNNCellBase class.
                 ///
@@ -87,7 +89,7 @@ namespace ngraph
                 ///
                 void validate_input_rank_dimension(const std::vector<ngraph::PartialShape>& input);
 
-                virtual bool visit_attributes(AttributeVisitor& visitor);
+                bool visit_attributes(AttributeVisitor& visitor) override;
                 std::size_t get_hidden_size() const { return m_hidden_size; }
                 float get_clip() const { return m_clip; }
                 const std::vector<std::string>& get_activations() const { return m_activations; }

ngraph/core/src/op/binary_convolution.cpp

@@ -14,7 +14,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v1::BinaryConvolution::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::BinaryConvolution, "BinaryConvolution", 1);
 
 op::v1::BinaryConvolution::BinaryConvolution(const Output<Node>& data,
                                              const Output<Node>& kernel,

ngraph/core/src/op/broadcast.cpp

@@ -245,7 +245,7 @@ namespace
     }
 } // namespace
 
-constexpr NodeTypeInfo op::v1::Broadcast::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::Broadcast, "Broadcast", 1, op::util::BroadcastBase);
 
 op::v1::Broadcast::Broadcast(const Output<Node>& arg,
                              const Output<Node>& target_shape,

ngraph/core/src/op/constant.cpp

@@ -38,7 +38,7 @@ static inline string to_cpp_string(T value)
     return rc;
 }
 
-constexpr NodeTypeInfo op::Constant::type_info;
+NGRAPH_RTTI_DEFINITION(op::Constant, "Constant", 0);
 
 op::Constant::Constant(const shared_ptr<runtime::Tensor>& tensor)
     : Constant(tensor->get_element_type(), tensor->get_shape())

ngraph/core/src/op/convert_like.cpp

@@ -12,7 +12,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v1::ConvertLike::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::ConvertLike, "ConvertLike", 1);
 
 op::v1::ConvertLike::ConvertLike(const Output<Node>& data, const Output<Node>& like)
     : Op({data, like})

ngraph/core/src/op/ctc_greedy_decoder.cpp

@@ -8,7 +8,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::CTCGreedyDecoder::type_info;
+NGRAPH_RTTI_DEFINITION(op::CTCGreedyDecoder, "CTCGreedyDecoder", 0);
 
 op::CTCGreedyDecoder::CTCGreedyDecoder(const Output<Node>& input,
                                        const Output<Node>& seq_len,

ngraph/core/src/op/deformable_convolution.cpp

@@ -13,7 +13,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v1::DeformableConvolution::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::DeformableConvolution, "DeformableConvolution", 1);
 
 op::v1::DeformableConvolution::DeformableConvolution(const Output<Node>& arg,
                                                      const Output<Node>& offsets,

ngraph/core/src/op/deformable_psroi_pooling.cpp

@@ -8,7 +8,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v1::DeformablePSROIPooling::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::DeformablePSROIPooling, "DeformablePSROIPooling", 1);
 
 op::v1::DeformablePSROIPooling::DeformablePSROIPooling(const Output<Node>& input,
                                                        const Output<Node>& coords,

ngraph/core/src/op/detection_output.cpp

@@ -8,7 +8,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::DetectionOutput::type_info;
+NGRAPH_RTTI_DEFINITION(op::DetectionOutput, "DetectionOutput", 0);
 
 op::DetectionOutput::DetectionOutput(const Output<Node>& box_logits,
                                      const Output<Node>& class_preds,

ngraph/core/src/op/elu.cpp

@@ -11,7 +11,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::Elu::type_info;
+NGRAPH_RTTI_DEFINITION(op::Elu, "Elu", 0);
 
 op::Elu::Elu(const Output<Node>& data, const double alpha)
     : Op({data})

ngraph/core/src/op/gather_tree.cpp

@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v1::GatherTree::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::GatherTree, "GatherTree", 1);
 
 op::v1::GatherTree::GatherTree(const Output<Node>& step_ids,
                                const Output<Node>& parent_idx,

ngraph/core/src/op/grn.cpp

@@ -22,7 +22,7 @@ using namespace ngraph;
 
 NGRAPH_SUPPRESS_DEPRECATED_START
 
-constexpr NodeTypeInfo op::GRN::type_info;
+NGRAPH_RTTI_DEFINITION(op::GRN, "GRN", 0, op::util::FusedOp);
 
 op::GRN::GRN()
     : FusedOp()

ngraph/core/src/op/hard_sigmoid.cpp

@@ -18,7 +18,7 @@ using namespace ngraph;
 
 NGRAPH_SUPPRESS_DEPRECATED_START
 
-constexpr NodeTypeInfo op::HardSigmoid::type_info;
+NGRAPH_RTTI_DEFINITION(op::HardSigmoid, "HardSigmoid", 0, op::util::FusedOp);
 
 op::HardSigmoid::HardSigmoid()
     : FusedOp()

ngraph/core/src/op/lrn.cpp

@@ -12,7 +12,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::LRN::type_info;
+NGRAPH_RTTI_DEFINITION(op::LRN, "LRN", 0);
 
 op::LRN::LRN(const Output<Node>& arg, double alpha, double beta, double bias, size_t size)
     : LRN(arg, op::Constant::create(element::i64, Shape{1}, {1}), alpha, beta, bias, size)

ngraph/core/src/op/lstm_cell.cpp

@@ -16,8 +16,8 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v4::LSTMCell::type_info;
+NGRAPH_RTTI_DEFINITION(op::v0::LSTMCell, "LSTMCell", 0, op::util::RNNCellBase);
-constexpr NodeTypeInfo op::v0::LSTMCell::type_info;
+NGRAPH_RTTI_DEFINITION(op::v4::LSTMCell, "LSTMCell", 4, op::util::RNNCellBase);
 
 op::v0::LSTMCell::LSTMCell()
     : m_input_forget(false)

ngraph/core/src/op/non_max_suppression.cpp

@@ -18,7 +18,7 @@ using namespace ngraph;
 
 // ------------------------------ V1 ------------------------------
 
-constexpr NodeTypeInfo op::v1::NonMaxSuppression::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::NonMaxSuppression, "NonMaxSuppression", 1);
 
 op::v1::NonMaxSuppression::NonMaxSuppression(
     const Output<Node>& boxes,

ngraph/core/src/op/one_hot.cpp

@@ -12,7 +12,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v1::OneHot::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::OneHot, "OneHot", 1);
 
 op::v1::OneHot::OneHot(const Output<Node>& indices,
                        const Output<Node>& depth,

ngraph/core/src/op/pad.cpp

@@ -15,7 +15,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v1::Pad::type_info;
+NGRAPH_RTTI_DEFINITION(op::v1::Pad, "Pad", 1);
 
 op::v1::Pad::Pad(const Output<Node>& arg,
                  const Output<Node>& pads_begin,

ngraph/core/src/op/prior_box.cpp

@@ -14,7 +14,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::PriorBox::type_info;
+NGRAPH_RTTI_DEFINITION(op::PriorBox, "PriorBox", 0);
 
 op::PriorBox::PriorBox(const Output<Node>& layer_shape,
                        const Output<Node>& image_shape,

ngraph/core/src/op/prior_box_clustered.cpp

@@ -14,7 +14,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::PriorBoxClustered::type_info;
+NGRAPH_RTTI_DEFINITION(op::PriorBoxClustered, "PriorBoxClustered", 0);
 
 op::PriorBoxClustered::PriorBoxClustered(const Output<Node>& layer_shape,
                                          const Output<Node>& image_shape,

ngraph/core/src/op/psroi_pooling.cpp

@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::PSROIPooling::type_info;
+NGRAPH_RTTI_DEFINITION(op::PSROIPooling, "PSROIPooling", 0);
 
 op::PSROIPooling::PSROIPooling(const Output<Node>& input,
                                const Output<Node>& coords,

ngraph/core/src/op/range.cpp

@@ -322,7 +322,7 @@ bool op::v4::Range::has_evaluate() const
     return false;
 }
 
-constexpr NodeTypeInfo op::v0::Range::type_info;
+NGRAPH_RTTI_DEFINITION(op::v0::Range, "Range", 0);
 
 op::v0::Range::Range(const Output<Node>& start, const Output<Node>& stop, const Output<Node>& step)
     : Op({start, stop, step})

ngraph/core/src/op/region_yolo.cpp

@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::RegionYolo::type_info;
+NGRAPH_RTTI_DEFINITION(op::RegionYolo, "RegionYolo", 0);
 
 op::RegionYolo::RegionYolo(const Output<Node>& input,
                            const size_t coords,

ngraph/core/src/op/reorg_yolo.cpp

@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::ReorgYolo::type_info;
+NGRAPH_RTTI_DEFINITION(op::ReorgYolo, "ReorgYolo", 0);
 
 op::ReorgYolo::ReorgYolo(const Output<Node>& input, const Strides& strides)
     : Op({input})

ngraph/core/src/op/reverse_sequence.cpp

@@ -14,7 +14,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::ReverseSequence::type_info;
+NGRAPH_RTTI_DEFINITION(op::ReverseSequence, "ReverseSequence", 0);
 
 op::ReverseSequence::ReverseSequence(const Output<Node>& arg,
                                      const Output<Node>& seq_indices,

ngraph/core/src/op/rnn_cell.cpp

@@ -13,7 +13,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v0::RNNCell::type_info;
+NGRAPH_RTTI_DEFINITION(op::v0::RNNCell, "RNNCell", 0, util::RNNCellBase);
 
 op::v0::RNNCell::RNNCell()
 {

ngraph/core/src/op/space_to_depth.cpp

@@ -18,7 +18,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::SpaceToDepth::type_info;
+NGRAPH_RTTI_DEFINITION(op::SpaceToDepth, "SpaceToDepth", 0);
 
 op::SpaceToDepth::SpaceToDepth(const Output<Node>& data,
                                const SpaceToDepthMode& mode,

ngraph/core/src/op/tensor_iterator.cpp

@@ -11,7 +11,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v0::TensorIterator::type_info;
+NGRAPH_RTTI_DEFINITION(op::v0::TensorIterator, "TensorIterator", 0, op::util::SubGraphOp);
 
 op::v0::TensorIterator::TensorIterator(const OutputVector& values)
     : op::util::SubGraphOp(values)

ngraph/core/src/op/tile.cpp

@@ -12,7 +12,7 @@
 using namespace std;
 using namespace ngraph;
 
-constexpr NodeTypeInfo op::v0::Tile::type_info;
+NGRAPH_RTTI_DEFINITION(op::v0::Tile, "Tile", 0);
 
 op::v0::Tile::Tile(const Output<Node>& data, const Output<Node>& repeats)
     : Op({data, repeats})

ngraph/core/src/op/util/broadcast_base.cpp

@@ -18,6 +18,8 @@
 using namespace std;
 using namespace ngraph;
 
+NGRAPH_RTTI_DEFINITION(op::util::BroadcastBase, "BroadcastBase", 0);
+
 op::util::BroadcastBase::BroadcastBase(const Output<Node>& arg,
                                        const Output<Node>& target_shape,
                                        const Output<Node>& axes_mapping,

ngraph/core/src/op/util/fused_op.cpp

@@ -11,6 +11,8 @@ using namespace ngraph;
 
 NGRAPH_SUPPRESS_DEPRECATED_START
 
+NGRAPH_RTTI_DEFINITION(op::util::FusedOp, "FusedOp", 0);
+
 op::util::FusedOp::FusedOp()
     : Op()
 {

ngraph/core/src/op/util/rnn_cell_base.cpp

@@ -19,6 +19,8 @@
 using namespace std;
 using namespace ngraph;
 
+NGRAPH_RTTI_DEFINITION(op::util::RNNCellBase, "RNNCellBase", 0);
+
 std::shared_ptr<Node> ngraph::op::util::convert_lstm_node_format(const Output<Node>& node,
                                                                  LSTMWeightsFormat from_format,
                                                                  LSTMWeightsFormat to_format,