From 8073c7be9f156e2c573e36b033ef96c0b27cf15c Mon Sep 17 00:00:00 2001 From: Oleg Pipikin Date: Mon, 29 Jan 2024 18:40:24 +0100 Subject: [PATCH] Remove ngraph node (#22460) --- docs/snippets/lpt_intel_cpu_plugin.cpp | 12 +- src/core/include/ngraph/evaluator.hpp | 30 ++-- src/core/include/ngraph/graph_util.hpp | 70 ++++---- src/core/include/ngraph/node.hpp | 169 ------------------ src/core/include/ngraph/op/split.hpp | 1 - src/core/include/ngraph/op/util/op_types.hpp | 1 - src/core/include/ngraph/util.hpp | 1 - src/core/src/graph_util.cpp | 2 +- src/core/src/node.cpp | 14 -- src/core/src/specialize_function.cpp | 2 +- src/core/tests/specialize_function.cpp | 4 +- src/frontends/onnx/docs/how_to_add_op.md | 1 - .../onnx/frontend/src/op/bitwise_not.hpp | 1 - .../onnx/frontend/src/op/conv_transpose.cpp | 22 +-- .../onnx/frontend/src/op/quant_conv.cpp | 22 +-- src/frontends/onnx/frontend/src/op/scan.hpp | 1 - .../onnx/frontend/src/op/scatter_elements.hpp | 1 - .../onnx/frontend/src/op/scatter_nd.hpp | 1 - src/frontends/onnx/frontend/src/op/selu.hpp | 1 - src/frontends/onnx/frontend/src/op/shape.cpp | 1 - src/frontends/onnx/frontend/src/op/shape.hpp | 1 - src/frontends/onnx/frontend/src/op/shrink.cpp | 9 +- src/frontends/onnx/frontend/src/op/shrink.hpp | 1 - .../onnx/frontend/src/op/sigmoid.hpp | 1 - src/frontends/onnx/frontend/src/op/sign.hpp | 1 - src/frontends/onnx/frontend/src/op/sin.hpp | 1 - src/frontends/onnx/frontend/src/op/sinh.hpp | 1 - src/frontends/onnx/frontend/src/op/size.hpp | 1 - src/frontends/onnx/frontend/src/op/slice.cpp | 4 +- src/frontends/onnx/frontend/src/op/slice.hpp | 1 - .../onnx/frontend/src/op/softmax.cpp | 6 +- .../onnx/frontend/src/op/softmax.hpp | 1 - .../onnx/frontend/src/op/softplus.cpp | 1 - .../onnx/frontend/src/op/softplus.hpp | 1 - .../onnx/frontend/src/op/softsign.hpp | 1 - .../onnx/frontend/src/op/space_to_depth.hpp | 1 - src/frontends/onnx/frontend/src/op/split.hpp | 1 - src/frontends/onnx/frontend/src/op/sqrt.hpp | 1 - .../onnx/frontend/src/op/squeeze.hpp | 1 - src/frontends/onnx/frontend/src/op/stft.hpp | 1 - src/frontends/onnx/frontend/src/op/sub.hpp | 1 - src/frontends/onnx/frontend/src/op/sum.hpp | 3 +- src/frontends/onnx/frontend/src/op/tan.hpp | 1 - src/frontends/onnx/frontend/src/op/tanh.hpp | 1 - .../onnx/frontend/src/op/thresholded_relu.hpp | 1 - src/frontends/onnx/frontend/src/op/tile.hpp | 1 - src/frontends/onnx/frontend/src/op/topk.cpp | 31 ++-- src/frontends/onnx/frontend/src/op/topk.hpp | 1 - .../onnx/frontend/src/op/transpose.cpp | 3 +- .../onnx/frontend/src/op/transpose.hpp | 1 - src/frontends/onnx/frontend/src/op/trilu.cpp | 4 +- src/frontends/onnx/frontend/src/op/unique.hpp | 1 - .../onnx/frontend/src/op/unsqueeze.hpp | 1 - .../onnx/frontend/src/op/upsample.hpp | 1 - src/frontends/onnx/frontend/src/op/where.hpp | 1 - src/frontends/onnx/frontend/src/op/xor.hpp | 8 +- .../onnx/frontend/src/utils/convpool.hpp | 8 +- .../frontend/src/utils/pooling_factory.cpp | 4 +- src/inference/src/cnn_network_ngraph_impl.cpp | 10 +- .../interface/ie_iplugin_internal.cpp | 2 +- src/inference/src/dev/converter_utils.cpp | 2 +- src/plugins/intel_cpu/src/nodes/rope.cpp | 4 +- src/plugins/intel_cpu/src/nodes/rope.h | 4 +- .../intel_cpu/src/nodes/scaled_attn.cpp | 4 +- src/plugins/intel_cpu/src/nodes/scaled_attn.h | 4 +- .../cpu_opset/common/op/rope.cpp | 2 +- .../cpu_opset/common/op/rope.hpp | 2 - .../common/pass/swap_convert_transpose.cpp | 2 - .../common/pass/swap_convert_transpose.hpp | 1 - .../single_layer_tests/topk.cpp | 2 +- .../single_layer/memory.hpp | 2 +- .../src/base/layer_test_utils.cpp | 4 +- .../src/single_layer/memory.cpp | 2 +- .../src/single_layer/random_uniform.cpp | 2 +- .../ov_models/include/ov_models/builders.hpp | 26 +-- .../ov_models/src/binary_convolution.cpp | 2 +- .../ov_helpers/ov_models/src/convolution.cpp | 4 +- .../src/convolution_backprop_data.cpp | 6 +- .../ov_models/src/group_convolution.cpp | 4 +- .../src/group_convolution_backprop_data.cpp | 6 +- .../ov_helpers/ov_models/src/pooling.cpp | 4 +- 81 files changed, 167 insertions(+), 399 deletions(-) delete mode 100644 src/core/include/ngraph/node.hpp diff --git a/docs/snippets/lpt_intel_cpu_plugin.cpp b/docs/snippets/lpt_intel_cpu_plugin.cpp index dbc2d3d8f26..9c479b89d39 100644 --- a/docs/snippets/lpt_intel_cpu_plugin.cpp +++ b/docs/snippets/lpt_intel_cpu_plugin.cpp @@ -52,12 +52,12 @@ if (useLpt) { if (useLpt) { // convert not supported cases FakeQuantize -> Convert -> Convert -> Subtract -> Multiply to a single FakeQuantize - pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { + pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { return ov::pass::low_precision::NetworkHelper::areQuantizeAndDequantizeSupportedForMultiply(node, defaultPrecisions); }); // convert not supported cases FakeQuantize -> Convert -> Convert -> Subtract -> Multiply to a single FakeQuantize - pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { + pass_config->set_callback([&defaultPrecisions](const std::shared_ptr &node) -> bool { return ov::pass::low_precision::NetworkHelper::areQuantizeAndDequantizeSupportedForSubtract(node, defaultPrecisions); }); } @@ -95,16 +95,16 @@ if (useLpt) { lptManager.register_pass(supportedPrecisions, perTensorQuantization); // Low precision transformations plugin specific configuration: transformation callbacks definition - lptManager.get_pass_config()->set_callback([](const std::shared_ptr& node) -> bool { + lptManager.get_pass_config()->set_callback([](const std::shared_ptr& node) -> bool { if (const auto multiply = std::dynamic_pointer_cast(node)) { return !MultiplyToGroupConvolutionTransformation::canBeTransformedToGroupConvolution(multiply); } return false; }); - lptManager.get_pass_config()->set_callback([&defaultPrecisions](const std::shared_ptr& node) -> bool { + lptManager.get_pass_config()->set_callback([&defaultPrecisions](const std::shared_ptr& node) -> bool { return LayerTransformation::isAsymmetricQuantization(node, defaultPrecisions) || WeightableLayerTransformation::isAsymmetricOnWeights(node); }); - lptManager.get_pass_config()->set_callback([](const std::shared_ptr& node) -> bool { + lptManager.get_pass_config()->set_callback([](const std::shared_ptr& node) -> bool { return MultiplyToGroupConvolutionTransformation::isDynamicOrScalar(node); }); @@ -177,7 +177,7 @@ using namespace ov::pass::low_precision; ov::pass::Manager lptManager; lptManager.register_pass(); -lptManager.get_pass_config()->set_callback([&defaultPrecisions](const std::shared_ptr& node) -> bool { +lptManager.get_pass_config()->set_callback([&defaultPrecisions](const std::shared_ptr& node) -> bool { return LayerTransformation::isAsymmetricQuantization(node, defaultPrecisions) || WeightableLayerTransformation::isAsymmetricOnWeights(node); }); lptManager.run_passes(nGraphFunc); diff --git a/src/core/include/ngraph/evaluator.hpp b/src/core/include/ngraph/evaluator.hpp index 6e1aecb325e..8a77cb3e8ae 100644 --- a/src/core/include/ngraph/evaluator.hpp +++ b/src/core/include/ngraph/evaluator.hpp @@ -19,8 +19,8 @@ #include #include "ngraph/deprecated.hpp" -#include "ngraph/node.hpp" #include "ngraph/shape.hpp" +#include "openvino/core/node.hpp" #include "openvino/core/type/element_type_traits.hpp" namespace ngraph { @@ -32,16 +32,16 @@ class NGRAPH_API_DEPRECATED Evaluator { NGRAPH_SUPPRESS_DEPRECATED_START public: /// \brief values we compute for outputs - using value_map = std::map; + using value_map = std::map; /// \brief Handler for a computation of a value about an op /// /// A handler is passed a Node* and a vector of computed input values. The handler should /// return a vector of computed output values. - using op_handler = std::function(Node* op, std::vector& inputs)>; + using op_handler = std::function(ov::Node* op, std::vector& inputs)>; /// \brief Table of ops with handlers - using op_handler_map = std::map; + using op_handler_map = std::map; /// \brief construct handler using the provided op handlers. /// @@ -78,7 +78,7 @@ public: } protected: - op_handler get_handler(Node* node) { + op_handler get_handler(ov::Node* node) { op_handler handler = m_universal_handler; if (!handler) { auto it = m_handlers.find(node->get_type_info()); @@ -98,27 +98,27 @@ protected: /// \brief Intstructions for evaluations state machine class Inst { protected: - Inst(Node* node) : m_node(node) {} + Inst(ov::Node* node) : m_node(node) {} public: virtual ~Inst() {} - virtual void handle(Evaluator& evaluator, InstStack& inst_stack, Node* node) = 0; - Node* get_node() { + virtual void handle(Evaluator& evaluator, InstStack& inst_stack, ov::Node* node) = 0; + ov::Node* get_node() { return m_node; } protected: - Node* m_node; + ov::Node* m_node; }; /// \brief Ensure value has been analyzed class ValueInst : public Inst { public: - ValueInst(const ov::Output& value) : Inst(value.get_node()), m_index(value.get_index()) {} + ValueInst(const ov::Output& value) : Inst(value.get_node()), m_index(value.get_index()) {} - ValueInst(const RawNodeOutput& value) : Inst(value.node), m_index(value.index) {} + ValueInst(const ov::RawNodeOutput& value) : Inst(value.node), m_index(value.index) {} - void handle(Evaluator& evaluator, InstStack& inst_stack, Node* node) override { + void handle(Evaluator& evaluator, InstStack& inst_stack, ov::Node* node) override { // Request to analyze this value if we can if (auto handler = evaluator.get_handler(node)) { // Ensure the inputs are processed and then execute the op handler @@ -141,9 +141,9 @@ protected: /// \brief All arguments have been handled; execute the node handler class ExecuteInst : public Inst { public: - ExecuteInst(Node* node, op_handler& handler) : Inst(node), m_handler(handler) {} + ExecuteInst(ov::Node* node, op_handler& handler) : Inst(node), m_handler(handler) {} - void handle(Evaluator& evaluator, InstStack& inst_stack, Node* node) override { + void handle(Evaluator& evaluator, InstStack& inst_stack, ov::Node* node) override { // Request to execute the handleer. Pass what we know about the inputs to the // handler and associate the results with the outputs std::vector inputs; @@ -162,7 +162,7 @@ protected: public: /// \brief Determine information about value - V evaluate(const ov::Output& value) { + V evaluate(const ov::Output& value) { InstStack inst_stack; inst_stack.push(InstPtr(new ValueInst(value))); while (!inst_stack.empty()) { diff --git a/src/core/include/ngraph/graph_util.hpp b/src/core/include/ngraph/graph_util.hpp index 5dfe6d28bdc..488a8077591 100644 --- a/src/core/include/ngraph/graph_util.hpp +++ b/src/core/include/ngraph/graph_util.hpp @@ -25,7 +25,7 @@ #include #include "ngraph/check.hpp" -#include "ngraph/node.hpp" +#include "ngraph/deprecated.hpp" #include "openvino/core/graph_util.hpp" namespace ov { @@ -53,17 +53,19 @@ using ov::replace_output_update_name; using ov::topological_sort; using ov::traverse_nodes; +using NodeMap = std::unordered_map>; + NGRAPH_API_DEPRECATED NGRAPH_API -ov::NodeVector find_common_args(std::shared_ptr target, std::shared_ptr replacement); +ov::NodeVector find_common_args(std::shared_ptr target, std::shared_ptr replacement); /// Topological sort of just nodes template -NGRAPH_API_DEPRECATED std::vector> subgraph_topological_sort(T nodes) { - std::stack> nodes_to_do; - std::unordered_set nodes_done; - std::unordered_set nodes_to_emit; - std::vector> result; +NGRAPH_API_DEPRECATED std::vector> subgraph_topological_sort(T nodes) { + std::stack> nodes_to_do; + std::unordered_set nodes_done; + std::unordered_set nodes_to_emit; + std::vector> result; for (auto& node : nodes) { nodes_to_emit.insert(node.get()); @@ -72,19 +74,19 @@ NGRAPH_API_DEPRECATED std::vector> subgraph_topological_so // NB: Some centos versions implement std::list::size() by counting elements size_t nodes_remaining = nodes_to_emit.size(); while (nodes_to_do.size() > 0 && nodes_remaining > 0) { - Node* node = nodes_to_do.top(); + ov::Node* node = nodes_to_do.top(); if (nodes_done.count(node) == 0) { bool can_add = true; size_t arg_count = node->get_input_size(); for (size_t i = 0; i < arg_count; ++i) { - Node* dep = node->get_input_node_ptr(arg_count - i - 1); + ov::Node* dep = node->get_input_node_ptr(arg_count - i - 1); if (nodes_done.count(dep) == 0 && nodes_to_emit.count(node) != 0) { can_add = false; nodes_to_do.push(dep); } } for (auto& depptr : node->get_control_dependencies()) { - Node* dep = depptr.get(); + ov::Node* dep = depptr.get(); if (nodes_done.count(dep) == 0) { can_add = false; nodes_to_do.push(dep); @@ -119,53 +121,53 @@ NGRAPH_API_DEPRECATED void validate_nodes_and_infer_types(const T& nodes) { // Check if all paths from X to a result go through Y NGRAPH_API_DEPRECATED NGRAPH_API -bool is_post_dominated(Node* X, Node* Y); +bool is_post_dominated(ov::Node* X, ov::Node* Y); NGRAPH_API_DEPRECATED NGRAPH_API -bool is_equal_to_const_value(const std::string& const_value, const ov::Output& reduce_constant); +bool is_equal_to_const_value(const std::string& const_value, const ov::Output& reduce_constant); // input nodes are cloned and returned // NodeMap input may contain default node mapping i.e. pre-cloned nodes // NodeMap output (by reference) fully maps input and cloned nodes NGRAPH_API_DEPRECATED NGRAPH_API -std::vector> clone_nodes(const std::vector>& nodes, - NodeMap& node_map); +std::vector> clone_nodes(const std::vector>& nodes, + NodeMap& node_map); // input nodes are cloned and returned // NodeMap input may contain default node mapping i.e. pre-cloned nodes // NodeMap output (by reference) fully maps input and cloned nodes NGRAPH_API_DEPRECATED NGRAPH_API -std::list> clone_nodes(const std::vector>& nodes, - RawNodeOutputMap& node_map); +std::list> clone_nodes(const std::vector>& nodes, + ov::RawNodeOutputMap& node_map); NGRAPH_API_DEPRECATED NGRAPH_API std::pair, std::shared_ptr> insert_result_parameter_split( - const std::shared_ptr& src_node, - const std::shared_ptr& dst_node); + const std::shared_ptr& src_node, + const std::shared_ptr& dst_node); NGRAPH_API_DEPRECATED NGRAPH_API -void insert_new_node_between(const std::shared_ptr& src_node, - const std::shared_ptr& dst_node, - const std::shared_ptr& new_node); +void insert_new_node_between(const std::shared_ptr& src_node, + const std::shared_ptr& dst_node, + const std::shared_ptr& new_node); NGRAPH_API_DEPRECATED NGRAPH_API -std::shared_ptr make_zero(const ov::element::Type& element_type, const ov::Shape& shape); +std::shared_ptr make_zero(const ov::element::Type& element_type, const ov::Shape& shape); NGRAPH_API_DEPRECATED NGRAPH_API -std::shared_ptr make_constant_from_string(std::string val, - const ov::element::Type& element_type, - const ov::Shape& shape); +std::shared_ptr make_constant_from_string(std::string val, + const ov::element::Type& element_type, + const ov::Shape& shape); NGRAPH_API_DEPRECATED NGRAPH_API -bool is_zero(const ov::Output& reduce_constant); +bool is_zero(const ov::Output& reduce_constant); NGRAPH_API_DEPRECATED NGRAPH_API @@ -183,43 +185,43 @@ ov::NodeVector extract_subgraph(const ov::NodeVector& results, const ov::NodeVec NGRAPH_API_DEPRECATED NGRAPH_API -bool is_one(const ov::Output& reduce_constant); +bool is_one(const ov::Output& reduce_constant); // Returns true if `node` is live in the graph i.e. a result op // transitively uses this `node` NGRAPH_API_DEPRECATED NGRAPH_API -bool is_used(Node* node); +bool is_used(ov::Node* node); // Returns count of `node` users that are still live in the graph NGRAPH_API_DEPRECATED NGRAPH_API -size_t get_user_count(Node* node); +size_t get_user_count(ov::Node* node); NGRAPH_API_DEPRECATED NGRAPH_API -bool is_strided(const Strides& strides); +bool is_strided(const ov::Strides& strides); NGRAPH_API_DEPRECATED NGRAPH_API -bool is_valid_rank(const std::shared_ptr& node, std::vector valid_ranks); +bool is_valid_rank(const std::shared_ptr& node, std::vector valid_ranks); NGRAPH_API_DEPRECATED NGRAPH_API void plot_graph(std::shared_ptr f, const std::string& filename, - std::function& attributes)> = nullptr); + std::function& attributes)> = nullptr); /// \return A vector containing handles for each input of dst that is connected to an output /// of `src`. NGRAPH_API_DEPRECATED NGRAPH_API -std::vector> get_inputs_from(Node& src, Node& dst); +std::vector> get_inputs_from(ov::Node& src, ov::Node& dst); /// \return A vector containing a handle for each output of src that is connected to an input /// of `dst`. NGRAPH_API_DEPRECATED NGRAPH_API -std::vector> get_outputs_to(Node& src, Node& dst); +std::vector> get_outputs_to(ov::Node& src, ov::Node& dst); /// Checks the func for graph cycles starting from results going backwards, then from parameters /// going forward. diff --git a/src/core/include/ngraph/node.hpp b/src/core/include/ngraph/node.hpp deleted file mode 100644 index 8b66bf793c6..00000000000 --- a/src/core/include/ngraph/node.hpp +++ /dev/null @@ -1,169 +0,0 @@ -// Copyright (C) 2018-2023 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(NGRAPH_LEGACY_HEADER_INCLUDED) -# define NGRAPH_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The nGraph API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ngraph/check.hpp" -#include "ngraph/coordinate_diff.hpp" -#include "ngraph/deprecated.hpp" -#include "ngraph/op/util/attr_types.hpp" -#include "ngraph/strides.hpp" -#include "openvino/core/any.hpp" -#include "openvino/core/descriptor/input.hpp" -#include "openvino/core/descriptor/output.hpp" -#include "openvino/core/descriptor/tensor.hpp" -#include "openvino/core/node.hpp" -#include "openvino/core/node_vector.hpp" -#include "openvino/op/util/variable.hpp" -#include "openvino/op/util/variable_value.hpp" - -namespace ov { -namespace op { -namespace v0 { -class Result; -} -} // namespace op -} // namespace ov -namespace ngraph { - -using ov::Node; - -namespace op { -namespace v0 { -using ov::op::v0::Result; -} -} // namespace op - -using EvaluationContext = ov::EvaluationContext; -using ResultVector = std::vector>; - -const auto node_validation_failure_loc_string = ov::node_validation_failure_loc_string; - -NGRAPH_API -NGRAPH_API_DEPRECATED -const std::shared_ptr& check_single_output_arg(const std::shared_ptr& node, size_t i); -NGRAPH_API -NGRAPH_API_DEPRECATED -const ov::NodeVector& check_single_output_args(const ov::NodeVector& args); - -const auto as_output_vector = ov::as_output_vector; -const auto as_node_vector = ov::as_node_vector; -const auto as_result_vector = ov::as_result_vector; - -/// Alias useful for cloning -using NodeMap = std::unordered_map>; - -/// Nodes are the backbone of the graph of Value dataflow. Every node has -/// zero or more nodes as arguments and one value, which is either a tensor -/// or a (possibly empty) tuple of values. -using ov::NodeValidationFailure; - -using NodeTypeInfo = Node::type_info_t; - -// Like an Output but with a Node* instead of a shared_ptr -using ov::RawNodeOutput; - -using RawNodeOutputMap = std::map>; - -using ov::check_new_args_count; - -/// Helper macro that puts necessary declarations of RTTI block inside a class definition. -/// Should be used in the scope of class that requires type identification besides one provided by -/// C++ RTTI. -/// Recommended to be used for all classes that are inherited from class ov::Node to enable -/// pattern -/// matching for them. Accepts necessary type identification details like type of the operation, -/// version and optional parent class. -/// -/// Applying this macro within a class definition provides declaration of type_info static -/// constant for backward compatibility with old RTTI definition for Node, -/// static function get_type_info_static which returns a reference to an object that is equal to -/// type_info but not necessary to the same object, and get_type_info virtual function that -/// overrides Node::get_type_info and returns a reference to the same object that -/// get_type_info_static gives. -/// -/// Use this macro as a public part of the class definition: -/// -/// class MyOp : public Node -/// { -/// public: -/// // Don't use Node as a parent for type_info, it doesn't have any value and -/// prohibited -/// NGRAPH_RTTI_DECLARATION; -/// -/// ... -/// }; -/// -/// class MyInheritedOp : public MyOp -/// { -/// public: -/// NGRAPH_RTTI_DECLARATION; -/// -/// ... -/// }; -/// -/// To complete type identification for a class, use NGRAPH_RTTI_DEFINITION. -/// -#ifdef OPENVINO_STATIC_LIBRARY -# define NGRAPH_RTTI_DECLARATION \ - const ::ngraph::Node::type_info_t& get_type_info() const override; \ - static const ::ngraph::Node::type_info_t& get_type_info_static() -# define _NGRAPH_RTTI_DEFINITION_COMMON(CLASS) \ - const ::ngraph::Node::type_info_t& CLASS::get_type_info() const { \ - return get_type_info_static(); \ - } -#else -# define NGRAPH_RTTI_DECLARATION \ - static const ::ngraph::Node::type_info_t type_info; \ - const ::ngraph::Node::type_info_t& get_type_info() const override; \ - static const ::ngraph::Node::type_info_t& get_type_info_static() -# define _NGRAPH_RTTI_DEFINITION_COMMON(CLASS) \ - const ::ngraph::Node::type_info_t& CLASS::get_type_info() const { \ - return get_type_info_static(); \ - } -#endif - -#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, &PARENT_CLASS::get_type_info_static()}; \ - return type_info_static; \ - } \ - _NGRAPH_RTTI_DEFINITION_COMMON(CLASS) - -#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}; \ - return type_info_static; \ - } \ - _NGRAPH_RTTI_DEFINITION_COMMON(CLASS) -#define NGRAPH_RTTI_DEFINITION(...) \ - _OPENVINO_RTTI_EXPAND(_OPENVINO_RTTI_DEFINITION_SELECTOR(__VA_ARGS__, \ - _NGRAPH_RTTI_DEFINITION_WITH_PARENT, \ - _NGRAPH_RTTI_DEFINITION_NO_PARENT)(__VA_ARGS__)) - -} // namespace ngraph diff --git a/src/core/include/ngraph/op/split.hpp b/src/core/include/ngraph/op/split.hpp index 1ab39e2ace3..0afd5979ef1 100644 --- a/src/core/include/ngraph/op/split.hpp +++ b/src/core/include/ngraph/op/split.hpp @@ -17,7 +17,6 @@ #include #include -#include "ngraph/node.hpp" #include "openvino/op/split.hpp" namespace ngraph { diff --git a/src/core/include/ngraph/op/util/op_types.hpp b/src/core/include/ngraph/op/util/op_types.hpp index 61a9e2bfe37..bd882f0e482 100644 --- a/src/core/include/ngraph/op/util/op_types.hpp +++ b/src/core/include/ngraph/op/util/op_types.hpp @@ -17,7 +17,6 @@ #include #include "ngraph/ngraph_visibility.hpp" -#include "ngraph/node.hpp" #include "openvino/op/util/op_types.hpp" namespace ngraph { diff --git a/src/core/include/ngraph/util.hpp b/src/core/include/ngraph/util.hpp index d81d852a874..01e5dab9dbc 100644 --- a/src/core/include/ngraph/util.hpp +++ b/src/core/include/ngraph/util.hpp @@ -31,7 +31,6 @@ #include "ngraph/axis_vector.hpp" #include "ngraph/graph_util.hpp" -#include "ngraph/node.hpp" #include "ngraph/shape.hpp" #include "openvino/core/enum_mask.hpp" #include "openvino/core/type/element_type.hpp" diff --git a/src/core/src/graph_util.cpp b/src/core/src/graph_util.cpp index 1c43c32a95e..d66977c0d1c 100644 --- a/src/core/src/graph_util.cpp +++ b/src/core/src/graph_util.cpp @@ -448,7 +448,7 @@ std::vector> clone_nodes(const std::vector> clone_nodes(const std::vector>& nodes, - RawNodeOutputMap& output_map) { + ov::RawNodeOutputMap& output_map) { // for each node in topological order auto sorted_nodes = topological_sort(nodes); std::list> cloned_nodes; diff --git a/src/core/src/node.cpp b/src/core/src/node.cpp index 054955e2417..80ac8cdeba8 100644 --- a/src/core/src/node.cpp +++ b/src/core/src/node.cpp @@ -534,20 +534,6 @@ std::string ov::node_validation_failure_loc_string(const Node* node) { return ss.str(); } -OPENVINO_SUPPRESS_DEPRECATED_START -const std::shared_ptr& ngraph::check_single_output_arg(const std::shared_ptr& node, size_t i) { - OPENVINO_ASSERT(node->get_output_size() == 1, "Argument ", i, node, " must produce exactly one value."); - return node; -} - -const ov::NodeVector& ngraph::check_single_output_args(const ov::NodeVector& args) { - for (size_t i = 0; i < args.size(); ++i) { - ngraph::check_single_output_arg(args.at(i), i); - } - return args; -} -OPENVINO_SUPPRESS_DEPRECATED_END - bool ov::Node::match_value(ov::pass::pattern::Matcher* matcher, const Output& pattern_value, const Output& graph_value) { diff --git a/src/core/src/specialize_function.cpp b/src/core/src/specialize_function.cpp index f9c5085370a..5ecc9742772 100644 --- a/src/core/src/specialize_function.cpp +++ b/src/core/src/specialize_function.cpp @@ -86,7 +86,7 @@ std::shared_ptr ngraph::specialize_function(std::shared_ptrset_friendly_name(name); } - ResultVector new_results = f->get_results(); + ov::ResultVector new_results = f->get_results(); for (size_t i = 0; i < new_results.size(); i++) { auto name = new_results[i]->get_friendly_name(); new_results[i] = std::static_pointer_cast(m[new_results[i].get()]); diff --git a/src/core/tests/specialize_function.cpp b/src/core/tests/specialize_function.cpp index efb354e7e48..9da33c1bd18 100644 --- a/src/core/tests/specialize_function.cpp +++ b/src/core/tests/specialize_function.cpp @@ -158,7 +158,7 @@ TEST(specialize_function, et_static_shape_rank_dynamic_validation_fails) { {ov::PartialShape{1, 2, 3}, ov::PartialShape{1, 2, 3, 4}}, param_vals); }, - NodeValidationFailure); + ov::NodeValidationFailure); } // Test specialization of dynamic element types to a case where validation will fail. @@ -182,7 +182,7 @@ TEST(specialize_function, et_dynamic_shape_static_validation_fails) { {ov::PartialShape{1, 2, 3}, ov::PartialShape{1, 2, 3}}, param_vals); }, - NodeValidationFailure); + ov::NodeValidationFailure); } // Test specialization of rank-static dynamic shapes, where the replacement shapes have the wrong diff --git a/src/frontends/onnx/docs/how_to_add_op.md b/src/frontends/onnx/docs/how_to_add_op.md index d05b4d7ecdd..283292ba223 100644 --- a/src/frontends/onnx/docs/how_to_add_op.md +++ b/src/frontends/onnx/docs/how_to_add_op.md @@ -9,7 +9,6 @@ The declaration in `.hpp` can look like: ```cpp #pragma once -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/bitwise_not.hpp b/src/frontends/onnx/frontend/src/op/bitwise_not.hpp index bfffeff7b39..38d69385f96 100644 --- a/src/frontends/onnx/frontend/src/op/bitwise_not.hpp +++ b/src/frontends/onnx/frontend/src/op/bitwise_not.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/conv_transpose.cpp b/src/frontends/onnx/frontend/src/op/conv_transpose.cpp index e46533317d1..2e0276ada01 100644 --- a/src/frontends/onnx/frontend/src/op/conv_transpose.cpp +++ b/src/frontends/onnx/frontend/src/op/conv_transpose.cpp @@ -30,8 +30,8 @@ ov::Output make_group_conv_backprop(const ov::Output& data, const ov::Output& filters, const Strides& strides, const Strides& dilations, - const CoordinateDiff& pads_begin, - const CoordinateDiff& pads_end, + const ov::CoordinateDiff& pads_begin, + const ov::CoordinateDiff& pads_end, const ov::op::PadType& auto_pad_type, const std::vector& output_shape, const std::vector& output_padding) { @@ -44,7 +44,7 @@ ov::Output make_group_conv_backprop(const ov::Output& data, pads_end, dilations, auto_pad_type, - CoordinateDiff(std::begin(output_padding), std::end(output_padding))); + ov::CoordinateDiff(std::begin(output_padding), std::end(output_padding))); } else { return std::make_shared( data, @@ -53,7 +53,7 @@ ov::Output make_group_conv_backprop(const ov::Output& data, strides, dilations, auto_pad_type, - CoordinateDiff(std::begin(output_padding), std::end(output_padding))); + ov::CoordinateDiff(std::begin(output_padding), std::end(output_padding))); } } @@ -61,8 +61,8 @@ ov::Output make_conv_backprop(const ov::Output& data, const ov::Output& filters, const Strides& strides, const Strides& dilations, - const CoordinateDiff& pads_begin, - const CoordinateDiff& pads_end, + const ov::CoordinateDiff& pads_begin, + const ov::CoordinateDiff& pads_end, const ov::op::PadType& auto_pad_type, const std::vector& output_shape, const std::vector& output_padding) { @@ -75,7 +75,7 @@ ov::Output make_conv_backprop(const ov::Output& data, pads_end, dilations, auto_pad_type, - CoordinateDiff(std::begin(output_padding), std::end(output_padding))); + ov::CoordinateDiff(std::begin(output_padding), std::end(output_padding))); } else { return std::make_shared( data, @@ -86,7 +86,7 @@ ov::Output make_conv_backprop(const ov::Output& data, pads_end, dilations, auto_pad_type, - CoordinateDiff(std::begin(output_padding), std::end(output_padding))); + ov::CoordinateDiff(std::begin(output_padding), std::end(output_padding))); } } @@ -140,7 +140,7 @@ ov::OutputVector conv_transpose(const Node& node) { std::size_t num_spatial_dims = 0; Strides strides, dilations; - std::pair paddings; + std::pair paddings; ov::op::PadType auto_pad_type = convpool::get_auto_pad(node); // Get attirbutes or infer them from input data rank it it's static. @@ -163,8 +163,8 @@ ov::OutputVector conv_transpose(const Node& node) { strides = convpool::get_strides(node, num_spatial_dims); dilations = convpool::get_dilations(node, num_spatial_dims); paddings = convpool::get_pads(node, num_spatial_dims); - CoordinateDiff pads_begin = paddings.first; - CoordinateDiff pads_end = paddings.second; + ov::CoordinateDiff pads_begin = paddings.first; + ov::CoordinateDiff pads_end = paddings.second; std::vector output_shape{node.get_attribute_value>("output_shape", {})}; diff --git a/src/frontends/onnx/frontend/src/op/quant_conv.cpp b/src/frontends/onnx/frontend/src/op/quant_conv.cpp index 9feefe73850..942d877e9f5 100644 --- a/src/frontends/onnx/frontend/src/op/quant_conv.cpp +++ b/src/frontends/onnx/frontend/src/op/quant_conv.cpp @@ -34,21 +34,21 @@ namespace ngraph { struct OpScale { - Output data_scale; - Output filter_scale; - Output output_scale; + Output data_scale; + Output filter_scale; + Output output_scale; }; struct OpZeroPoint { - Output data_zero_point; - Output filter_zero_point; - Output output_zero_point; + Output data_zero_point; + Output filter_zero_point; + Output output_zero_point; }; - std::shared_ptr - make_ng_quant_conv(const Output& data, - const Output& filters, + std::shared_ptr + make_ng_quant_conv(const Output& data, + const Output& filters, const Strides& strides, const Strides& filter_dilations, const CoordinateDiff& padding_below, @@ -57,7 +57,7 @@ namespace ngraph int groups, const OpScale& op_scale, const OpZeroPoint& op_zero_point, - const Output& bias = nullptr) + const Output& bias = nullptr) { ngraph:: ov::element::Type output_type; if (data.get_element_type() == ngraph:: ov::element::u8 && @@ -228,7 +228,7 @@ namespace ngraph padding_below, padding_above); - std::shared_ptr conv_node = nullptr; + std::shared_ptr conv_node = nullptr; // no bias param if (inputs.size() == 9 && !ngraph::op::is_null(inputs.at(8))) diff --git a/src/frontends/onnx/frontend/src/op/scan.hpp b/src/frontends/onnx/frontend/src/op/scan.hpp index d9c3b8addb2..1ccbd35b224 100644 --- a/src/frontends/onnx/frontend/src/op/scan.hpp +++ b/src/frontends/onnx/frontend/src/op/scan.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/scatter_elements.hpp b/src/frontends/onnx/frontend/src/op/scatter_elements.hpp index 6b3b9f420fe..f0f97e2ac7b 100644 --- a/src/frontends/onnx/frontend/src/op/scatter_elements.hpp +++ b/src/frontends/onnx/frontend/src/op/scatter_elements.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/scatter_nd.hpp b/src/frontends/onnx/frontend/src/op/scatter_nd.hpp index 37fa256d05f..771153b46db 100644 --- a/src/frontends/onnx/frontend/src/op/scatter_nd.hpp +++ b/src/frontends/onnx/frontend/src/op/scatter_nd.hpp @@ -10,7 +10,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/selu.hpp b/src/frontends/onnx/frontend/src/op/selu.hpp index 8d57a9e0c05..fa360f1d0f6 100644 --- a/src/frontends/onnx/frontend/src/op/selu.hpp +++ b/src/frontends/onnx/frontend/src/op/selu.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/shape.cpp b/src/frontends/onnx/frontend/src/op/shape.cpp index 99f850aea49..58f3e0caa49 100644 --- a/src/frontends/onnx/frontend/src/op/shape.cpp +++ b/src/frontends/onnx/frontend/src/op/shape.cpp @@ -7,7 +7,6 @@ #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "op/shape.hpp" #include "openvino/core/type/element_type.hpp" diff --git a/src/frontends/onnx/frontend/src/op/shape.hpp b/src/frontends/onnx/frontend/src/op/shape.hpp index 8830fd06480..a2dc019dd05 100644 --- a/src/frontends/onnx/frontend/src/op/shape.hpp +++ b/src/frontends/onnx/frontend/src/op/shape.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/shrink.cpp b/src/frontends/onnx/frontend/src/op/shrink.cpp index 3bcb817cf6c..0a3ff14412a 100644 --- a/src/frontends/onnx/frontend/src/op/shrink.cpp +++ b/src/frontends/onnx/frontend/src/op/shrink.cpp @@ -38,17 +38,16 @@ ov::OutputVector shrink(const Node& node) { // Create a mask indicating locations of values that need to be adjusted // by adding and subtracting bias // All other values indicated by 'false' in the masks need to be zeroed out - std::shared_ptr values_below_neg_lambd = std::make_shared(input, negative_lambd); - std::shared_ptr values_above_pos_lambd = - std::make_shared(input, positive_lambd); + std::shared_ptr values_below_neg_lambd = std::make_shared(input, negative_lambd); + std::shared_ptr values_above_pos_lambd = std::make_shared(input, positive_lambd); // Convert from bool to the input type to be able to multiply adjusted inputs // by the created masks values_below_neg_lambd = std::make_shared(values_below_neg_lambd, input_element_type); values_above_pos_lambd = std::make_shared(values_above_pos_lambd, input_element_type); - std::shared_ptr input_minus_bias = std::make_shared(input, bias_tensor); - std::shared_ptr input_plus_bias = std::make_shared(input, bias_tensor); + std::shared_ptr input_minus_bias = std::make_shared(input, bias_tensor); + std::shared_ptr input_plus_bias = std::make_shared(input, bias_tensor); // multiply by the corresponding mask to zero-out the values within // the <-lambd;lambd> range and keep the bias-adjusted values from outside of it diff --git a/src/frontends/onnx/frontend/src/op/shrink.hpp b/src/frontends/onnx/frontend/src/op/shrink.hpp index 5e7c065f7c3..1705505d6b1 100644 --- a/src/frontends/onnx/frontend/src/op/shrink.hpp +++ b/src/frontends/onnx/frontend/src/op/shrink.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/sigmoid.hpp b/src/frontends/onnx/frontend/src/op/sigmoid.hpp index 69c19c668ae..63a0ee20293 100644 --- a/src/frontends/onnx/frontend/src/op/sigmoid.hpp +++ b/src/frontends/onnx/frontend/src/op/sigmoid.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/sign.hpp b/src/frontends/onnx/frontend/src/op/sign.hpp index d0c0c9c461a..4c25db7fe88 100644 --- a/src/frontends/onnx/frontend/src/op/sign.hpp +++ b/src/frontends/onnx/frontend/src/op/sign.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/sin.hpp b/src/frontends/onnx/frontend/src/op/sin.hpp index 9b538e0f005..9b92ec68f2a 100644 --- a/src/frontends/onnx/frontend/src/op/sin.hpp +++ b/src/frontends/onnx/frontend/src/op/sin.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/sinh.hpp b/src/frontends/onnx/frontend/src/op/sinh.hpp index 02e4b414582..90895abd09a 100644 --- a/src/frontends/onnx/frontend/src/op/sinh.hpp +++ b/src/frontends/onnx/frontend/src/op/sinh.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/size.hpp b/src/frontends/onnx/frontend/src/op/size.hpp index cd0d977af01..6bce2d6f816 100644 --- a/src/frontends/onnx/frontend/src/op/size.hpp +++ b/src/frontends/onnx/frontend/src/op/size.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/slice.cpp b/src/frontends/onnx/frontend/src/op/slice.cpp index 23f8c4f4a5b..ecfce847222 100644 --- a/src/frontends/onnx/frontend/src/op/slice.cpp +++ b/src/frontends/onnx/frontend/src/op/slice.cpp @@ -27,7 +27,7 @@ ov::OutputVector slice(const Node& node) { const bool axes_input_provided = inputs.size() >= 4 && !is_null(inputs.at(3)); const bool steps_input_provided = inputs.size() == 5 && !is_null(inputs.at(4)); - ov::Output steps; + ov::Output steps; if (steps_input_provided) { steps = inputs.at(4); } else { @@ -48,7 +48,7 @@ ov::OutputVector slice(const Node& node) { namespace set_1 { ov::OutputVector slice(const Node& node) { - ov::Output data = node.get_ng_inputs().at(0); + ov::Output data = node.get_ng_inputs().at(0); const auto starts_atr = node.get_attribute_value>("starts"); const auto ends = node.get_attribute_as_constant>("ends"); diff --git a/src/frontends/onnx/frontend/src/op/slice.hpp b/src/frontends/onnx/frontend/src/op/slice.hpp index f75343c0d01..6dc4d7d388d 100644 --- a/src/frontends/onnx/frontend/src/op/slice.hpp +++ b/src/frontends/onnx/frontend/src/op/slice.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/softmax.cpp b/src/frontends/onnx/frontend/src/op/softmax.cpp index 566f46e28c7..0bd1ef0c0c9 100644 --- a/src/frontends/onnx/frontend/src/op/softmax.cpp +++ b/src/frontends/onnx/frontend/src/op/softmax.cpp @@ -14,7 +14,7 @@ OPENVINO_SUPPRESS_DEPRECATED_START namespace ngraph { namespace onnx_import { namespace { -std::shared_ptr onnx_softmax(const ov::Output data, const int64_t axis) { +std::shared_ptr onnx_softmax(const ov::Output data, const int64_t axis) { const auto coerced_data = ov::op::util::flatten(data, static_cast(axis)); const auto result = std::make_shared(coerced_data, 1); const auto data_shape = std::make_shared(data); @@ -32,7 +32,7 @@ ov::OutputVector softmax(const Node& node) { const auto axis = node.get_attribute_value("axis", 1); - std::shared_ptr result; + std::shared_ptr result; switch (data_rank.get_length()) { case 0: { result = default_opset::Constant::create(data.get_element_type(), Shape{}, {1}); @@ -55,7 +55,7 @@ ov::OutputVector softmax(const Node& node) { const auto axis = node.get_attribute_value("axis", 1); - std::shared_ptr result; + std::shared_ptr result; switch (data_rank.get_length()) { case 0: { result = default_opset::Constant::create(data.get_element_type(), Shape{}, {1}); diff --git a/src/frontends/onnx/frontend/src/op/softmax.hpp b/src/frontends/onnx/frontend/src/op/softmax.hpp index 7e352cb8a0d..b87bda13aac 100644 --- a/src/frontends/onnx/frontend/src/op/softmax.hpp +++ b/src/frontends/onnx/frontend/src/op/softmax.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/softplus.cpp b/src/frontends/onnx/frontend/src/op/softplus.cpp index c1685ad8555..1e05b69285e 100644 --- a/src/frontends/onnx/frontend/src/op/softplus.cpp +++ b/src/frontends/onnx/frontend/src/op/softplus.cpp @@ -7,7 +7,6 @@ #include #include "default_opset.hpp" -#include "ngraph/node.hpp" OPENVINO_SUPPRESS_DEPRECATED_START namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/softplus.hpp b/src/frontends/onnx/frontend/src/op/softplus.hpp index 323b92e0cbc..25ac0bef0cb 100644 --- a/src/frontends/onnx/frontend/src/op/softplus.hpp +++ b/src/frontends/onnx/frontend/src/op/softplus.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/softsign.hpp b/src/frontends/onnx/frontend/src/op/softsign.hpp index 3f8b6015442..a6f997950b6 100644 --- a/src/frontends/onnx/frontend/src/op/softsign.hpp +++ b/src/frontends/onnx/frontend/src/op/softsign.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/space_to_depth.hpp b/src/frontends/onnx/frontend/src/op/space_to_depth.hpp index dc175be96e2..491d698d5f9 100644 --- a/src/frontends/onnx/frontend/src/op/space_to_depth.hpp +++ b/src/frontends/onnx/frontend/src/op/space_to_depth.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/split.hpp b/src/frontends/onnx/frontend/src/op/split.hpp index 05a21ceeaf1..c85fcbae5ae 100644 --- a/src/frontends/onnx/frontend/src/op/split.hpp +++ b/src/frontends/onnx/frontend/src/op/split.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/sqrt.hpp b/src/frontends/onnx/frontend/src/op/sqrt.hpp index b4c4f48ad8a..d958095baee 100644 --- a/src/frontends/onnx/frontend/src/op/sqrt.hpp +++ b/src/frontends/onnx/frontend/src/op/sqrt.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/squeeze.hpp b/src/frontends/onnx/frontend/src/op/squeeze.hpp index ffcff5846b3..ef1005081d9 100644 --- a/src/frontends/onnx/frontend/src/op/squeeze.hpp +++ b/src/frontends/onnx/frontend/src/op/squeeze.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/stft.hpp b/src/frontends/onnx/frontend/src/op/stft.hpp index bd16cd88b37..50975132965 100644 --- a/src/frontends/onnx/frontend/src/op/stft.hpp +++ b/src/frontends/onnx/frontend/src/op/stft.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/sub.hpp b/src/frontends/onnx/frontend/src/op/sub.hpp index 46b6be6e3ae..32467f94c7f 100644 --- a/src/frontends/onnx/frontend/src/op/sub.hpp +++ b/src/frontends/onnx/frontend/src/op/sub.hpp @@ -8,7 +8,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/sum.hpp b/src/frontends/onnx/frontend/src/op/sum.hpp index 7365b107339..7762469a9f2 100644 --- a/src/frontends/onnx/frontend/src/op/sum.hpp +++ b/src/frontends/onnx/frontend/src/op/sum.hpp @@ -8,7 +8,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" #include "utils/variadic.hpp" @@ -17,7 +16,7 @@ namespace onnx_import { namespace op { namespace set_1 { inline ov::OutputVector sum(const Node& node) { - return variadic::make_ng_variadic_op(node, ngraph::op::AutoBroadcastType::NONE); + return variadic::make_ng_variadic_op(node, ov::op::AutoBroadcastType::NONE); } } // namespace set_1 diff --git a/src/frontends/onnx/frontend/src/op/tan.hpp b/src/frontends/onnx/frontend/src/op/tan.hpp index 4b8b08c2656..ba126bcaa05 100644 --- a/src/frontends/onnx/frontend/src/op/tan.hpp +++ b/src/frontends/onnx/frontend/src/op/tan.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/tanh.hpp b/src/frontends/onnx/frontend/src/op/tanh.hpp index c8b639970d8..bda87687748 100644 --- a/src/frontends/onnx/frontend/src/op/tanh.hpp +++ b/src/frontends/onnx/frontend/src/op/tanh.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/thresholded_relu.hpp b/src/frontends/onnx/frontend/src/op/thresholded_relu.hpp index 8145e1c2811..07e7d5181d0 100644 --- a/src/frontends/onnx/frontend/src/op/thresholded_relu.hpp +++ b/src/frontends/onnx/frontend/src/op/thresholded_relu.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/tile.hpp b/src/frontends/onnx/frontend/src/op/tile.hpp index 20d4c7c56a3..87bddcca502 100644 --- a/src/frontends/onnx/frontend/src/op/tile.hpp +++ b/src/frontends/onnx/frontend/src/op/tile.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/topk.cpp b/src/frontends/onnx/frontend/src/op/topk.cpp index 85eacfe3207..631b3e3aefa 100644 --- a/src/frontends/onnx/frontend/src/op/topk.cpp +++ b/src/frontends/onnx/frontend/src/op/topk.cpp @@ -8,7 +8,6 @@ #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "ngraph/shape.hpp" #include "openvino/core/type/element_type.hpp" #include "openvino/frontend/exception.hpp" @@ -17,7 +16,7 @@ OPENVINO_SUPPRESS_DEPRECATED_START namespace { /// \return Return the second input to the TopK node reshaped to a scalar. -ov::Output get_k(const ngraph::onnx_import::Node& node) { +ov::Output get_k(const ngraph::onnx_import::Node& node) { auto k_node = node.get_ng_inputs().at(1); FRONT_END_GENERAL_CHECK(shape_size(k_node.get_shape()) == 1, "ONNX TopK operator: 'K' parameter must contain a single positive value.", @@ -36,13 +35,12 @@ ov::OutputVector topk(const Node& node) { const auto k_node = node.get_attribute_as_constant("k"); const std::int64_t axis{node.get_attribute_value("axis", -1)}; - std::shared_ptr top_k = - std::make_shared(data, - k_node, - axis, - default_opset::TopK::Mode::MAX, - default_opset::TopK::SortType::SORT_VALUES, - ov::element::i64); + std::shared_ptr top_k = std::make_shared(data, + k_node, + axis, + default_opset::TopK::Mode::MAX, + default_opset::TopK::SortType::SORT_VALUES, + ov::element::i64); return {top_k->output(0), top_k->output(1)}; } @@ -54,13 +52,12 @@ ov::OutputVector topk(const Node& node) { auto k = get_k(node); const std::int64_t axis{node.get_attribute_value("axis", -1)}; - std::shared_ptr top_k = - std::make_shared(data, - k, - axis, - default_opset::TopK::Mode::MAX, - default_opset::TopK::SortType::SORT_VALUES, - ov::element::i64); + std::shared_ptr top_k = std::make_shared(data, + k, + axis, + default_opset::TopK::Mode::MAX, + default_opset::TopK::SortType::SORT_VALUES, + ov::element::i64); return {top_k->output(0), top_k->output(1)}; } @@ -83,7 +80,7 @@ ov::OutputVector topk(const Node& node) { const auto compute_max = static_cast(largest); const auto mode = compute_max ? default_opset::TopK::Mode::MAX : default_opset::TopK::Mode::MIN; - std::shared_ptr top_k = + std::shared_ptr top_k = std::make_shared(data, k, axis, mode, sort_type, ov::element::i64); return {top_k->output(0), top_k->output(1)}; diff --git a/src/frontends/onnx/frontend/src/op/topk.hpp b/src/frontends/onnx/frontend/src/op/topk.hpp index f6b4241f17a..e05e3efacf8 100644 --- a/src/frontends/onnx/frontend/src/op/topk.hpp +++ b/src/frontends/onnx/frontend/src/op/topk.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/transpose.cpp b/src/frontends/onnx/frontend/src/op/transpose.cpp index fbaaf0b86dc..56f73d0a263 100644 --- a/src/frontends/onnx/frontend/src/op/transpose.cpp +++ b/src/frontends/onnx/frontend/src/op/transpose.cpp @@ -7,7 +7,6 @@ #include #include -#include "ngraph/node.hpp" #include "ov_models/ov_builders/reshape.hpp" OPENVINO_SUPPRESS_DEPRECATED_START @@ -16,7 +15,7 @@ namespace onnx_import { namespace op { namespace set_1 { ov::OutputVector transpose(const Node& node) { - ov::Output data = node.get_ng_inputs().at(0); + ov::Output data = node.get_ng_inputs().at(0); auto permute_axes = node.get_attribute_value>("perm", {}); diff --git a/src/frontends/onnx/frontend/src/op/transpose.hpp b/src/frontends/onnx/frontend/src/op/transpose.hpp index 1cdd371b2ad..ff28adf92ec 100644 --- a/src/frontends/onnx/frontend/src/op/transpose.hpp +++ b/src/frontends/onnx/frontend/src/op/transpose.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/trilu.cpp b/src/frontends/onnx/frontend/src/op/trilu.cpp index e0dc3de8d47..8033edfcf22 100644 --- a/src/frontends/onnx/frontend/src/op/trilu.cpp +++ b/src/frontends/onnx/frontend/src/op/trilu.cpp @@ -76,7 +76,7 @@ ov::OutputVector trilu(const Node& node) { std::make_shared(zero, M, one, ov::element::i64), zero); // create 2D tensor with shape [N, 1] and values [[k], [k + 1], ..., [N + k - 1]] - std::shared_ptr vertical_range; + std::shared_ptr vertical_range; if (is_k_available) { vertical_range = std::make_shared(inputs[1], std::make_shared(N, inputs[1]), @@ -88,7 +88,7 @@ ov::OutputVector trilu(const Node& node) { vertical_range = std::make_shared(vertical_range, one); const bool upper = node.get_attribute_value("upper", 1) == 1; - std::shared_ptr mask; + std::shared_ptr mask; if (upper) { mask = std::make_shared(horizontal_range, vertical_range); } else { diff --git a/src/frontends/onnx/frontend/src/op/unique.hpp b/src/frontends/onnx/frontend/src/op/unique.hpp index d868983c005..358608a055a 100644 --- a/src/frontends/onnx/frontend/src/op/unique.hpp +++ b/src/frontends/onnx/frontend/src/op/unique.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/unsqueeze.hpp b/src/frontends/onnx/frontend/src/op/unsqueeze.hpp index 9bc9813d47e..c536691dcd7 100644 --- a/src/frontends/onnx/frontend/src/op/unsqueeze.hpp +++ b/src/frontends/onnx/frontend/src/op/unsqueeze.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/upsample.hpp b/src/frontends/onnx/frontend/src/op/upsample.hpp index 02867a5be2d..49010f45d84 100644 --- a/src/frontends/onnx/frontend/src/op/upsample.hpp +++ b/src/frontends/onnx/frontend/src/op/upsample.hpp @@ -7,7 +7,6 @@ #include "openvino/core/deprecated.hpp" OPENVINO_SUPPRESS_DEPRECATED_START -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/where.hpp b/src/frontends/onnx/frontend/src/op/where.hpp index 82894cd33e3..a80febd24dc 100644 --- a/src/frontends/onnx/frontend/src/op/where.hpp +++ b/src/frontends/onnx/frontend/src/op/where.hpp @@ -10,7 +10,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { diff --git a/src/frontends/onnx/frontend/src/op/xor.hpp b/src/frontends/onnx/frontend/src/op/xor.hpp index 005633f3f36..502d90efd0e 100644 --- a/src/frontends/onnx/frontend/src/op/xor.hpp +++ b/src/frontends/onnx/frontend/src/op/xor.hpp @@ -8,7 +8,6 @@ OPENVINO_SUPPRESS_DEPRECATED_START #include "default_opset.hpp" -#include "ngraph/node.hpp" #include "onnx_import/core/node.hpp" namespace ngraph { @@ -16,10 +15,9 @@ namespace onnx_import { namespace op { namespace set_1 { inline ov::OutputVector logical_xor(const Node& node) { - return {std::make_shared( - node.get_ng_inputs().at(0), - node.get_ng_inputs().at(1), - ngraph::op::AutoBroadcastSpec(ngraph::op::AutoBroadcastType::NUMPY))}; + return {std::make_shared(node.get_ng_inputs().at(0), + node.get_ng_inputs().at(1), + ov::op::AutoBroadcastSpec(ov::op::AutoBroadcastType::NUMPY))}; } } // namespace set_1 diff --git a/src/frontends/onnx/frontend/src/utils/convpool.hpp b/src/frontends/onnx/frontend/src/utils/convpool.hpp index 078a3975de4..91ddad14c00 100644 --- a/src/frontends/onnx/frontend/src/utils/convpool.hpp +++ b/src/frontends/onnx/frontend/src/utils/convpool.hpp @@ -56,7 +56,7 @@ ov::op::RoundingType get_rounding_type(const Node& node); /// /// \return A pair of (padding_above, padding_below), which elements contains number of /// pixels to pad in respective dimensions (height, width, depth). -std::pair get_pads(const Node& node, const size_t kernel_rank); +std::pair get_pads(const Node& node, const size_t kernel_rank); /// \brief Get padding values for the operation described by an ONNX node. /// \details Values are taken from the `pads` attribute. @@ -67,7 +67,7 @@ std::pair get_pads(const Node& node, const size_ /// /// \return A pair of (padding_above, padding_below), which elements contains number of /// pixels to pad in respective dimensions (height, width, depth). -std::pair get_pads(const Node& node); +std::pair get_pads(const Node& node); /// /// \brief Calculate paddings with respect to auto_pad value. @@ -86,8 +86,8 @@ void calculate_auto_pads(const Shape& data_shape, const Strides& strides, const Strides& dilations, const ov::op::PadType& pad_type, - CoordinateDiff& padding_below, - CoordinateDiff& padding_above); + ov::CoordinateDiff& padding_below, + ov::CoordinateDiff& padding_above); /// \brief Gets the 'auto_pad' attribute value. /// diff --git a/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp b/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp index e3d564a5b61..32a4ba1f1cb 100644 --- a/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp +++ b/src/frontends/onnx/frontend/src/utils/pooling_factory.cpp @@ -44,8 +44,8 @@ PoolingFactory::PoolingFactory(const Node& node) m_auto_pad{convpool::get_auto_pad(node)}, m_rounding_type{convpool::get_rounding_type(node)} { const auto paddings = convpool::get_pads(node, m_kernel_shape.size()); - const CoordinateDiff& padding_above{paddings.second}; - const CoordinateDiff& padding_below{paddings.first}; + const ov::CoordinateDiff& padding_above{paddings.second}; + const ov::CoordinateDiff& padding_below{paddings.first}; m_padding_below = Shape{std::begin(padding_below), std::end(padding_below)}; m_padding_above = Shape{std::begin(padding_above), std::end(padding_above)}; m_storage_order = static_cast(node.get_attribute_value("storage_order", 0)); diff --git a/src/inference/src/cnn_network_ngraph_impl.cpp b/src/inference/src/cnn_network_ngraph_impl.cpp index e7145e1e2c7..72607a8bf4e 100644 --- a/src/inference/src/cnn_network_ngraph_impl.cpp +++ b/src/inference/src/cnn_network_ngraph_impl.cpp @@ -36,7 +36,7 @@ using namespace InferenceEngine; using details::CNNNetworkNGraphImpl; using InferenceEngine::details::CNNNetworkNGraphImpl; -void CNNNetworkNGraphImpl::createDataForResult(const ::ov::Output<::ngraph::Node>& output, +void CNNNetworkNGraphImpl::createDataForResult(const ::ov::Output<::ov::Node>& output, const std::string& outName, DataPtr& ptr) { const auto isCompatible = [](int64_t size, const Layout& l) -> bool { @@ -88,7 +88,7 @@ void CNNNetworkNGraphImpl::createDataForResult(const ::ov::Output<::ngraph::Node void CNNNetworkNGraphImpl::validateFunctionNames() const { // nGraph function parameters and pre-Results operations should have unique names - std::unordered_map> unique_names; + std::unordered_map> unique_names; for (const auto& param : _ngraph_function->get_parameters()) { if (unique_names.count(param->get_friendly_name())) { IE_THROW() << "Function contains several inputs with one friendly name!"; @@ -296,7 +296,7 @@ StatusCode CNNNetworkNGraphImpl::addOutput(const std::string& layerName, return DescriptionBuffer(NOT_FOUND, resp) << "Cannot add output! Layer " << layerName << " wasn't found!"; } -void CNNNetworkNGraphImpl::addOutput(const ::ov::Output<::ngraph::Node>& output) { +void CNNNetworkNGraphImpl::addOutput(const ::ov::Output<::ov::Node>& output) { auto dataName = ov::op::util::create_ie_output_name(output); DataPtr data; if (_data.count(dataName)) @@ -317,7 +317,7 @@ size_t CNNNetworkNGraphImpl::getBatchSize() const { // This is not correct in general. We can follow the same semantics, but order of inputs should be // guaranteed to be the same. auto params = _ngraph_function->get_parameters(); - sort(params.begin(), params.end(), [](std::shared_ptr lhs, std::shared_ptr rhs) { + sort(params.begin(), params.end(), [](std::shared_ptr lhs, std::shared_ptr rhs) { return lhs->get_friendly_name() < rhs->get_friendly_name(); }); @@ -592,7 +592,7 @@ StatusCode CNNNetworkNGraphImpl::setBatchSize(size_t size, ResponseDesc* respons const auto first_parameter = *std::min_element(original_parameters.begin(), original_parameters.end(), - [](std::shared_ptr lhs, std::shared_ptr rhs) { + [](std::shared_ptr lhs, std::shared_ptr rhs) { return lhs->get_friendly_name() < rhs->get_friendly_name(); }); const auto first_parameter_pshape = first_parameter->get_output_partial_shape(0); diff --git a/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp b/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp index 97a08ed4fca..08d22fd16ab 100644 --- a/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp +++ b/src/inference/src/cpp_interfaces/interface/ie_iplugin_internal.cpp @@ -281,7 +281,7 @@ std::unordered_set GetRemovedNodes(const std::shared_ptr GetSupportedNodes( const std::shared_ptr& model, std::function&)> transform, - std::function)> is_node_supported) { + std::function)> is_node_supported) { return ov::get_supported_nodes(model, transform, is_node_supported); } diff --git a/src/inference/src/dev/converter_utils.cpp b/src/inference/src/dev/converter_utils.cpp index 04c68ec0481..6aca89c09c6 100644 --- a/src/inference/src/dev/converter_utils.cpp +++ b/src/inference/src/dev/converter_utils.cpp @@ -47,7 +47,7 @@ namespace { std::string get_legacy_name_from_port(const ov::Output& port) { - ov::Output p(std::const_pointer_cast(port.get_node_shared_ptr()), port.get_index()); + ov::Output p(std::const_pointer_cast(port.get_node_shared_ptr()), port.get_index()); if (auto node = std::dynamic_pointer_cast(p.get_node_shared_ptr())) { p = node->input_value(0); } diff --git a/src/plugins/intel_cpu/src/nodes/rope.cpp b/src/plugins/intel_cpu/src/nodes/rope.cpp index b37160c3695..9bee380d4ee 100644 --- a/src/plugins/intel_cpu/src/nodes/rope.cpp +++ b/src/plugins/intel_cpu/src/nodes/rope.cpp @@ -18,7 +18,7 @@ namespace ov { namespace intel_cpu { namespace node { -RoPE::RoPE(const std::shared_ptr& op, const GraphContext::CPtr context) +RoPE::RoPE(const std::shared_ptr& op, const GraphContext::CPtr context) : Node(op, context, NgraphShapeInferFactory(op, EMPTY_PORT_MASK)) { std::string errorMessage; if (!isSupportedOperation(op, errorMessage)) { @@ -287,7 +287,7 @@ void RoPE::execute(dnnl::stream strm) { m_executor->execute(strm, m_config, inputs, outputs); } -bool RoPE::isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept { +bool RoPE::isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept { try { const auto node = std::dynamic_pointer_cast(op); if (!node) { diff --git a/src/plugins/intel_cpu/src/nodes/rope.h b/src/plugins/intel_cpu/src/nodes/rope.h index 47d92b7a00a..c0264d2065a 100644 --- a/src/plugins/intel_cpu/src/nodes/rope.h +++ b/src/plugins/intel_cpu/src/nodes/rope.h @@ -13,7 +13,7 @@ namespace node { class RoPE : public Node { public: - RoPE(const std::shared_ptr& op, const GraphContext::CPtr context); + RoPE(const std::shared_ptr& op, const GraphContext::CPtr context); void getSupportedDescriptors() override {} bool created() const override { @@ -27,7 +27,7 @@ public: } void initSupportedPrimitiveDescriptors() override; void execute(dnnl::stream strm) override; - static bool isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept; + static bool isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept; private: struct Executor { diff --git a/src/plugins/intel_cpu/src/nodes/scaled_attn.cpp b/src/plugins/intel_cpu/src/nodes/scaled_attn.cpp index e56d289a20c..aa659a63623 100644 --- a/src/plugins/intel_cpu/src/nodes/scaled_attn.cpp +++ b/src/plugins/intel_cpu/src/nodes/scaled_attn.cpp @@ -638,7 +638,7 @@ struct ScaledDotProductAttention::AttentionExecutor : public ScaledDotProductAtt } }; -ScaledDotProductAttention::ScaledDotProductAttention(const std::shared_ptr& op, const GraphContext::CPtr context) +ScaledDotProductAttention::ScaledDotProductAttention(const std::shared_ptr& op, const GraphContext::CPtr context) : Node(op, context, SDPAShapeInferFactory(op)), m_tmp_reorder(true) { std::string errorMessage; if (!isSupportedOperation(op, errorMessage)) { @@ -773,7 +773,7 @@ void ScaledDotProductAttention::execute(dnnl::stream strm) { m_executor->execute(strm, m_config, inputs, output, presentk_input, presentv_input, beam_input); } -bool ScaledDotProductAttention::isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept { +bool ScaledDotProductAttention::isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept { try { if (!std::dynamic_pointer_cast(op) && !std::dynamic_pointer_cast(op)) { diff --git a/src/plugins/intel_cpu/src/nodes/scaled_attn.h b/src/plugins/intel_cpu/src/nodes/scaled_attn.h index 9a614d0c7af..cd1fd0da46b 100644 --- a/src/plugins/intel_cpu/src/nodes/scaled_attn.h +++ b/src/plugins/intel_cpu/src/nodes/scaled_attn.h @@ -15,7 +15,7 @@ namespace node { class ScaledDotProductAttention : public Node { public: - ScaledDotProductAttention(const std::shared_ptr& op, const GraphContext::CPtr context); + ScaledDotProductAttention(const std::shared_ptr& op, const GraphContext::CPtr context); void getSupportedDescriptors() override {} bool created() const override { @@ -34,7 +34,7 @@ public: void initSupportedPrimitiveDescriptors() override; void execute(dnnl::stream strm) override; void createPrimitive() override; - static bool isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept; + static bool isSupportedOperation(const std::shared_ptr& op, std::string& errorMessage) noexcept; enum KernelTypes { KT_REF, KT_ONEDNN, KT_MLAS}; diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.cpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.cpp index fb38c4e3f5b..fb06a4dfb19 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.cpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.cpp @@ -11,7 +11,7 @@ ov::intel_cpu::RoPENode::RoPENode(const OutputVector& args, const Config& cfg) : constructor_validate_and_infer_types(); } -std::shared_ptr ov::intel_cpu::RoPENode::clone_with_new_inputs( +std::shared_ptr ov::intel_cpu::RoPENode::clone_with_new_inputs( const ov::OutputVector& new_args) const { INTERNAL_OP_SCOPE(RoPENode_with_new_inputs); check_new_args_count(this, new_args); diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.hpp index f5a919f3bde..b13e5d7ae83 100644 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/op/rope.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "openvino/op/op.hpp" namespace ov { diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.cpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.cpp index 2833c336ad3..97b93279110 100755 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.cpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.cpp @@ -10,8 +10,6 @@ #include "itt.hpp" -NGRAPH_RTTI_DEFINITION(ov::intel_cpu::SwapConvertTranspose, "SwapConvertTranspose"); - ov::intel_cpu::SwapConvertTranspose::SwapConvertTranspose() { MATCHER_SCOPE(SwapConvertTranspose); ov::element::TypeVector param_precisions{ ov::element::i8, ov::element::u8 }; diff --git a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp index 4154d6adb98..9ea20765aa2 100755 --- a/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp +++ b/src/plugins/intel_cpu/src/transformations/cpu_opset/common/pass/swap_convert_transpose.hpp @@ -11,7 +11,6 @@ namespace intel_cpu { class SwapConvertTranspose : public ov::pass::MatcherPass { public: - NGRAPH_RTTI_DECLARATION; SwapConvertTranspose(); }; diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp index 4e82f5ec8c5..7c3568ba419 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp @@ -78,7 +78,7 @@ void TopKLayerTestGPU::SetUp() { auto topk = std::dynamic_pointer_cast( std::make_shared(params[0], k, axis, mode, sort, ov::element::Type_t::i64, stable)); - ngraph::ResultVector results; + ov::ResultVector results; for (size_t i = 0; i < topk->get_output_size(); i++) { results.push_back(std::make_shared(topk->output(i))); } diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/memory.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/memory.hpp index 30afb3ceb52..4d285d6505e 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/memory.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/memory.hpp @@ -49,7 +49,7 @@ private: void ApplyLowLatency(); InferenceEngine::Precision netPrecision; - ngraph::EvaluationContext eval_context; + ov::EvaluationContext eval_context; ngraph::helpers::MemoryTransformation transformation; int64_t iteration_count; diff --git a/src/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp b/src/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp index 0973faec365..0ce03a96ac0 100644 --- a/src/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp +++ b/src/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp @@ -653,10 +653,10 @@ std::string LayerTestsCommon::getRuntimePrecisionByFusedName(const std::string& return ""; } -std::map LayerTestsCommon::getRuntimeInfo() { +std::map LayerTestsCommon::getRuntimeInfo() { const auto execGraph = executableNetwork.GetExecGraphInfo(); const auto function = execGraph.getFunction(); - std::map runtimeInfo; + std::map runtimeInfo; for (const auto& op : function->get_ops()) { runtimeInfo[op->get_friendly_name()] = op->get_rt_info(); } diff --git a/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp b/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp index 5d82ff030e6..87a6a213385 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/memory.cpp @@ -188,7 +188,7 @@ void MemoryTest::CreateCommonFunc() { auto add = std::make_shared(read_value, param.at(0)); auto assign = CreateAssignOp(add, variable); auto res = std::make_shared(add); - function = std::make_shared(ResultVector{res}, ov::SinkVector{assign}, param, "TestMemory"); + function = std::make_shared(ov::ResultVector{res}, ov::SinkVector{assign}, param, "TestMemory"); } void MemoryTest::ApplyLowLatency() { diff --git a/src/tests/functional/shared_test_classes/src/single_layer/random_uniform.cpp b/src/tests/functional/shared_test_classes/src/single_layer/random_uniform.cpp index 3400fbf9681..224ebadf321 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/random_uniform.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/random_uniform.cpp @@ -77,7 +77,7 @@ void RandomUniformLayerTest::SetUp() { precision, global_seed, op_seed); - ngraph::ResultVector results{std::make_shared(random_uniform)}; + ov::ResultVector results{std::make_shared(random_uniform)}; function = std::make_shared(results, ngraph::ParameterVector{input}, "random_uniform"); } diff --git a/src/tests/ov_helpers/ov_models/include/ov_models/builders.hpp b/src/tests/ov_helpers/ov_models/include/ov_models/builders.hpp index 086c75205d7..511754f4e93 100644 --- a/src/tests/ov_helpers/ov_models/include/ov_models/builders.hpp +++ b/src/tests/ov_helpers/ov_models/include/ov_models/builders.hpp @@ -79,7 +79,7 @@ std::shared_ptr makeConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases = false, const std::vector& filterWeights = {}, @@ -93,7 +93,7 @@ std::shared_ptr makeConvolution(const ov::Output& in_data, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases = false, const std::vector& biasesWeights = {}); @@ -105,7 +105,7 @@ std::shared_ptr makeGroupConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, size_t numGroups, bool addBiases = false, @@ -119,7 +119,7 @@ std::shared_ptr makeGroupConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, bool addBiases = false, const std::vector& biasesWeights = {}); @@ -130,7 +130,7 @@ std::shared_ptr makeConvolutionBackpropData(const ov::Output& in const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases = false, const std::vector& outputPadding = {}, @@ -144,7 +144,7 @@ std::shared_ptr makeConvolutionBackpropData(const ov::Output& in const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, bool addBiases = false, const std::vector& outputPadding = {}, const std::vector& biasesWeights = {}); @@ -157,7 +157,7 @@ std::shared_ptr makeConvolutionBackpropData(const ov::Output& in const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases = false, const std::vector& outputPadding = {}, @@ -199,7 +199,7 @@ std::shared_ptr makeGroupConvolutionBackpropData(const ov::Output& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, size_t numGroups, bool addBiases = false, @@ -214,7 +214,7 @@ std::shared_ptr makeGroupConvolutionBackpropData(const ov::Output& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, bool addBiases = false, const std::vector& outputPadding = {}, const std::vector& biasesWeights = {}); @@ -227,7 +227,7 @@ std::shared_ptr makeGroupConvolutionBackpropData(const ov::Output& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, size_t numGroups, bool addBiases = false, @@ -241,7 +241,7 @@ std::shared_ptr makeBinaryConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, float padValue, const std::vector& filterWeihgts = {}); @@ -393,8 +393,8 @@ std::shared_ptr makePooling(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& kernel, - const op::RoundingType& roundingType, - const op::PadType& padType, + const ov::op::RoundingType& roundingType, + const ov::op::PadType& padType, bool excludePad, const ov::test::utils::PoolingTypes& poolType); diff --git a/src/tests/ov_helpers/ov_models/src/binary_convolution.cpp b/src/tests/ov_helpers/ov_models/src/binary_convolution.cpp index 9c29139c399..fc8703ebd29 100644 --- a/src/tests/ov_helpers/ov_models/src/binary_convolution.cpp +++ b/src/tests/ov_helpers/ov_models/src/binary_convolution.cpp @@ -19,7 +19,7 @@ std::shared_ptr makeBinaryConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, float padValue, const std::vector& filterWeihgts) { diff --git a/src/tests/ov_helpers/ov_models/src/convolution.cpp b/src/tests/ov_helpers/ov_models/src/convolution.cpp index a1ded216860..a1617e6ea96 100644 --- a/src/tests/ov_helpers/ov_models/src/convolution.cpp +++ b/src/tests/ov_helpers/ov_models/src/convolution.cpp @@ -21,7 +21,7 @@ std::shared_ptr makeConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases, const std::vector& filterWeights, @@ -58,7 +58,7 @@ std::shared_ptr makeConvolution(const ov::Output& in_data, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases, const std::vector& biasesWeights) { diff --git a/src/tests/ov_helpers/ov_models/src/convolution_backprop_data.cpp b/src/tests/ov_helpers/ov_models/src/convolution_backprop_data.cpp index 1d91c5f0dd6..14234d71076 100644 --- a/src/tests/ov_helpers/ov_models/src/convolution_backprop_data.cpp +++ b/src/tests/ov_helpers/ov_models/src/convolution_backprop_data.cpp @@ -20,7 +20,7 @@ std::shared_ptr makeConvolutionBackpropData(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases, const std::vector& outputPadding, @@ -53,7 +53,7 @@ std::shared_ptr makeConvolutionBackpropData(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, bool addBiases, const std::vector& outputPadding, const std::vector& biasesWeights) { @@ -94,7 +94,7 @@ std::shared_ptr makeConvolutionBackpropData(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, bool addBiases, const std::vector& outputPadding, diff --git a/src/tests/ov_helpers/ov_models/src/group_convolution.cpp b/src/tests/ov_helpers/ov_models/src/group_convolution.cpp index fef06704cca..4996137128d 100644 --- a/src/tests/ov_helpers/ov_models/src/group_convolution.cpp +++ b/src/tests/ov_helpers/ov_models/src/group_convolution.cpp @@ -20,7 +20,7 @@ std::shared_ptr makeGroupConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, size_t numGroups, bool addBiases, @@ -57,7 +57,7 @@ std::shared_ptr makeGroupConvolution(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, bool addBiases, const std::vector& biasesWeights) { auto conv = diff --git a/src/tests/ov_helpers/ov_models/src/group_convolution_backprop_data.cpp b/src/tests/ov_helpers/ov_models/src/group_convolution_backprop_data.cpp index 246b3ff460b..3f85d358e1c 100644 --- a/src/tests/ov_helpers/ov_models/src/group_convolution_backprop_data.cpp +++ b/src/tests/ov_helpers/ov_models/src/group_convolution_backprop_data.cpp @@ -20,7 +20,7 @@ std::shared_ptr makeGroupConvolutionBackpropData(const ov::Output& i const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, size_t numGroups, bool addBiases, @@ -59,7 +59,7 @@ std::shared_ptr makeGroupConvolutionBackpropData(const ov::Output& i const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, bool addBiases, const std::vector& outputPadding, const std::vector& biasesWeights) { @@ -99,7 +99,7 @@ std::shared_ptr makeGroupConvolutionBackpropData(const ov::Output& i const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& dilations, - const op::PadType& autoPad, + const ov::op::PadType& autoPad, size_t numOutChannels, size_t numGroups, bool addBiases, diff --git a/src/tests/ov_helpers/ov_models/src/pooling.cpp b/src/tests/ov_helpers/ov_models/src/pooling.cpp index fe1ca80c960..ba611099b2d 100644 --- a/src/tests/ov_helpers/ov_models/src/pooling.cpp +++ b/src/tests/ov_helpers/ov_models/src/pooling.cpp @@ -17,8 +17,8 @@ std::shared_ptr makePooling(const ov::Output& in, const std::vector& padsBegin, const std::vector& padsEnd, const std::vector& kernel, - const op::RoundingType& roundingType, - const op::PadType& padType, + const ov::op::RoundingType& roundingType, + const ov::op::PadType& padType, bool excludePad, const ov::test::utils::PoolingTypes& poolType) { std::shared_ptr pooling;