diff --git a/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp b/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp index 65a3cb94d9e..4f307f204bf 100644 --- a/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp +++ b/src/common/legacy/src/ngraph_ops/deconvolution_ie.cpp @@ -12,7 +12,7 @@ #include "ngraph/util.hpp" #include "ngraph/validation_util.hpp" #include "ngraph/opsets/opset1.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" using namespace std; using namespace ngraph; diff --git a/src/common/low_precision_transformations/include/low_precision/network_helper.hpp b/src/common/low_precision_transformations/include/low_precision/network_helper.hpp index a29e404a3e3..a988d2ffd77 100644 --- a/src/common/low_precision_transformations/include/low_precision/network_helper.hpp +++ b/src/common/low_precision_transformations/include/low_precision/network_helper.hpp @@ -13,7 +13,7 @@ #include #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include #include "rt_info/shared_value_attribute.hpp" diff --git a/src/common/low_precision_transformations/src/add.cpp b/src/common/low_precision_transformations/src/add.cpp index 950bd3578b0..93b5522f14d 100644 --- a/src/common/low_precision_transformations/src/add.cpp +++ b/src/common/low_precision_transformations/src/add.cpp @@ -11,7 +11,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "low_precision/common/ie_lpt_exception.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/common/low_precision_transformations/src/low_precision.cpp b/src/common/low_precision_transformations/src/low_precision.cpp index 03aee0997c5..00b21b13679 100644 --- a/src/common/low_precision_transformations/src/low_precision.cpp +++ b/src/common/low_precision_transformations/src/low_precision.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/common/snippets/src/op/subgraph.cpp b/src/common/snippets/src/op/subgraph.cpp index f607ed33d55..72573f5519a 100644 --- a/src/common/snippets/src/op/subgraph.cpp +++ b/src/common/snippets/src/op/subgraph.cpp @@ -23,7 +23,7 @@ #include #include "ngraph/pass/constant_folding.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include #include diff --git a/src/common/snippets/src/pass/align_element_type.cpp b/src/common/snippets/src/pass/align_element_type.cpp index da1b35962ce..58ffe833c5e 100644 --- a/src/common/snippets/src/pass/align_element_type.cpp +++ b/src/common/snippets/src/pass/align_element_type.cpp @@ -8,7 +8,7 @@ #include "snippets/op/convert_saturation.hpp" #include "snippets/pass/align_element_type.hpp" #include "snippets/utils.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph/op/util/op_types.hpp" #include @@ -91,4 +91,4 @@ bool ngraph::snippets::pass::AlignElementType::run_on_model(const std::shared_pt bool ngraph::snippets::pass::AlignElementType::opNeedsAlignElementType(const std::shared_ptr& op, const ov::element::Type exec_type) { // At the moment Snippets support only Eltwise/Convert/FQ which one output so we can just call get_element_type() return op_supports_only_exec_type(op) && op->get_element_type() != exec_type; -} \ No newline at end of file +} diff --git a/src/common/transformations/include/ngraph_ops/type_relaxed.hpp b/src/common/transformations/include/ngraph_ops/type_relaxed.hpp index 2975585d01c..2693381779d 100644 --- a/src/common/transformations/include/ngraph_ops/type_relaxed.hpp +++ b/src/common/transformations/include/ngraph_ops/type_relaxed.hpp @@ -4,344 +4,4 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include - -namespace ov { -namespace op { - -/// A base class for templated TypeRelaxed that maintains overridden input types and output types for an operation. -class OPENVINO_API TypeRelaxedBase { -public: - virtual ~TypeRelaxedBase(); - - explicit TypeRelaxedBase(const element::TypeVector& _input_data_types = {}, - const element::TypeVector& _output_data_types = {}) - : m_input_data_types(_input_data_types), - m_output_data_types(_output_data_types) {} - - /// \return Data type that will be set for output with a given index outputIndex. - /// If output with a specified index outputIndex hasn't been set before, element::undefined will returned. - /// Undefined means no type override happens for a given outputIndex and it will deduced as original - /// operation defineds in its infer function. - /// - /// This method may look similar to Node::get_output_element_type, but it is not the same thing, because - /// get_output_element_type returns the result of type inference, so it is completely deduced from - /// an operation inputs and attributes, and get_overridden_output_type returns value of the attribute that - /// is used to deduce output type. In some cases they don't match: get_overridden_output_type may return - /// element::undefined for some index i, and get_output_element_type will return some real type for - /// the same index i. - const element::Type& get_overridden_output_type(size_t outputIndex = 0) const { - if (outputIndex >= m_output_data_types.size()) { - return element::undefined; - } - return m_output_data_types[outputIndex]; - } - - /// Set data type that overrides the original data type for output port with outputIndex index - /// In case if outputIndex is out of range of known outputs (and this class cannot detect - /// the real number of outputs for original operation), the number of overridden outputs - /// is changed according to a given outputIndex value. - void set_overridden_output_type(const element::Type& element_type, size_t outputIndex = 0) { - if (outputIndex >= m_output_data_types.size()) { - m_output_data_types.resize(outputIndex + 1, element::undefined); - } - m_output_data_types[outputIndex] = element_type; - } - - /// \return Data type that will be set for input when original shape/type inference function is called. - /// If index inputIndex hasn't been set before, element::undefined will returned. Undefined means that - /// the type from input tensor descriptor is used for a given index. - const element::Type& get_origin_input_type(size_t inputIndex = 0) const { - if (inputIndex >= m_input_data_types.size()) { - return element::undefined; - } - return m_input_data_types[inputIndex]; - } - - /// Set data type that overrides the original data type for input port with inputIndex index. - /// In case if inputIndex is out of range of known inputs (and this class cannot detect - /// the real number of inputs for original operation), the number of overridden inputs - /// is changed according to a given inputIndex value. All new entries except one added - /// at inputIndex position are undefined. - void set_origin_input_type(const element::Type& element_type, size_t inputIndex = 0) { - if (inputIndex >= m_input_data_types.size()) { - m_input_data_types.resize(inputIndex + 1, element::undefined); - } - m_input_data_types[inputIndex] = element_type; - } - -protected: - void remember_input_data_types(Node& node, element::TypeVector& old_input_types) { - // Remember all input data types - for (size_t i = 0; i < node.get_input_size(); ++i) { - old_input_types.push_back(node.get_input_element_type(i)); - } - - // Reset input data types to m_output_data_type. - for (size_t i = 0; i < node.get_input_size(); ++i) { - auto origin_input_type = get_origin_input_type(i); - if (origin_input_type != element::undefined) { - OPENVINO_SUPPRESS_DEPRECATED_START - node.get_input_tensor(i).set_tensor_type(origin_input_type, node.get_input_partial_shape(i)); - OPENVINO_SUPPRESS_DEPRECATED_END - } - } - } - - void restore_input_data_types(Node& node, const element::TypeVector& old_input_types) { - // Restore original input data types - for (size_t i = 0; i < node.get_input_size(); ++i) { - OPENVINO_SUPPRESS_DEPRECATED_START - node.get_input_tensor(i).set_tensor_type(old_input_types[i], node.get_input_partial_shape(i)); - OPENVINO_SUPPRESS_DEPRECATED_END - } - - if (m_original_output_data_types.empty()) { - m_original_output_data_types = element::TypeVector(node.get_output_size()); - } - - // Save inferred output types - for (size_t i = 0; i < node.get_output_size(); ++i) { - m_original_output_data_types[i] = node.get_output_element_type(i); - } - - // Override (some) output types - for (size_t i = 0; i < node.get_output_size(); ++i) { - auto overridden_output_type = get_overridden_output_type(i); - if (overridden_output_type != element::undefined) { - node.set_output_type(i, overridden_output_type, node.get_output_partial_shape(i)); - } - } - } - - void visit_attributes(AttributeVisitor& visitor) { - bool type_relax = true; - visitor.on_attribute("type_relax", type_relax); - visitor.on_attribute("input_data_types", m_input_data_types); - visitor.on_attribute("output_data_types", m_output_data_types); - } - - typedef struct { - } init_rt_result; - - init_rt_result init_rt_info(Node& node) const { - node.get_rt_info()["opset"] = "type_relaxed_opset"; - return {}; - } - -protected: - // Data types that are used for parent shape/type infer function input ports - // to infer output data types - element::TypeVector m_input_data_types; - element::TypeVector m_output_data_types; - element::TypeVector m_original_output_data_types; -}; - -/// Set another type for a specified output for the period of time when an instance of the class exists. -/// When the execution leaves the scope where an onject of TemporaryReplaceOutputType is defined, -/// the type of the output is set to its original value. Used when initialized TypeRelaxed operation -/// in case when inputs have types that are not compatible with BaseOp infer function. In this case -/// before TypeRelaxed is constructed the BaseOp contructor requires modified data types. -/// So it should be -class TemporaryReplaceOutputType { - Output m_output; - element::Type orig_type; - -public: - /// Replace element type for a given output port by tmp_type - TemporaryReplaceOutputType(Output output, element::Type tmp_type) : m_output(output) { - // save original element type in order to restore it in the destructor - orig_type = m_output.get_element_type(); - OPENVINO_SUPPRESS_DEPRECATED_START - m_output.get_tensor().set_element_type(tmp_type); - OPENVINO_SUPPRESS_DEPRECATED_END - } - - /// Return the output port that was used in the constructor - Output get() const { - return m_output; - } - - /// Restores the original element type for the output - ~TemporaryReplaceOutputType() { - OPENVINO_SUPPRESS_DEPRECATED_START - m_output.get_tensor().set_element_type(orig_type); - OPENVINO_SUPPRESS_DEPRECATED_END - } -}; - -// TODO: remove once FusedOp is removed -OPENVINO_SUPPRESS_DEPRECATED_START - -/// Relaxes tensor element type requirements for BaseOp inputs and outputs -/// This class template should be used with Node descendant class. Defines a new operation by extending the -/// original BaseOp operation with ability to accept inputs and provide outputs with element type that is -/// unusual for BaseOp. For example, TypeRelaxed can accept mixed-precision inputs and provide -/// another type of output. New types are provided as inputs attributes for TypeRelaxed template and fixed. -/// There is no any deduction logic for types are provided as a part of this class and it should be -/// implemented outside if required. -template -class TypeRelaxed : public BaseOp, public TypeRelaxedBase { -public: - OPENVINO_OP(BaseOp::get_type_info_static().name, - BaseOp::get_type_info_static().version_id, - BaseOp, - BaseOp::get_type_info_static().version); - - using BaseOp::BaseOp; - - TypeRelaxed() = default; - - TypeRelaxed(const BaseOp& base_op, element::Type overridden_type) - : TypeRelaxed(base_op, - element::TypeVector(base_op.get_input_size(), overridden_type), - element::TypeVector(base_op.get_output_size(), overridden_type)) {} - - explicit TypeRelaxed(const BaseOp& base_op, - const element::TypeVector& _input_data_types = {}, - const element::TypeVector& _output_data_types = {}) - : BaseOp(base_op), - TypeRelaxedBase(_input_data_types, _output_data_types) { - init(); - } - - /// Creating a new TypeRelaxed operation by calling one of the original op ctors forwarding arguments directly. - template - TypeRelaxed(const element::TypeVector& _input_data_types, - const element::TypeVector& _output_data_types, - Args&&... args) - : BaseOp(std::forward(args)...), - TypeRelaxedBase(_input_data_types, _output_data_types) { - init(); - } - - void validate_and_infer_types() override; - OPENVINO_SUPPRESS_DEPRECATED_START - bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; - OPENVINO_SUPPRESS_DEPRECATED_END - - std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; - - bool visit_attributes(AttributeVisitor& visitor) override; - -private: - mutable std::mutex type_relax_mutex; - void init() { - validate_and_infer_types(); - } - - init_rt_result init_rt = init_rt_info(*this); -}; - -OPENVINO_SUPPRESS_DEPRECATED_START -template -bool TypeRelaxed::evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const { - std::shared_ptr convert; - HostTensorVector casted_inputs(BaseOp::get_input_size()); - for (size_t i = 0; i < BaseOp::get_input_size(); ++i) { - const auto expected_input_type = get_origin_input_type(i); - - if (inputs[i]->get_element_type() == expected_input_type || expected_input_type == element::undefined) { - casted_inputs[i] = inputs[i]; - } else { - if (convert == nullptr) { - convert = std::make_shared(); - } - - convert->set_destination_type(expected_input_type); - casted_inputs[i] = std::make_shared(expected_input_type, inputs[i]->get_shape()); - if (!convert->evaluate({casted_inputs[i]}, {inputs[i]})) { - return false; - } - } - } - - HostTensorVector original_outputs(BaseOp::get_output_size()); - for (size_t i = 0; i < BaseOp::get_output_size(); ++i) { - const auto expected_output_type = get_overridden_output_type(i); - if (expected_output_type == element::undefined || expected_output_type == m_original_output_data_types[i]) { - original_outputs[i] = outputs[i]; - } else { - original_outputs[i] = - std::make_shared(m_original_output_data_types[i], BaseOp::get_output_partial_shape(i)); - } - } - - if (!BaseOp::evaluate(original_outputs, casted_inputs)) { - return false; - } - - for (size_t i = 0; i < BaseOp::get_output_size(); ++i) { - const auto expected_output_type = get_overridden_output_type(i); - - if (expected_output_type != element::undefined && - original_outputs[i]->get_element_type() != expected_output_type) { - if (convert == nullptr) { - convert = std::make_shared(); - } - - convert->set_destination_type(expected_output_type); - const auto casted_output = - std::make_shared(expected_output_type, original_outputs[i]->get_shape()); - if (!convert->evaluate({outputs[i]}, {original_outputs[i]})) { - return false; - } - } - } - - return true; -} -OPENVINO_SUPPRESS_DEPRECATED_END - -template -void TypeRelaxed::validate_and_infer_types() { - element::TypeVector old_input_types; - - remember_input_data_types(*this, old_input_types); - - OPENVINO_SUPPRESS_DEPRECATED_START - BaseOp::validate_and_infer_types(); - OPENVINO_SUPPRESS_DEPRECATED_END - - restore_input_data_types(*this, old_input_types); -} - -template -std::shared_ptr TypeRelaxed::clone_with_new_inputs(const OutputVector& new_args) const { - std::lock_guard lock(type_relax_mutex); - // copy then modify inputs - std::shared_ptr new_node = - std::make_shared>((BaseOp&)(*this), m_input_data_types, m_output_data_types); - for (size_t i = 0; i < new_node->get_input_size(); ++i) { - new_node->input(i).replace_source_output(new_args[i]); - } - - new_node->validate_and_infer_types(); - return new_node; -} - -template -bool TypeRelaxed::visit_attributes(AttributeVisitor& visitor) { - TypeRelaxedBase::visit_attributes(visitor); - BaseOp::visit_attributes(visitor); - return true; -} - -OPENVINO_SUPPRESS_DEPRECATED_END - -} // namespace op -} // namespace ov - -namespace ngraph { -namespace op { -using ov::op::TemporaryReplaceOutputType; -using ov::op::TypeRelaxed; -using ov::op::TypeRelaxedBase; -} // namespace op -} // namespace ngraph +#include "ov_ops/type_relaxed.hpp" diff --git a/src/common/transformations/include/ngraph_ops/augru_cell.hpp b/src/common/transformations/include/ov_ops/augru_cell.hpp similarity index 100% rename from src/common/transformations/include/ngraph_ops/augru_cell.hpp rename to src/common/transformations/include/ov_ops/augru_cell.hpp diff --git a/src/common/transformations/include/ngraph_ops/augru_sequence.hpp b/src/common/transformations/include/ov_ops/augru_sequence.hpp similarity index 100% rename from src/common/transformations/include/ngraph_ops/augru_sequence.hpp rename to src/common/transformations/include/ov_ops/augru_sequence.hpp diff --git a/src/common/transformations/include/ngraph_ops/generate_proposals_ie_internal.hpp b/src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp similarity index 100% rename from src/common/transformations/include/ngraph_ops/generate_proposals_ie_internal.hpp rename to src/common/transformations/include/ov_ops/generate_proposals_ie_internal.hpp diff --git a/src/common/transformations/include/ngraph_ops/multiclass_nms_ie_internal.hpp b/src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp similarity index 100% rename from src/common/transformations/include/ngraph_ops/multiclass_nms_ie_internal.hpp rename to src/common/transformations/include/ov_ops/multiclass_nms_ie_internal.hpp diff --git a/src/common/transformations/include/ngraph_ops/nms_ie_internal.hpp b/src/common/transformations/include/ov_ops/nms_ie_internal.hpp similarity index 100% rename from src/common/transformations/include/ngraph_ops/nms_ie_internal.hpp rename to src/common/transformations/include/ov_ops/nms_ie_internal.hpp diff --git a/src/common/transformations/include/ngraph_ops/nms_static_shape_ie.hpp b/src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp similarity index 100% rename from src/common/transformations/include/ngraph_ops/nms_static_shape_ie.hpp rename to src/common/transformations/include/ov_ops/nms_static_shape_ie.hpp diff --git a/src/common/transformations/include/ngraph_ops/opset_private_tbl.hpp b/src/common/transformations/include/ov_ops/opset_private_tbl.hpp similarity index 100% rename from src/common/transformations/include/ngraph_ops/opset_private_tbl.hpp rename to src/common/transformations/include/ov_ops/opset_private_tbl.hpp diff --git a/src/common/transformations/include/ov_ops/type_relaxed.hpp b/src/common/transformations/include/ov_ops/type_relaxed.hpp new file mode 100644 index 00000000000..2975585d01c --- /dev/null +++ b/src/common/transformations/include/ov_ops/type_relaxed.hpp @@ -0,0 +1,347 @@ +// Copyright (C) 2018-2022 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#pragma once + +#include +#include +#include +#include +#include +#include +#include + +namespace ov { +namespace op { + +/// A base class for templated TypeRelaxed that maintains overridden input types and output types for an operation. +class OPENVINO_API TypeRelaxedBase { +public: + virtual ~TypeRelaxedBase(); + + explicit TypeRelaxedBase(const element::TypeVector& _input_data_types = {}, + const element::TypeVector& _output_data_types = {}) + : m_input_data_types(_input_data_types), + m_output_data_types(_output_data_types) {} + + /// \return Data type that will be set for output with a given index outputIndex. + /// If output with a specified index outputIndex hasn't been set before, element::undefined will returned. + /// Undefined means no type override happens for a given outputIndex and it will deduced as original + /// operation defineds in its infer function. + /// + /// This method may look similar to Node::get_output_element_type, but it is not the same thing, because + /// get_output_element_type returns the result of type inference, so it is completely deduced from + /// an operation inputs and attributes, and get_overridden_output_type returns value of the attribute that + /// is used to deduce output type. In some cases they don't match: get_overridden_output_type may return + /// element::undefined for some index i, and get_output_element_type will return some real type for + /// the same index i. + const element::Type& get_overridden_output_type(size_t outputIndex = 0) const { + if (outputIndex >= m_output_data_types.size()) { + return element::undefined; + } + return m_output_data_types[outputIndex]; + } + + /// Set data type that overrides the original data type for output port with outputIndex index + /// In case if outputIndex is out of range of known outputs (and this class cannot detect + /// the real number of outputs for original operation), the number of overridden outputs + /// is changed according to a given outputIndex value. + void set_overridden_output_type(const element::Type& element_type, size_t outputIndex = 0) { + if (outputIndex >= m_output_data_types.size()) { + m_output_data_types.resize(outputIndex + 1, element::undefined); + } + m_output_data_types[outputIndex] = element_type; + } + + /// \return Data type that will be set for input when original shape/type inference function is called. + /// If index inputIndex hasn't been set before, element::undefined will returned. Undefined means that + /// the type from input tensor descriptor is used for a given index. + const element::Type& get_origin_input_type(size_t inputIndex = 0) const { + if (inputIndex >= m_input_data_types.size()) { + return element::undefined; + } + return m_input_data_types[inputIndex]; + } + + /// Set data type that overrides the original data type for input port with inputIndex index. + /// In case if inputIndex is out of range of known inputs (and this class cannot detect + /// the real number of inputs for original operation), the number of overridden inputs + /// is changed according to a given inputIndex value. All new entries except one added + /// at inputIndex position are undefined. + void set_origin_input_type(const element::Type& element_type, size_t inputIndex = 0) { + if (inputIndex >= m_input_data_types.size()) { + m_input_data_types.resize(inputIndex + 1, element::undefined); + } + m_input_data_types[inputIndex] = element_type; + } + +protected: + void remember_input_data_types(Node& node, element::TypeVector& old_input_types) { + // Remember all input data types + for (size_t i = 0; i < node.get_input_size(); ++i) { + old_input_types.push_back(node.get_input_element_type(i)); + } + + // Reset input data types to m_output_data_type. + for (size_t i = 0; i < node.get_input_size(); ++i) { + auto origin_input_type = get_origin_input_type(i); + if (origin_input_type != element::undefined) { + OPENVINO_SUPPRESS_DEPRECATED_START + node.get_input_tensor(i).set_tensor_type(origin_input_type, node.get_input_partial_shape(i)); + OPENVINO_SUPPRESS_DEPRECATED_END + } + } + } + + void restore_input_data_types(Node& node, const element::TypeVector& old_input_types) { + // Restore original input data types + for (size_t i = 0; i < node.get_input_size(); ++i) { + OPENVINO_SUPPRESS_DEPRECATED_START + node.get_input_tensor(i).set_tensor_type(old_input_types[i], node.get_input_partial_shape(i)); + OPENVINO_SUPPRESS_DEPRECATED_END + } + + if (m_original_output_data_types.empty()) { + m_original_output_data_types = element::TypeVector(node.get_output_size()); + } + + // Save inferred output types + for (size_t i = 0; i < node.get_output_size(); ++i) { + m_original_output_data_types[i] = node.get_output_element_type(i); + } + + // Override (some) output types + for (size_t i = 0; i < node.get_output_size(); ++i) { + auto overridden_output_type = get_overridden_output_type(i); + if (overridden_output_type != element::undefined) { + node.set_output_type(i, overridden_output_type, node.get_output_partial_shape(i)); + } + } + } + + void visit_attributes(AttributeVisitor& visitor) { + bool type_relax = true; + visitor.on_attribute("type_relax", type_relax); + visitor.on_attribute("input_data_types", m_input_data_types); + visitor.on_attribute("output_data_types", m_output_data_types); + } + + typedef struct { + } init_rt_result; + + init_rt_result init_rt_info(Node& node) const { + node.get_rt_info()["opset"] = "type_relaxed_opset"; + return {}; + } + +protected: + // Data types that are used for parent shape/type infer function input ports + // to infer output data types + element::TypeVector m_input_data_types; + element::TypeVector m_output_data_types; + element::TypeVector m_original_output_data_types; +}; + +/// Set another type for a specified output for the period of time when an instance of the class exists. +/// When the execution leaves the scope where an onject of TemporaryReplaceOutputType is defined, +/// the type of the output is set to its original value. Used when initialized TypeRelaxed operation +/// in case when inputs have types that are not compatible with BaseOp infer function. In this case +/// before TypeRelaxed is constructed the BaseOp contructor requires modified data types. +/// So it should be +class TemporaryReplaceOutputType { + Output m_output; + element::Type orig_type; + +public: + /// Replace element type for a given output port by tmp_type + TemporaryReplaceOutputType(Output output, element::Type tmp_type) : m_output(output) { + // save original element type in order to restore it in the destructor + orig_type = m_output.get_element_type(); + OPENVINO_SUPPRESS_DEPRECATED_START + m_output.get_tensor().set_element_type(tmp_type); + OPENVINO_SUPPRESS_DEPRECATED_END + } + + /// Return the output port that was used in the constructor + Output get() const { + return m_output; + } + + /// Restores the original element type for the output + ~TemporaryReplaceOutputType() { + OPENVINO_SUPPRESS_DEPRECATED_START + m_output.get_tensor().set_element_type(orig_type); + OPENVINO_SUPPRESS_DEPRECATED_END + } +}; + +// TODO: remove once FusedOp is removed +OPENVINO_SUPPRESS_DEPRECATED_START + +/// Relaxes tensor element type requirements for BaseOp inputs and outputs +/// This class template should be used with Node descendant class. Defines a new operation by extending the +/// original BaseOp operation with ability to accept inputs and provide outputs with element type that is +/// unusual for BaseOp. For example, TypeRelaxed can accept mixed-precision inputs and provide +/// another type of output. New types are provided as inputs attributes for TypeRelaxed template and fixed. +/// There is no any deduction logic for types are provided as a part of this class and it should be +/// implemented outside if required. +template +class TypeRelaxed : public BaseOp, public TypeRelaxedBase { +public: + OPENVINO_OP(BaseOp::get_type_info_static().name, + BaseOp::get_type_info_static().version_id, + BaseOp, + BaseOp::get_type_info_static().version); + + using BaseOp::BaseOp; + + TypeRelaxed() = default; + + TypeRelaxed(const BaseOp& base_op, element::Type overridden_type) + : TypeRelaxed(base_op, + element::TypeVector(base_op.get_input_size(), overridden_type), + element::TypeVector(base_op.get_output_size(), overridden_type)) {} + + explicit TypeRelaxed(const BaseOp& base_op, + const element::TypeVector& _input_data_types = {}, + const element::TypeVector& _output_data_types = {}) + : BaseOp(base_op), + TypeRelaxedBase(_input_data_types, _output_data_types) { + init(); + } + + /// Creating a new TypeRelaxed operation by calling one of the original op ctors forwarding arguments directly. + template + TypeRelaxed(const element::TypeVector& _input_data_types, + const element::TypeVector& _output_data_types, + Args&&... args) + : BaseOp(std::forward(args)...), + TypeRelaxedBase(_input_data_types, _output_data_types) { + init(); + } + + void validate_and_infer_types() override; + OPENVINO_SUPPRESS_DEPRECATED_START + bool evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const override; + OPENVINO_SUPPRESS_DEPRECATED_END + + std::shared_ptr clone_with_new_inputs(const OutputVector& new_args) const override; + + bool visit_attributes(AttributeVisitor& visitor) override; + +private: + mutable std::mutex type_relax_mutex; + void init() { + validate_and_infer_types(); + } + + init_rt_result init_rt = init_rt_info(*this); +}; + +OPENVINO_SUPPRESS_DEPRECATED_START +template +bool TypeRelaxed::evaluate(const HostTensorVector& outputs, const HostTensorVector& inputs) const { + std::shared_ptr convert; + HostTensorVector casted_inputs(BaseOp::get_input_size()); + for (size_t i = 0; i < BaseOp::get_input_size(); ++i) { + const auto expected_input_type = get_origin_input_type(i); + + if (inputs[i]->get_element_type() == expected_input_type || expected_input_type == element::undefined) { + casted_inputs[i] = inputs[i]; + } else { + if (convert == nullptr) { + convert = std::make_shared(); + } + + convert->set_destination_type(expected_input_type); + casted_inputs[i] = std::make_shared(expected_input_type, inputs[i]->get_shape()); + if (!convert->evaluate({casted_inputs[i]}, {inputs[i]})) { + return false; + } + } + } + + HostTensorVector original_outputs(BaseOp::get_output_size()); + for (size_t i = 0; i < BaseOp::get_output_size(); ++i) { + const auto expected_output_type = get_overridden_output_type(i); + if (expected_output_type == element::undefined || expected_output_type == m_original_output_data_types[i]) { + original_outputs[i] = outputs[i]; + } else { + original_outputs[i] = + std::make_shared(m_original_output_data_types[i], BaseOp::get_output_partial_shape(i)); + } + } + + if (!BaseOp::evaluate(original_outputs, casted_inputs)) { + return false; + } + + for (size_t i = 0; i < BaseOp::get_output_size(); ++i) { + const auto expected_output_type = get_overridden_output_type(i); + + if (expected_output_type != element::undefined && + original_outputs[i]->get_element_type() != expected_output_type) { + if (convert == nullptr) { + convert = std::make_shared(); + } + + convert->set_destination_type(expected_output_type); + const auto casted_output = + std::make_shared(expected_output_type, original_outputs[i]->get_shape()); + if (!convert->evaluate({outputs[i]}, {original_outputs[i]})) { + return false; + } + } + } + + return true; +} +OPENVINO_SUPPRESS_DEPRECATED_END + +template +void TypeRelaxed::validate_and_infer_types() { + element::TypeVector old_input_types; + + remember_input_data_types(*this, old_input_types); + + OPENVINO_SUPPRESS_DEPRECATED_START + BaseOp::validate_and_infer_types(); + OPENVINO_SUPPRESS_DEPRECATED_END + + restore_input_data_types(*this, old_input_types); +} + +template +std::shared_ptr TypeRelaxed::clone_with_new_inputs(const OutputVector& new_args) const { + std::lock_guard lock(type_relax_mutex); + // copy then modify inputs + std::shared_ptr new_node = + std::make_shared>((BaseOp&)(*this), m_input_data_types, m_output_data_types); + for (size_t i = 0; i < new_node->get_input_size(); ++i) { + new_node->input(i).replace_source_output(new_args[i]); + } + + new_node->validate_and_infer_types(); + return new_node; +} + +template +bool TypeRelaxed::visit_attributes(AttributeVisitor& visitor) { + TypeRelaxedBase::visit_attributes(visitor); + BaseOp::visit_attributes(visitor); + return true; +} + +OPENVINO_SUPPRESS_DEPRECATED_END + +} // namespace op +} // namespace ov + +namespace ngraph { +namespace op { +using ov::op::TemporaryReplaceOutputType; +using ov::op::TypeRelaxed; +using ov::op::TypeRelaxedBase; +} // namespace op +} // namespace ngraph diff --git a/src/common/transformations/src/ngraph_ops/augru_cell.cpp b/src/common/transformations/src/ov_ops/augru_cell.cpp similarity index 99% rename from src/common/transformations/src/ngraph_ops/augru_cell.cpp rename to src/common/transformations/src/ov_ops/augru_cell.cpp index 1f39508e3ce..06f22828946 100644 --- a/src/common/transformations/src/ngraph_ops/augru_cell.cpp +++ b/src/common/transformations/src/ov_ops/augru_cell.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/augru_cell.hpp" +#include "ov_ops/augru_cell.hpp" #include diff --git a/src/common/transformations/src/ngraph_ops/augru_sequence.cpp b/src/common/transformations/src/ov_ops/augru_sequence.cpp similarity index 99% rename from src/common/transformations/src/ngraph_ops/augru_sequence.cpp rename to src/common/transformations/src/ov_ops/augru_sequence.cpp index 03833775dc8..cb2dd01566f 100644 --- a/src/common/transformations/src/ngraph_ops/augru_sequence.cpp +++ b/src/common/transformations/src/ov_ops/augru_sequence.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_sequence.hpp" #include "augru_sequence_shape_inference.hpp" #include "itt.hpp" diff --git a/src/common/transformations/src/ngraph_ops/generate_proposals_ie_internal.cpp b/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp similarity index 97% rename from src/common/transformations/src/ngraph_ops/generate_proposals_ie_internal.cpp rename to src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp index fb4f20095df..64a3964e27f 100644 --- a/src/common/transformations/src/ngraph_ops/generate_proposals_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/generate_proposals_ie_internal.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/generate_proposals_ie_internal.hpp" +#include "ov_ops/generate_proposals_ie_internal.hpp" #include #include diff --git a/src/common/transformations/src/ngraph_ops/multiclass_nms_ie_internal.cpp b/src/common/transformations/src/ov_ops/multiclass_nms_ie_internal.cpp similarity index 98% rename from src/common/transformations/src/ngraph_ops/multiclass_nms_ie_internal.cpp rename to src/common/transformations/src/ov_ops/multiclass_nms_ie_internal.cpp index b753d586a87..43c3dd7b09b 100644 --- a/src/common/transformations/src/ngraph_ops/multiclass_nms_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/multiclass_nms_ie_internal.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/multiclass_nms_ie_internal.hpp" +#include "ov_ops/multiclass_nms_ie_internal.hpp" #include "../../core/shape_inference/include/multiclass_nms_shape_inference.hpp" #include "itt.hpp" diff --git a/src/common/transformations/src/ngraph_ops/nms_ie_internal.cpp b/src/common/transformations/src/ov_ops/nms_ie_internal.cpp similarity index 99% rename from src/common/transformations/src/ngraph_ops/nms_ie_internal.cpp rename to src/common/transformations/src/ov_ops/nms_ie_internal.cpp index a56abdc4bdc..bb5883a6d91 100644 --- a/src/common/transformations/src/ngraph_ops/nms_ie_internal.cpp +++ b/src/common/transformations/src/ov_ops/nms_ie_internal.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/nms_ie_internal.hpp" +#include "ov_ops/nms_ie_internal.hpp" #include #include diff --git a/src/common/transformations/src/ngraph_ops/nms_static_shape_ie.cpp b/src/common/transformations/src/ov_ops/nms_static_shape_ie.cpp similarity index 89% rename from src/common/transformations/src/ngraph_ops/nms_static_shape_ie.cpp rename to src/common/transformations/src/ov_ops/nms_static_shape_ie.cpp index f5b3ec132bd..439b3a7d8a8 100644 --- a/src/common/transformations/src/ngraph_ops/nms_static_shape_ie.cpp +++ b/src/common/transformations/src/ov_ops/nms_static_shape_ie.cpp @@ -4,7 +4,7 @@ // clang-format off #include "ngraph/ops.hpp" -#include "ngraph_ops/nms_static_shape_ie.hpp" +#include "ov_ops/nms_static_shape_ie.hpp" // clang-format on #include diff --git a/src/common/transformations/src/transformations/common_optimizations/augru_cell_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/augru_cell_fusion.cpp index 1f52ae6d116..a1cb8d18340 100644 --- a/src/common/transformations/src/transformations/common_optimizations/augru_cell_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/augru_cell_fusion.cpp @@ -7,10 +7,10 @@ #include #include "itt.hpp" -#include "ngraph_ops/augru_cell.hpp" #include "openvino/core/rt_info.hpp" #include "openvino/opsets/opset9.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" +#include "ov_ops/augru_cell.hpp" using namespace std; using namespace ov::opset9; diff --git a/src/common/transformations/src/transformations/common_optimizations/sequence_fusion.cpp b/src/common/transformations/src/transformations/common_optimizations/sequence_fusion.cpp index 5166c1819ed..eb2f0b2fc68 100644 --- a/src/common/transformations/src/transformations/common_optimizations/sequence_fusion.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/sequence_fusion.cpp @@ -7,12 +7,12 @@ #include #include "itt.hpp" -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" #include "openvino/core/rt_info.hpp" #include "openvino/opsets/opset3.hpp" #include "openvino/opsets/opset9.hpp" #include "openvino/pass/pattern/op/wrap_type.hpp" +#include "ov_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" #include "transformations/utils/utils.hpp" using namespace std; diff --git a/src/common/transformations/src/transformations/convert_precision.cpp b/src/common/transformations/src/transformations/convert_precision.cpp index 135d1f2ae97..6b3775b6724 100644 --- a/src/common/transformations/src/transformations/convert_precision.cpp +++ b/src/common/transformations/src/transformations/convert_precision.cpp @@ -16,7 +16,7 @@ #include #include "itt.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" using namespace ov; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp b/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp index 636b4af34df..3c62e0c565c 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_gp9_to_gp_ie_internal.cpp @@ -10,7 +10,7 @@ #include #include "itt.hpp" -#include "ngraph_ops/generate_proposals_ie_internal.hpp" +#include "ov_ops/generate_proposals_ie_internal.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertGP9ToGPIEInternal::ConvertGP9ToGPIEInternal() { diff --git a/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp b/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp index 708df80e501..899567367e1 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie.cpp @@ -13,7 +13,7 @@ #include #include "itt.hpp" -#include "ngraph_ops/nms_static_shape_ie.hpp" +#include "ov_ops/nms_static_shape_ie.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertMatrixNmsToMatrixNmsIE::ConvertMatrixNmsToMatrixNmsIE(bool force_i32_output_type) { diff --git a/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp b/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp index 0ed90cfb1a1..89fec3e5c56 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie.cpp @@ -12,7 +12,7 @@ #include #include "itt.hpp" -#include "ngraph_ops/multiclass_nms_ie_internal.hpp" +#include "ov_ops/multiclass_nms_ie_internal.hpp" #include "transformations/utils/utils.hpp" using namespace ov; diff --git a/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp b/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp index ab9ba327bc0..8ff359c2c73 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_nms9_to_nms_ie_internal.cpp @@ -12,7 +12,7 @@ #include #include "itt.hpp" -#include "ngraph_ops/nms_ie_internal.hpp" +#include "ov_ops/nms_ie_internal.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertNMS9ToNMSIEInternal::ConvertNMS9ToNMSIEInternal() { diff --git a/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp b/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp index 091ad81a951..62cb520a076 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_nms_to_nms_ie_internal.cpp @@ -12,7 +12,7 @@ #include #include "itt.hpp" -#include "ngraph_ops/nms_ie_internal.hpp" +#include "ov_ops/nms_ie_internal.hpp" #include "transformations/utils/utils.hpp" ov::pass::ConvertNMSToNMSIEInternal::ConvertNMSToNMSIEInternal() { diff --git a/src/core/shape_inference/include/augru_cell_shape_inference.hpp b/src/core/shape_inference/include/augru_cell_shape_inference.hpp index 95fcda944e6..8ca041f9ac0 100644 --- a/src/core/shape_inference/include/augru_cell_shape_inference.hpp +++ b/src/core/shape_inference/include/augru_cell_shape_inference.hpp @@ -4,7 +4,7 @@ #pragma once #include "gru_cell_shape_inference.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_sequence.hpp" #include "utils.hpp" namespace ov { diff --git a/src/core/shape_inference/include/augru_sequence_shape_inference.hpp b/src/core/shape_inference/include/augru_sequence_shape_inference.hpp index 3f59babf3d3..82d778969c1 100644 --- a/src/core/shape_inference/include/augru_sequence_shape_inference.hpp +++ b/src/core/shape_inference/include/augru_sequence_shape_inference.hpp @@ -4,7 +4,7 @@ #pragma once #include "gru_sequence_shape_inference.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_sequence.hpp" #include "utils.hpp" namespace ov { diff --git a/src/core/src/op/type_relaxed.cpp b/src/core/src/op/type_relaxed.cpp index 60dd824b4e9..08c2ace6716 100644 --- a/src/core/src/op/type_relaxed.cpp +++ b/src/core/src/op/type_relaxed.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include #include diff --git a/src/core/tests/threading.cpp b/src/core/tests/threading.cpp index 59e81abc969..6fac3ec6ee0 100644 --- a/src/core/tests/threading.cpp +++ b/src/core/tests/threading.cpp @@ -11,11 +11,11 @@ #include #include "atomic_guard.hpp" -#include "ngraph_ops/type_relaxed.hpp" #include "openvino/core/model.hpp" #include "openvino/core/node.hpp" #include "openvino/core/node_vector.hpp" #include "openvino/opsets/opset8.hpp" +#include "ov_ops/type_relaxed.hpp" using namespace ngraph; using namespace std; diff --git a/src/core/tests/type_prop/augru_cell.cpp b/src/core/tests/type_prop/augru_cell.cpp index 04533df9d2a..334cae05866 100644 --- a/src/core/tests/type_prop/augru_cell.cpp +++ b/src/core/tests/type_prop/augru_cell.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/augru_cell.hpp" +#include "ov_ops/augru_cell.hpp" #include "gtest/gtest.h" #include "openvino/core/attribute_visitor.hpp" diff --git a/src/core/tests/type_prop/augru_sequence.cpp b/src/core/tests/type_prop/augru_sequence.cpp index 0b9762eb247..33daa6d0e1d 100644 --- a/src/core/tests/type_prop/augru_sequence.cpp +++ b/src/core/tests/type_prop/augru_sequence.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_sequence.hpp" #include "common_test_utils/test_assertions.hpp" #include "gtest/gtest.h" diff --git a/src/plugins/intel_cpu/src/extension.cpp b/src/plugins/intel_cpu/src/extension.cpp index a2dca48b595..fcdda93ddbd 100644 --- a/src/plugins/intel_cpu/src/extension.cpp +++ b/src/plugins/intel_cpu/src/extension.cpp @@ -13,12 +13,12 @@ #include "snippets_transformations/op/store_convert.hpp" #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp b/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp index 77df012faf0..60723a91808 100644 --- a/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp +++ b/src/plugins/intel_cpu/src/nodes/multiclass_nms.cpp @@ -3,7 +3,7 @@ // #include "multiclass_nms.hpp" -#include "ngraph_ops/multiclass_nms_ie_internal.hpp" +#include "ov_ops/multiclass_nms_ie_internal.hpp" #include #include diff --git a/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp b/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp index 7042bbd1eed..417509d63ec 100644 --- a/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp +++ b/src/plugins/intel_cpu/src/nodes/non_max_suppression.cpp @@ -12,7 +12,7 @@ #include "non_max_suppression.h" #include "ie_parallel.hpp" #include -#include +#include #include "utils/general_utils.h" #include "cpu/x64/jit_generator.hpp" diff --git a/src/plugins/intel_cpu/src/nodes/rnn.cpp b/src/plugins/intel_cpu/src/nodes/rnn.cpp index 23050f64a2c..49f3cda00f7 100644 --- a/src/plugins/intel_cpu/src/nodes/rnn.cpp +++ b/src/plugins/intel_cpu/src/nodes/rnn.cpp @@ -13,8 +13,8 @@ #include "memory_desc/dnnl_blocked_memory_desc.h" #include -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" #include diff --git a/src/plugins/intel_cpu/src/plugin.cpp b/src/plugins/intel_cpu/src/plugin.cpp index a720142088f..6077d47497f 100644 --- a/src/plugins/intel_cpu/src/plugin.cpp +++ b/src/plugins/intel_cpu/src/plugin.cpp @@ -107,11 +107,11 @@ #include #include #include -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" #include #include #include +#include +#include #include #include diff --git a/src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.cpp b/src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.cpp index 0c3227647eb..c4075e7b790 100644 --- a/src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.cpp +++ b/src/plugins/intel_cpu/src/utils/shape_inference/shape_inference.cpp @@ -11,8 +11,8 @@ #include #include -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" #include "assign_shape_inference.hpp" #include "augru_cell_shape_inference.hpp" diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp index f9009cba2ba..4419020c17e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp @@ -3,9 +3,9 @@ // #include "behavior/ov_plugin/caching_tests.hpp" -#include -#include -#include +#include +#include +#include using namespace ov::test::behavior; using namespace ngraph; diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp index 55bfb958bd9..eb2e42e1306 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp @@ -3,9 +3,9 @@ // #include "behavior/plugin/caching_tests.hpp" -#include -#include -#include +#include +#include +#include using namespace LayerTestsDefinitions; using namespace ngraph; diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp index 89410937fd7..c20594041d0 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_sum_broadcast.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include +#include #include "test_utils/fusing_test_utils.hpp" #include "test_utils/convolution_params.hpp" #include "shared_test_classes/base/ov_subgraph.hpp" diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp index f780446d355..8df3545baf4 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/convert_to_leaky_relu_test.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp index 969aa008c98..557851f5a1e 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/move_eltwise_up_data_movement_test.cpp @@ -6,7 +6,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include #include diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp index 90f8425498e..b201cd696c1 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/optimize_sequence_transposes_test.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/reshape_prelu_test.cpp b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/reshape_prelu_test.cpp index 9adbd4f26e0..72a3c14abb6 100644 --- a/src/plugins/intel_cpu/tests/unit/ngraph_transformations/reshape_prelu_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/ngraph_transformations/reshape_prelu_test.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_cell_test.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_cell_test.cpp index da4eb5be5c8..aecfb3fe624 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_cell_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_cell_test.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/augru_cell.hpp" +#include "ov_ops/augru_cell.hpp" #include diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_sequence_test.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_sequence_test.cpp index a48b6367ff7..15d5ae38112 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_sequence_test.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/augru_sequence_test.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_sequence.hpp" #include diff --git a/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp b/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp index c91b92527ad..3ed4c503c3d 100644 --- a/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp +++ b/src/plugins/intel_cpu/tests/unit/shape_inference_test/make_shape_inference.cpp @@ -11,7 +11,7 @@ #include "ngraph_functions/builders.hpp" #include #include -#include +#include using namespace ov; using namespace ov::intel_cpu; @@ -57,4 +57,4 @@ TEST(StaticShapeInferenceTest, MakeShapeInference) { } ASSERT_FALSE(wrongPrcFlag.test_and_set()); -} \ No newline at end of file +} diff --git a/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp b/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp index f8f8e8dcdde..019b3af270b 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/generate_proposals.cpp @@ -4,7 +4,7 @@ #include "intel_gpu/primitives/generate_proposals.hpp" -#include +#include #include "intel_gpu/plugin/common_utils.hpp" #include "intel_gpu/plugin/program.hpp" diff --git a/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp b/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp index 066f7da0ea8..d3a45d73abf 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp @@ -9,7 +9,7 @@ #include "intel_gpu/plugin/common_utils.hpp" #include "intel_gpu/plugin/program.hpp" #include "intel_gpu/primitives/mutable_data.hpp" -#include "ngraph_ops/nms_static_shape_ie.hpp" +#include "ov_ops/nms_static_shape_ie.hpp" namespace ngraph { namespace op { diff --git a/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp b/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp index 41f1ca70d18..cb5cfa91d70 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp @@ -3,7 +3,7 @@ // #include -#include "ngraph_ops/multiclass_nms_ie_internal.hpp" +#include "ov_ops/multiclass_nms_ie_internal.hpp" #include "intel_gpu/plugin/common_utils.hpp" #include "intel_gpu/plugin/program.hpp" diff --git a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp index ff3ca952f67..e66a7625543 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp @@ -7,7 +7,7 @@ #include "ngraph/op/non_max_suppression.hpp" #include -#include +#include #include "intel_gpu/primitives/reorder.hpp" #include "intel_gpu/primitives/mutable_data.hpp" diff --git a/src/plugins/intel_gpu/src/plugin/program.cpp b/src/plugins/intel_gpu/src/plugin/program.cpp index 04988035af0..215c90215c9 100644 --- a/src/plugins/intel_gpu/src/plugin/program.cpp +++ b/src/plugins/intel_gpu/src/plugin/program.cpp @@ -4,7 +4,7 @@ #include "intel_gpu/plugin/program.hpp" #include "ngraph/ops.hpp" -#include "ngraph_ops/nms_ie_internal.hpp" +#include "ov_ops/nms_ie_internal.hpp" #include "openvino/core/graph_util.hpp" #include "intel_gpu/plugin/itt.hpp" #include "intel_gpu/plugin/transformations_pipeline.hpp" diff --git a/src/plugins/template/backend/evaluates_map.cpp b/src/plugins/template/backend/evaluates_map.cpp index 4235b58eeda..83f5a9281ee 100644 --- a/src/plugins/template/backend/evaluates_map.cpp +++ b/src/plugins/template/backend/evaluates_map.cpp @@ -92,8 +92,8 @@ #include "backend.hpp" #include "ngraph/ops.hpp" #include "ngraph/runtime/reference/convert_color_nv12.hpp" -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" using namespace ngraph; using namespace std; diff --git a/src/plugins/template/tests/functional/op_reference/augru_cell.cpp b/src/plugins/template/tests/functional/op_reference/augru_cell.cpp index a80709aa5fd..b12f043145d 100644 --- a/src/plugins/template/tests/functional/op_reference/augru_cell.cpp +++ b/src/plugins/template/tests/functional/op_reference/augru_cell.cpp @@ -4,7 +4,7 @@ #include -#include "ngraph_ops/augru_cell.hpp" +#include "ov_ops/augru_cell.hpp" #include "base_reference_test.hpp" using namespace reference_tests; diff --git a/src/plugins/template/tests/functional/op_reference/augru_sequence.cpp b/src/plugins/template/tests/functional/op_reference/augru_sequence.cpp index 7899c8d5260..27d5c48330b 100644 --- a/src/plugins/template/tests/functional/op_reference/augru_sequence.cpp +++ b/src/plugins/template/tests/functional/op_reference/augru_sequence.cpp @@ -4,7 +4,7 @@ #include -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_sequence.hpp" #include "base_reference_test.hpp" using namespace reference_tests; diff --git a/src/tests/functional/inference_engine/transformations/common_optimizations/augru_cell_fusion.cpp b/src/tests/functional/inference_engine/transformations/common_optimizations/augru_cell_fusion.cpp index cd29854404b..b995de77cb6 100644 --- a/src/tests/functional/inference_engine/transformations/common_optimizations/augru_cell_fusion.cpp +++ b/src/tests/functional/inference_engine/transformations/common_optimizations/augru_cell_fusion.cpp @@ -6,7 +6,7 @@ #include #include "common_test_utils/ngraph_test_utils.hpp" -#include "ngraph_ops/augru_cell.hpp" +#include "ov_ops/augru_cell.hpp" #include "openvino/op/parameter.hpp" #include "openvino/opsets/opset9.hpp" #include "transformations/common_optimizations/augru_cell_fusion.hpp" diff --git a/src/tests/functional/inference_engine/transformations/common_optimizations/sequence_fusion.cpp b/src/tests/functional/inference_engine/transformations/common_optimizations/sequence_fusion.cpp index 11317f884bd..3f28bdbdd6b 100644 --- a/src/tests/functional/inference_engine/transformations/common_optimizations/sequence_fusion.cpp +++ b/src/tests/functional/inference_engine/transformations/common_optimizations/sequence_fusion.cpp @@ -9,8 +9,8 @@ #include "openvino/opsets/opset3.hpp" #include "openvino/opsets/opset9.hpp" #include "transformations/common_optimizations/sequence_fusion.hpp" -#include "ngraph_ops/augru_sequence.hpp" -#include "ngraph_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" +#include "ov_ops/augru_cell.hpp" using namespace ov; using namespace std; diff --git a/src/tests/functional/inference_engine/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp b/src/tests/functional/inference_engine/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp index 82171a8b916..24cb52cf306 100644 --- a/src/tests/functional/inference_engine/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp +++ b/src/tests/functional/inference_engine/transformations/op_conversions/convert_matrix_nms_to_matrix_nms_ie_internal.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/tests/functional/inference_engine/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp b/src/tests/functional/inference_engine/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp index 4961075a1f4..7b187f2e16b 100644 --- a/src/tests/functional/inference_engine/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp +++ b/src/tests/functional/inference_engine/transformations/op_conversions/convert_multiclass_nms_to_multiclass_nms_ie_internal.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp b/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp index bcaa3e16e4c..146928cf840 100644 --- a/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp +++ b/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms9_to_nms_ie_internal_test.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms_to_nms_ie_internal_test.cpp b/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms_to_nms_ie_internal_test.cpp index 08b98f84c25..b854dbdf012 100644 --- a/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms_to_nms_ie_internal_test.cpp +++ b/src/tests/functional/inference_engine/transformations/op_conversions/convert_nms_to_nms_ie_internal_test.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp b/src/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp index 4a848c2b3c8..56d70bc6868 100644 --- a/src/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp +++ b/src/tests/functional/inference_engine/transformations/type_relaxed_tests.cpp @@ -6,7 +6,7 @@ #include "common_test_utils/test_common.hpp" #include #include -#include +#include #include diff --git a/src/tests/functional/inference_engine/transformations/utils/convert_precision.cpp b/src/tests/functional/inference_engine/transformations/utils/convert_precision.cpp index d04c376c162..fbae4427b4a 100644 --- a/src/tests/functional/inference_engine/transformations/utils/convert_precision.cpp +++ b/src/tests/functional/inference_engine/transformations/utils/convert_precision.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "common_test_utils/ngraph_test_utils.hpp" diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/caching_tests.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/caching_tests.cpp index 1499ff3a94d..a784add6175 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/caching_tests.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/caching_tests.cpp @@ -3,7 +3,7 @@ // #include "behavior/ov_plugin/caching_tests.hpp" -#include +#include #include "ov_api_conformance_helpers.hpp" namespace { diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/caching_tests.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/caching_tests.cpp index 13ab882467f..e409c5f8e80 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/caching_tests.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/caching_tests.cpp @@ -3,7 +3,7 @@ // #include "behavior/plugin/caching_tests.hpp" -#include +#include #include "api_conformance_helpers.hpp" namespace { diff --git a/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp b/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp index e01d3c3dd95..e5e8dd5bece 100644 --- a/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp +++ b/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp @@ -11,7 +11,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "fake_quantize_function.hpp" #include "function_helper.hpp" diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp index abefa74b3e0..af968542c5d 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/low_precision_transformations/layer_transformation.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include "low_precision/layer_transformation.hpp" #include "shared_test_classes/base/layer_test_utils.hpp" diff --git a/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp b/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp index 53d6f7cdc20..e285a1b86d3 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/compare_results.cpp @@ -3,8 +3,8 @@ // #include "ngraph/ops.hpp" -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" #include "shared_test_classes/base/layer_test_utils.hpp" #include "shared_test_classes/base/utils/compare_results.hpp" @@ -81,7 +81,7 @@ CompareMap getCompareMap() { #include "openvino/opsets/opset9_tbl.hpp" #include "openvino/opsets/opset10_tbl.hpp" -#include "ngraph_ops/opset_private_tbl.hpp" +#include "ov_ops/opset_private_tbl.hpp" #undef _OPENVINO_OP_REG }; return compareMap; diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index 667af5fdefa..c58644d5139 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -4,8 +4,8 @@ #include #include "ngraph/ops.hpp" -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" #include @@ -782,7 +782,7 @@ InputsMap getInputMap() { #include "openvino/opsets/opset8_tbl.hpp" #include "openvino/opsets/opset9_tbl.hpp" -#include "ngraph_ops/opset_private_tbl.hpp" +#include "ov_ops/opset_private_tbl.hpp" #undef _OPENVINO_OP_REG }; return inputsMap; diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp index 31cd6bf6e2e..1947781e855 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/include/lpt_ngraph_functions/common/builders.hpp @@ -8,7 +8,7 @@ #include #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "low_precision/rt_info/intervals_alignment_attribute.hpp" #include "low_precision/rt_info/quantization_alignment_attribute.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp index 0230492bab1..47de16045ff 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/align_concat_quantization_parameters_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/align_concat_quantization_parameters_function.hpp" #include -#include +#include #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp index 5cf5f3b4e9a..85c05233241 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/avg_pool_function.cpp @@ -3,7 +3,7 @@ // #include -#include +#include #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp index fb22618ff8a..06fec41ead5 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/common/builders.cpp @@ -8,7 +8,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp index 5f7001fd7dd..21ede078ea8 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/concat_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/concat_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "low_precision/network_helper.hpp" #include "low_precision/rt_info/precision_preserved_attribute.hpp" #include "low_precision/rt_info/intervals_alignment_attribute.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp index 50b71130bad..f845bd364c3 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_backprop_data_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/convolution_backprop_data_function.hpp" #include -#include +#include #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp index 33d9f6327c8..a9ba4ee84fd 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/convolution_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/convolution_function.hpp" #include -#include +#include #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" #include "low_precision/rt_info/quantization_granularity_attribute.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp index c6d138c3440..af31dd73551 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/fake_quantize_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp index 0900065c3b3..34c1b7789e8 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fake_quantize_precision_selection_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/fake_quantize_precision_selection_function.hpp" #include -#include +#include #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fold_fake_quantize_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fold_fake_quantize_function.cpp index df342839c41..2ee6702d988 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fold_fake_quantize_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fold_fake_quantize_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/fold_fake_quantize_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" namespace ngraph { diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp index bba022757e3..6b7a6ea6cbc 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_fake_quantize_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/fuse_fake_quantize_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_multiply_to_fake_quantize_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_multiply_to_fake_quantize_function.cpp index a2ab6322b3e..fec26badd45 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_multiply_to_fake_quantize_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_multiply_to_fake_quantize_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/fuse_multiply_to_fake_quantize_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_subtract_to_fake_quantize_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_subtract_to_fake_quantize_function.cpp index 4109d621a10..25c115c0f07 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_subtract_to_fake_quantize_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/fuse_subtract_to_fake_quantize_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/fuse_subtract_to_fake_quantize_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp index 1c02a2fc3aa..12d1776d1d6 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/group_convolution_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/group_convolution_function.hpp" #include -#include +#include #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp index 2e6f9312f60..79c405b093f 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/markup_avg_pool_precisions_function.cpp @@ -3,7 +3,7 @@ // #include -#include +#include #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp index c26fdf6e7a1..9dc165bc104 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mat_mul_function.cpp @@ -8,7 +8,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp index e2100ae6c48..a49f16eb48c 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/max_pool_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/max_pool_function.hpp" #include -#include +#include #include "low_precision/network_helper.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_fake_quantize_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_fake_quantize_function.cpp index fd2167fcf32..085ccd666a3 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_fake_quantize_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/move_fake_quantize_function.cpp @@ -6,7 +6,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "low_precision/network_helper.hpp" #include "lpt_ngraph_functions/common/fake_quantize_on_data.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp index 493054a95d1..b030e8d16d2 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/multiply_function.hpp" #include -#include +#include #include "ngraph_functions/subgraph_builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp index 9b3e4d1eed4..9a1e6a73362 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/multiply_to_group_convolution_function.cpp @@ -6,7 +6,7 @@ #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" namespace ngraph { namespace builder { diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp index 938c91b6592..369b8e08499 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/mvn_function.cpp @@ -6,7 +6,7 @@ #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" namespace ngraph { namespace builder { diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp index 84ce2567589..d9397f17701 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_dequantization_function.cpp @@ -6,7 +6,7 @@ #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" namespace ngraph { namespace builder { @@ -42,4 +42,4 @@ namespace subgraph { } // namespace subgraph } // namespace builder -} // namespace ngraph \ No newline at end of file +} // namespace ngraph diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp index 8a94f7a577c..1f47062174f 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/normalize_l2_function.cpp @@ -4,7 +4,7 @@ #include "lpt_ngraph_functions/normalize_l2_function.hpp" -#include +#include #include #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp index 0625ce062e4..9f8908c0f8f 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/precision_propagation_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/precision_propagation_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "low_precision/network_helper.hpp" #include "low_precision/rt_info/precision_preserved_attribute.hpp" #include "low_precision/rt_info/intervals_alignment_attribute.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp index 73141b1d730..6846488c7af 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/prelu_function.cpp @@ -7,7 +7,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/recurrent_cell_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/recurrent_cell_function.cpp index edc6fde34e9..2195dc41591 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/recurrent_cell_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/recurrent_cell_function.cpp @@ -5,7 +5,7 @@ #include "lpt_ngraph_functions/recurrent_cell_function.hpp" #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "low_precision/network_helper.hpp" #include "low_precision/rt_info/precision_preserved_attribute.hpp" #include "low_precision/rt_info/intervals_alignment_attribute.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp index 6737d06f4fc..3152a33c7bb 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/relu_function.cpp @@ -7,7 +7,7 @@ #include #include -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" #include "lpt_ngraph_functions/common/builders.hpp" #include "low_precision/network_helper.hpp" diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp index b32c8b33a92..39672da33e2 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/squeeze_function.cpp @@ -6,7 +6,7 @@ #include "ngraph_functions/subgraph_builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" namespace ngraph { namespace builder { diff --git a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp index 4ed5f8b6b2b..2bda513f952 100644 --- a/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp +++ b/src/tests/ngraph_helpers/lpt_ngraph_functions/src/unsqueeze_function.cpp @@ -6,7 +6,7 @@ #include "ngraph_functions/builders.hpp" #include "lpt_ngraph_functions/common/builders.hpp" -#include "ngraph_ops/type_relaxed.hpp" +#include "ov_ops/type_relaxed.hpp" namespace ngraph { namespace builder { diff --git a/src/tests/ngraph_helpers/ngraph_functions/src/augru_cell.cpp b/src/tests/ngraph_helpers/ngraph_functions/src/augru_cell.cpp index e65fdc11e0c..987a5bb0a57 100644 --- a/src/tests/ngraph_helpers/ngraph_functions/src/augru_cell.cpp +++ b/src/tests/ngraph_helpers/ngraph_functions/src/augru_cell.cpp @@ -7,8 +7,8 @@ #include "ngraph_functions/builders.hpp" -#include "ngraph_ops/augru_cell.hpp" -#include "ngraph_ops/augru_sequence.hpp" +#include "ov_ops/augru_cell.hpp" +#include "ov_ops/augru_sequence.hpp" namespace ngraph { namespace builder { @@ -20,7 +20,7 @@ namespace builder { * or, * 0 1 2 * X init_hidden_state attention - * + * */ std::shared_ptr makeAUGRU(const OutputVector& in, const std::vector& constants, @@ -74,4 +74,4 @@ std::shared_ptr makeAUGRU(const OutputVector& in, } } } // namespace builder -} // namespace ngraph \ No newline at end of file +} // namespace ngraph