From aed3568d07ec0a9efbb18f13115134d94736d55d Mon Sep 17 00:00:00 2001 From: Oleg Pipikin Date: Fri, 26 Jan 2024 17:03:59 +0100 Subject: [PATCH] Remove ngraph function (#22436) --- docs/snippets/lpt_intel_cpu_plugin.cpp | 2 +- src/core/include/ngraph/function.hpp | 25 ------------------- src/core/include/ngraph/graph_util.hpp | 5 ++-- src/core/include/ngraph/ngraph.hpp | 1 - .../include/ngraph/specialize_function.hpp | 18 ++++++++----- src/core/src/graph_util.cpp | 6 ++--- src/core/src/specialize_function.cpp | 20 ++++++++------- src/core/tests/specialize_function.cpp | 24 +++++++++--------- .../frontend/include/onnx_import/onnx.hpp | 12 ++++----- .../onnx/frontend/src/core/graph.hpp | 4 +-- .../onnx/frontend/src/core/value_info.hpp | 2 +- src/frontends/onnx/frontend/src/onnx.cpp | 8 +++--- src/frontends/onnx/frontend/src/op/if.cpp | 4 +-- src/frontends/onnx/frontend/src/op/loop.cpp | 2 +- src/frontends/onnx/frontend/src/op/scan.cpp | 3 +-- src/inference/src/cnn_network_ngraph_impl.cpp | 3 +-- src/inference/src/dev/converter_utils.cpp | 2 +- .../infer_request_dynamic.cpp | 4 +-- .../single_layer_tests/topk.cpp | 2 +- .../src/base/layer_test_utils.cpp | 2 +- .../src/single_layer/matrix_nms.cpp | 2 +- .../src/single_layer/memory.cpp | 6 ++--- .../src/single_layer/multiclass_nms.cpp | 2 +- .../src/single_layer/non_max_suppression.cpp | 10 ++++---- .../src/single_layer/random_uniform.cpp | 2 +- 25 files changed, 75 insertions(+), 96 deletions(-) delete mode 100644 src/core/include/ngraph/function.hpp diff --git a/docs/snippets/lpt_intel_cpu_plugin.cpp b/docs/snippets/lpt_intel_cpu_plugin.cpp index c4cd047f9a0..dbc2d3d8f26 100644 --- a/docs/snippets/lpt_intel_cpu_plugin.cpp +++ b/docs/snippets/lpt_intel_cpu_plugin.cpp @@ -18,7 +18,7 @@ namespace device { class ConvertOpSet1ToDeviceSpecific: public ov::pass::ModelPass { public: - bool run_on_model(const std::shared_ptr& f) override { + bool run_on_model(const std::shared_ptr& f) override { return true; } }; diff --git a/src/core/include/ngraph/function.hpp b/src/core/include/ngraph/function.hpp deleted file mode 100644 index 7b9a7448a97..00000000000 --- a/src/core/include/ngraph/function.hpp +++ /dev/null @@ -1,25 +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 "ngraph/ngraph_visibility.hpp" -#include "ngraph/node.hpp" -#include "ngraph/op/parameter.hpp" -#include "openvino/core/model.hpp" -#include "openvino/op/util/variable.hpp" - -namespace ngraph { -using Function = ov::Model; -} // namespace ngraph diff --git a/src/core/include/ngraph/graph_util.hpp b/src/core/include/ngraph/graph_util.hpp index 31c4d5859a8..30ae168010c 100644 --- a/src/core/include/ngraph/graph_util.hpp +++ b/src/core/include/ngraph/graph_util.hpp @@ -25,7 +25,6 @@ #include #include "ngraph/check.hpp" -#include "ngraph/function.hpp" #include "ngraph/node.hpp" #include "openvino/core/graph_util.hpp" @@ -207,7 +206,7 @@ bool is_valid_rank(const std::shared_ptr& node, std::vector valid_ NGRAPH_API_DEPRECATED NGRAPH_API -void plot_graph(std::shared_ptr f, +void plot_graph(std::shared_ptr f, const std::string& filename, std::function& attributes)> = nullptr); @@ -227,7 +226,7 @@ std::vector> get_outputs_to(Node& src, Node& dst); /// It returns true if a cycle is found and the first cycle encountered. NGRAPH_API_DEPRECATED NGRAPH_API -bool check_for_cycles(const ngraph::Function* func, ngraph::NodeVector& cycle_nodes, bool& is_bkwd_cycle); +bool check_for_cycles(const ov::Model* func, ngraph::NodeVector& cycle_nodes, bool& is_bkwd_cycle); } // namespace ngraph using ngraph::replace_node; diff --git a/src/core/include/ngraph/ngraph.hpp b/src/core/include/ngraph/ngraph.hpp index 163094d3284..0ecb7b1e529 100644 --- a/src/core/include/ngraph/ngraph.hpp +++ b/src/core/include/ngraph/ngraph.hpp @@ -51,7 +51,6 @@ #include "ngraph/evaluator.hpp" #include "ngraph/except.hpp" #include "ngraph/factory.hpp" -#include "ngraph/function.hpp" #include "ngraph/node.hpp" #include "ngraph/partial_shape.hpp" #include "ngraph/rt_info.hpp" diff --git a/src/core/include/ngraph/specialize_function.hpp b/src/core/include/ngraph/specialize_function.hpp index 96a92683e79..67c3c0636ff 100644 --- a/src/core/include/ngraph/specialize_function.hpp +++ b/src/core/include/ngraph/specialize_function.hpp @@ -14,11 +14,17 @@ # endif #endif -#include "ngraph/function.hpp" +#include + +#include "ngraph/deprecated.hpp" +#include "ngraph/ngraph_visibility.hpp" +#include "openvino/core/model.hpp" +#include "openvino/core/shape.hpp" +#include "openvino/core/type.hpp" namespace ngraph { /// \brief Creates a "specialized" clone of a function. The partial shapes and element types of -/// the function's parameters may be narrowed to more specific shapes and element types, +/// the function's parameters may be narrowed to more specific shapes and element type /// and constant values may optionally be substituted for any or all of the parameters. /// \param f The function to be cloned. /// \param parameter_element_types The new parameter element types to substitute. Length must @@ -101,8 +107,8 @@ namespace ngraph { /// NGRAPH_API_DEPRECATED NGRAPH_API -std::shared_ptr specialize_function(std::shared_ptr f, - const std::vector& parameter_element_types, - const std::vector& parameter_shapes, - const std::vector& parameter_values); +std::shared_ptr specialize_function(std::shared_ptr f, + const std::vector& parameter_element_types, + const std::vector& parameter_shapes, + const std::vector& parameter_values); } // namespace ngraph diff --git a/src/core/src/graph_util.cpp b/src/core/src/graph_util.cpp index 7c90647c3de..3766bd2edb8 100644 --- a/src/core/src/graph_util.cpp +++ b/src/core/src/graph_util.cpp @@ -520,8 +520,8 @@ std::pair, std::shared_ptr par_node = - std::make_shared(src_node->get_output_element_type(0), src_node->get_output_shape(0)); + std::shared_ptr par_node = + std::make_shared(src_node->get_output_element_type(0), src_node->get_output_shape(0)); // Fix input / output among src, dst and par std::vector> dst_inputs = get_inputs_from(*src_node, *dst_node); @@ -720,7 +720,7 @@ bool is_valid_rank(const std::shared_ptr& node, std::vector valid_ return false; } -void plot_graph(std::shared_ptr f, +void plot_graph(std::shared_ptr f, const std::string& filename, std::function& attributes)> attributes) { ov::pass::Manager pass_manager; diff --git a/src/core/src/specialize_function.cpp b/src/core/src/specialize_function.cpp index 58df4818bbc..7dfb5c9081b 100644 --- a/src/core/src/specialize_function.cpp +++ b/src/core/src/specialize_function.cpp @@ -7,16 +7,17 @@ #include "itt.hpp" #include "ngraph/op/util/op_types.hpp" #include "openvino/op/constant.hpp" +#include "openvino/op/parameter.hpp" using namespace ngraph; NGRAPH_SUPPRESS_DEPRECATED_START; using ov::op::v0::Constant; -std::shared_ptr ngraph::specialize_function(std::shared_ptr f, - const std::vector& parameter_element_types, - const std::vector& parameter_shapes, - const std::vector& parameter_values) +std::shared_ptr ngraph::specialize_function(std::shared_ptr f, + const std::vector& parameter_element_types, + const std::vector& parameter_shapes, + const std::vector& parameter_values) { OV_ITT_SCOPED_TASK(ov::itt::domains::core, "specialize_function"); @@ -38,7 +39,7 @@ std::shared_ptr ngraph::specialize_function(std::shared_ptr parameter_values[i]); } else { m[f->get_parameters()[i].get()] = - std::make_shared(parameter_element_types[i], parameter_shapes[i]); + std::make_shared(parameter_element_types[i], parameter_shapes[i]); } auto rt_info = f->get_parameters()[i]->get_rt_info(); m[f->get_parameters()[i].get()]->get_rt_info() = rt_info; @@ -70,16 +71,17 @@ std::shared_ptr ngraph::specialize_function(std::shared_ptr m[old_node.get()]->set_friendly_name(old_node->get_friendly_name()); } - ParameterVector new_parameters = f->get_parameters(); + ov::ParameterVector new_parameters = f->get_parameters(); for (size_t i = 0; i < new_parameters.size(); i++) { auto name = new_parameters[i]->get_friendly_name(); - new_parameters[i] = ov::as_type_ptr(m[new_parameters[i].get()]); + new_parameters[i] = ov::as_type_ptr(m[new_parameters[i].get()]); // If the replacement for a Parameter is not itself a Parameter, we must have replaced it // with a constant. We will insert a dead Parameter into the clone's parameters, in order // to maintain the arity of the original function. if (new_parameters[i] == nullptr) { - new_parameters[i] = std::make_shared(parameter_element_types[i], parameter_shapes[i]); + new_parameters[i] = + std::make_shared(parameter_element_types[i], parameter_shapes[i]); } new_parameters[i]->set_friendly_name(name); } @@ -95,5 +97,5 @@ std::shared_ptr ngraph::specialize_function(std::shared_ptr new_sinks[i] = std::static_pointer_cast(m[new_sinks[i].get()]); } - return std::make_shared(new_results, new_sinks, new_parameters); + return std::make_shared(new_results, new_sinks, new_parameters); } diff --git a/src/core/tests/specialize_function.cpp b/src/core/tests/specialize_function.cpp index 1092162dbb1..efb354e7e48 100644 --- a/src/core/tests/specialize_function.cpp +++ b/src/core/tests/specialize_function.cpp @@ -27,7 +27,7 @@ TEST(specialize_function, et_shape_static) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -48,7 +48,7 @@ TEST(specialize_function, et_dynamic_shape_static) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -69,7 +69,7 @@ TEST(specialize_function, et_static_shape_rank_dynamic) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -90,7 +90,7 @@ TEST(specialize_function, et_static_shape_rank_static_dynamic) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -111,7 +111,7 @@ TEST(specialize_function, et_static_shape_rank_static_dynamic_subst_val) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector p1_subst_vals{5, 0, 3, 8, 5, 8}; @@ -147,7 +147,7 @@ TEST(specialize_function, et_static_shape_rank_dynamic_validation_fails) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -171,7 +171,7 @@ TEST(specialize_function, et_dynamic_shape_static_validation_fails) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -198,7 +198,7 @@ TEST(specialize_function, et_static_shape_rank_static_dynamic_rank_mismatch) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -225,7 +225,7 @@ TEST(specialize_function, et_static_shape_rank_static_dynamic_dim_mismatch) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -247,7 +247,7 @@ TEST(specialize_function, et_count_wrong) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -269,7 +269,7 @@ TEST(specialize_function, shape_count_wrong) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr}; @@ -291,7 +291,7 @@ TEST(specialize_function, value_count_wrong) { auto k = std::make_shared(p1, element::f32); auto a = std::make_shared(p0, k); - auto f = std::make_shared(a, ParameterVector{p0, p1}); + auto f = std::make_shared(a, ov::ParameterVector{p0, p1}); std::vector param_vals{nullptr, nullptr, nullptr}; diff --git a/src/frontends/onnx/frontend/include/onnx_import/onnx.hpp b/src/frontends/onnx/frontend/include/onnx_import/onnx.hpp index f56f06adce4..4dbe99de0c0 100644 --- a/src/frontends/onnx/frontend/include/onnx_import/onnx.hpp +++ b/src/frontends/onnx/frontend/include/onnx_import/onnx.hpp @@ -21,8 +21,8 @@ #include #include "ngraph/deprecated.hpp" -#include "ngraph/function.hpp" #include "onnx_importer_visibility.hpp" +#include "openvino/core/model.hpp" /// \brief Top level nGraph namespace. namespace ngraph { @@ -64,9 +64,9 @@ NGRAPH_API_DEPRECATED ONNX_IMPORTER_API bool is_operator_supported(const std::st /// \param[in] enable_mmap Enable mapping files with external weights instead of reading. /// /// \return An nGraph function that represents a single output from the created graph. -NGRAPH_API_DEPRECATED ONNX_IMPORTER_API std::shared_ptr import_onnx_model(std::istream& stream, - const std::string& model_path = "", - bool enable_mmap = false); +NGRAPH_API_DEPRECATED ONNX_IMPORTER_API std::shared_ptr import_onnx_model(std::istream& stream, + const std::string& model_path = "", + bool enable_mmap = false); /// \brief Imports and converts an ONNX model from the input file /// to an nGraph Function representation. @@ -79,8 +79,8 @@ NGRAPH_API_DEPRECATED ONNX_IMPORTER_API std::shared_ptr import_onnx_mo /// \param[in] enable_mmap Enable mapping files with external weights instead of reading. /// /// \return An nGraph function that represents a single output from the created graph. -NGRAPH_API_DEPRECATED ONNX_IMPORTER_API std::shared_ptr import_onnx_model(const std::string& file_path, - bool enable_mmap = false); +NGRAPH_API_DEPRECATED ONNX_IMPORTER_API std::shared_ptr import_onnx_model(const std::string& file_path, + bool enable_mmap = false); } // namespace onnx_import } // namespace ngraph diff --git a/src/frontends/onnx/frontend/src/core/graph.hpp b/src/frontends/onnx/frontend/src/core/graph.hpp index 058887ccb09..6754e455f8e 100644 --- a/src/frontends/onnx/frontend/src/core/graph.hpp +++ b/src/frontends/onnx/frontend/src/core/graph.hpp @@ -46,7 +46,7 @@ public: detail::MappedMemoryHandles get_mmap_cache() const { return m_mmap_cache; } - const ParameterVector& get_ng_parameters() const { + const ov::ParameterVector& get_ng_parameters() const { return m_parameters; } virtual bool is_ov_node_in_cache(const std::string& name) const; @@ -82,7 +82,7 @@ protected: void set_metadata(std::shared_ptr& model) const; std::shared_ptr create_model(); - ParameterVector m_parameters; + ov::ParameterVector m_parameters; std::unique_ptr m_model; std::unique_ptr m_cache; ov::frontend::ExtensionHolder m_extensions = {}; diff --git a/src/frontends/onnx/frontend/src/core/value_info.hpp b/src/frontends/onnx/frontend/src/core/value_info.hpp index 567325dd13e..1ef671476f7 100644 --- a/src/frontends/onnx/frontend/src/core/value_info.hpp +++ b/src/frontends/onnx/frontend/src/core/value_info.hpp @@ -51,7 +51,7 @@ public: return ov::element::dynamic; } - std::shared_ptr get_ov_node(ParameterVector& parameters, + std::shared_ptr get_ov_node(ov::ParameterVector& parameters, const std::map& initializers) const { const auto it = initializers.find(get_name()); if (it != std::end(initializers)) { diff --git a/src/frontends/onnx/frontend/src/onnx.cpp b/src/frontends/onnx/frontend/src/onnx.cpp index 3ad2995f70b..73601660806 100644 --- a/src/frontends/onnx/frontend/src/onnx.cpp +++ b/src/frontends/onnx/frontend/src/onnx.cpp @@ -25,9 +25,9 @@ const auto legacy_conversion_extension = std::make_shared import_onnx_model(std::istream& stream, - const std::string& model_path, - const bool enable_mmap) { +std::shared_ptr import_onnx_model(std::istream& stream, + const std::string& model_path, + const bool enable_mmap) { const auto model_proto = std::make_shared(parse_from_istream(stream)); ov::frontend::ExtensionHolder extensions; extensions.conversions.push_back(legacy_conversion_extension); @@ -43,7 +43,7 @@ std::shared_ptr import_onnx_model(std::istream& stream, return model; } -std::shared_ptr import_onnx_model(const std::string& file_path, const bool enable_mmap) { +std::shared_ptr import_onnx_model(const std::string& file_path, const bool enable_mmap) { std::ifstream model_stream{file_path, std::ios::in | std::ios::binary}; if (!model_stream.is_open()) { diff --git a/src/frontends/onnx/frontend/src/op/if.cpp b/src/frontends/onnx/frontend/src/op/if.cpp index 5405ac88c18..e1853329b9d 100644 --- a/src/frontends/onnx/frontend/src/op/if.cpp +++ b/src/frontends/onnx/frontend/src/op/if.cpp @@ -24,12 +24,12 @@ OutputVector if_op(const Node& node) { auto then_subgraph = subgraphs.at("then_branch"); const auto& then_params = then_subgraph->get_ng_parameters(); auto then_branch = - std::make_shared(then_subgraph->get_ov_outputs(), then_params, then_subgraph->get_name()); + std::make_shared(then_subgraph->get_ov_outputs(), then_params, then_subgraph->get_name()); FRONT_END_GENERAL_CHECK(subgraphs.count("else_branch") == 1, "Missing 'else_branch' attribute"); auto else_subgraph = subgraphs.at("else_branch"); const auto& else_params = else_subgraph->get_ng_parameters(); auto else_branch = - std::make_shared(else_subgraph->get_ov_outputs(), else_params, else_subgraph->get_name()); + std::make_shared(else_subgraph->get_ov_outputs(), else_params, else_subgraph->get_name()); auto if_node = std::make_shared(ng_inputs.at(0)); if_node->set_then_body(then_branch); diff --git a/src/frontends/onnx/frontend/src/op/loop.cpp b/src/frontends/onnx/frontend/src/op/loop.cpp index 1da495e36d7..f7e28f799f3 100644 --- a/src/frontends/onnx/frontend/src/op/loop.cpp +++ b/src/frontends/onnx/frontend/src/op/loop.cpp @@ -120,7 +120,7 @@ OutputVector loop(const Node& node) { ") is not greater than number of outputs. Required at least: ", loop_carried_dependencies.size() + 1); - ParameterVector body_params(body_inputs.begin() + 2, body_inputs.end()); + ov::ParameterVector body_params(body_inputs.begin() + 2, body_inputs.end()); body_params.emplace(body_params.begin(), body_inputs[0]); // current iteration body input const auto body = std::make_shared(body_outputs, body_params); diff --git a/src/frontends/onnx/frontend/src/op/scan.cpp b/src/frontends/onnx/frontend/src/op/scan.cpp index 892eae9f604..a96ac710f4b 100644 --- a/src/frontends/onnx/frontend/src/op/scan.cpp +++ b/src/frontends/onnx/frontend/src/op/scan.cpp @@ -10,7 +10,6 @@ #include "core/graph.hpp" #include "default_opset.hpp" #include "exceptions.hpp" -#include "ngraph/function.hpp" #include "ngraph/op/util/op_types.hpp" #include "onnx_import/core/null_node.hpp" #include "openvino/core/validation_util.hpp" @@ -23,7 +22,7 @@ namespace op { namespace { OutputVector scan_to_tensor_iterator(const OutputVector& node_inputs, - ParameterVector& body_inputs, + ov::ParameterVector& body_inputs, OutputVector& body_outputs, int64_t num_scan_inputs, const std::vector& scan_input_axes, diff --git a/src/inference/src/cnn_network_ngraph_impl.cpp b/src/inference/src/cnn_network_ngraph_impl.cpp index 77ca185c251..7932ef947d6 100644 --- a/src/inference/src/cnn_network_ngraph_impl.cpp +++ b/src/inference/src/cnn_network_ngraph_impl.cpp @@ -35,7 +35,6 @@ using namespace std; using namespace InferenceEngine; using details::CNNNetworkNGraphImpl; using InferenceEngine::details::CNNNetworkNGraphImpl; -using ngraph::Function; void CNNNetworkNGraphImpl::createDataForResult(const ::ov::Output<::ngraph::Node>& output, const std::string& outName, @@ -124,7 +123,7 @@ ov::element::Type details::toLegacyType(const ov::element::Type& ngraph_type, bo return ngraph_type; } -CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(const std::shared_ptr& nGraph, bool newAPI) +CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(const std::shared_ptr& nGraph, bool newAPI) : _ngraph_function(nGraph), _new_api(newAPI) { { diff --git a/src/inference/src/dev/converter_utils.cpp b/src/inference/src/dev/converter_utils.cpp index 140c460f4e7..04c68ec0481 100644 --- a/src/inference/src/dev/converter_utils.cpp +++ b/src/inference/src/dev/converter_utils.cpp @@ -152,7 +152,7 @@ InferenceEngine::CNNNetwork ov::legacy_convert::convert_model(const std::shared_ std::shared_ptr ov::legacy_convert::convert_model(const InferenceEngine::CNNNetwork& network, bool is_new_api) { OPENVINO_ASSERT(network.getFunction(), - "CNNNetwork can be converted to OpenVINO Model only in case if it contains ngraph::Function"); + "CNNNetwork can be converted to OpenVINO Model only in case if it contains ov::Model"); if (is_new_api) return network.getFunction(); diff --git a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp index db09627e009..33c68ac5e1d 100644 --- a/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp +++ b/src/plugins/intel_gpu/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp @@ -15,7 +15,7 @@ auto configs = []() { return std::vector{{}}; }; -std::shared_ptr getFunction1() { +std::shared_ptr getFunction1() { const std::vector inputShape = {1, 4, 20, 20}; const ov::element::Type_t ngPrc = ov::element::Type_t::f32; @@ -26,7 +26,7 @@ std::shared_ptr getFunction1() { auto relu = std::make_shared(params[0]); relu->get_output_tensor(0).set_names({"relu"}); - return std::make_shared(relu, params, "SimpleActivation"); + return std::make_shared(relu, params, "SimpleActivation"); } INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_1, OVInferRequestDynamicTests, 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 ec5c4e15de8..4e82f5ec8c5 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 @@ -82,7 +82,7 @@ void TopKLayerTestGPU::SetUp() { for (size_t i = 0; i < topk->get_output_size(); i++) { results.push_back(std::make_shared(topk->output(i))); } - function = std::make_shared(results, params, "TopK"); + function = std::make_shared(results, params, "TopK"); } InferenceEngine::Blob::Ptr TopKLayerTestGPU::GenerateInput(const InferenceEngine::InputInfo& info) const { 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 d0d96572bfe..bd4b461e49a 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 @@ -689,7 +689,7 @@ void LayerTestsCommon::SetRefMode(RefMode mode) { refMode = mode; } -std::shared_ptr LayerTestsCommon::GetFunction() { +std::shared_ptr LayerTestsCommon::GetFunction() { return function; } diff --git a/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp b/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp index b9c6c7a50e6..cc9621e27cd 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/matrix_nms.cpp @@ -321,7 +321,7 @@ void MatrixNmsLayerTest::SetUp() { } auto nms = std::make_shared(params[0], params[1], m_attrs); - function = std::make_shared(nms, params, "MatrixNMS"); + function = std::make_shared(nms, params, "MatrixNMS"); } } // namespace subgraph 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 54ada7058d8..057bfff91bb 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 @@ -162,7 +162,7 @@ void MemoryTest::CreateTIFunc() { auto add = std::make_shared(X, Y); auto res = std::make_shared(add); auto Iter_res = std::make_shared(Iter); - auto body = std::make_shared(OutputVector{res, Iter_res}, ParameterVector{X, Y, Iter}); + auto body = std::make_shared(OutputVector{res, Iter_res}, ov::ParameterVector{X, Y, Iter}); // TI construction auto tensor_iterator = std::make_shared(); @@ -175,7 +175,7 @@ void MemoryTest::CreateTIFunc() { auto output = tensor_iterator->get_iter_value(res, -1); auto output_iter = tensor_iterator->get_concatenated_slices(Iter_res, 0, 1, 1, -1, 0); function = - std::make_shared(OutputVector{output, output_iter}, ParameterVector{param, iter_count}, "PureTI"); + std::make_shared(OutputVector{output, output_iter}, ov::ParameterVector{param, iter_count}, "PureTI"); } void MemoryTest::CreateCommonFunc() { @@ -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(ResultVector{res}, ov::SinkVector{assign}, param, "TestMemory"); } void MemoryTest::ApplyLowLatency() { diff --git a/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp b/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp index 4dd424f59ef..b26258f22d1 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/multiclass_nms.cpp @@ -397,7 +397,7 @@ void MulticlassNmsLayerTest::SetUp() { nms = std::make_shared(params[0], params[1], m_attrs); } - function = std::make_shared(nms, params, "MulticlassNMS"); + function = std::make_shared(nms, params, "MulticlassNMS"); } } // namespace subgraph diff --git a/src/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp b/src/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp index c9bafbd21d1..cb99ead2e1f 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/non_max_suppression.cpp @@ -313,7 +313,7 @@ void NmsLayerTest::SetUp() { auto ngPrc = convertIE2nGraphPrc(paramsPrec); ov::ParameterVector params {std::make_shared(ngPrc, ov::Shape(boxesShape)), std::make_shared(ngPrc, ov::Shape(scoresShape))}; - auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); + auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); OPENVINO_SUPPRESS_DEPRECATED_START auto nms = builder::makeNms(paramOuts[0], @@ -330,7 +330,7 @@ void NmsLayerTest::SetUp() { OPENVINO_SUPPRESS_DEPRECATED_END if (targetDevice == ov::test::utils::DEVICE_CPU) { - function = std::make_shared(nms, params, "NMS"); + function = std::make_shared(nms, params, "NMS"); } else { auto nms_0_identity = std::make_shared(nms->output(0), ov::op::v0::Constant::create(outType, Shape{1}, {1})); @@ -342,7 +342,7 @@ void NmsLayerTest::SetUp() { nms_1_identity->set_friendly_name("Multiply_1"); nms_2_identity->set_friendly_name("Multiply_2"); function = - std::make_shared(OutputVector{nms_0_identity, nms_1_identity, nms_2_identity}, params, "NMS"); + std::make_shared(OutputVector{nms_0_identity, nms_1_identity, nms_2_identity}, params, "NMS"); } } @@ -374,7 +374,7 @@ void Nms9LayerTest::SetUp() { auto ngPrc = convertIE2nGraphPrc(paramsPrec); ov::ParameterVector params {std::make_shared(ngPrc, ov::Shape(boxesShape)), std::make_shared(ngPrc, ov::Shape(scoresShape))}; - auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); + auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes(params)); OPENVINO_SUPPRESS_DEPRECATED_START auto nms = builder::makeNms(paramOuts[0], @@ -391,7 +391,7 @@ void Nms9LayerTest::SetUp() { ngraph::builder::NmsVersion::NmsVersion9); OPENVINO_SUPPRESS_DEPRECATED_END - function = std::make_shared(nms, params, "NMS"); + function = std::make_shared(nms, params, "NMS"); } } // namespace LayerTestsDefinitions 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 c965dd69515..3400fbf9681 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 @@ -79,7 +79,7 @@ void RandomUniformLayerTest::SetUp() { op_seed); ngraph::ResultVector results{std::make_shared(random_uniform)}; - function = std::make_shared(results, ngraph::ParameterVector{input}, "random_uniform"); + function = std::make_shared(results, ngraph::ParameterVector{input}, "random_uniform"); } void RandomUniformLayerTest::ConvertRefsParams() {