diff --git a/src/common/transformations/include/transformations/utils/utils.hpp b/src/common/transformations/include/transformations/utils/utils.hpp index 6bcc50e29b3733..5543dd234ff2b3 100644 --- a/src/common/transformations/include/transformations/utils/utils.hpp +++ b/src/common/transformations/include/transformations/utils/utils.hpp @@ -62,37 +62,6 @@ inline bool has_decompression_converts(const std::shared_ptr& f return false; } -OPENVINO_DEPRECATED("Plugins should use ov::ISyncInferRequest::find_port") -inline std::string create_ie_output_name(const Output& output) { - const auto& prev_layer = output.get_node_shared_ptr(); - auto out_name = prev_layer->get_friendly_name(); - if (prev_layer->get_output_size() != 1) { - out_name += "." + std::to_string(output.get_index()); - } - return out_name; -} - -OPENVINO_DEPRECATED("Plugins should use ov::ISyncInferRequest::find_port") -inline std::string create_ie_output_name(const Output& output) { - OPENVINO_SUPPRESS_DEPRECATED_START - return create_ie_output_name(ov::Output(output.get_node(), output.get_index())); - OPENVINO_SUPPRESS_DEPRECATED_END -} - -OPENVINO_DEPRECATED("Plugins should use ov::ISyncInferRequest::find_port") -inline std::string get_ie_output_name(const Output& output) { - OPENVINO_SUPPRESS_DEPRECATED_START - return create_ie_output_name(output); - OPENVINO_SUPPRESS_DEPRECATED_END -} - -OPENVINO_DEPRECATED("Plugins should use ov::ISyncInferRequest::find_port") -inline std::string get_ie_output_name(const Output& output) { - OPENVINO_SUPPRESS_DEPRECATED_START - return get_ie_output_name(ov::Output(output.get_node(), output.get_index())); - OPENVINO_SUPPRESS_DEPRECATED_END -} - /** * \brief Convert epsilon value from double to float type. * diff --git a/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp b/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp index 0e0865b3845f48..f53ca367fc6050 100644 --- a/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp +++ b/src/common/transformations/src/transformations/op_conversions/convert_maxpool_downgrade.cpp @@ -48,10 +48,6 @@ ov::pass::ConvertMaxPool8ToMaxPool1::ConvertMaxPool8ToMaxPool1() { maxpool_v8_node->get_rounding_type(), maxpool_v8_node->get_auto_pad()); - OPENVINO_SUPPRESS_DEPRECATED_START - auto out_name = ov::op::util::create_ie_output_name(maxpool_v8_node->output(0)); - OPENVINO_SUPPRESS_DEPRECATED_END - maxpool_v1_node->set_friendly_name(maxpool_v8_node->get_friendly_name()); maxpool_v8_node->output(0).replace(maxpool_v1_node->output(0)); ov::copy_runtime_info(maxpool_v8_node, maxpool_v1_node); 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 c4c31c1fc230bd..4c235889b1a45d 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 @@ -109,18 +109,22 @@ ov::pass::ConvertNMS9ToNMSIEInternal::ConvertNMS9ToNMSIEInternal() { Output output_0 = nms_legacy->output(0); if (nms_9->output(0).get_element_type() != output_0.get_element_type()) { output_0 = std::make_shared(output_0, nms_9->output(0).get_element_type()); - OPENVINO_SUPPRESS_DEPRECATED_START - output_0.get_node_shared_ptr()->set_friendly_name(op::util::create_ie_output_name(nms_9->output(0))); - OPENVINO_SUPPRESS_DEPRECATED_END + output_0.get_node_shared_ptr()->set_friendly_name( + nms_9->output(0).get_node_shared_ptr()->get_friendly_name() + + std::string(nms_9->output(0).get_node_shared_ptr()->get_output_size() != 1 + ? "." + std::to_string(output_0.get_index()) + : "")); new_ops.emplace_back(output_0.get_node_shared_ptr()); } Output output_2 = nms_legacy->output(2); if (nms_9->output(2).get_element_type() != output_2.get_element_type()) { output_2 = std::make_shared(output_2, nms_9->output(2).get_element_type()); - OPENVINO_SUPPRESS_DEPRECATED_START - output_2.get_node_shared_ptr()->set_friendly_name(op::util::create_ie_output_name(nms_9->output(2))); - OPENVINO_SUPPRESS_DEPRECATED_END + output_2.get_node_shared_ptr()->set_friendly_name( + nms_9->output(2).get_node_shared_ptr()->get_friendly_name() + + std::string(nms_9->output(2).get_node_shared_ptr()->get_output_size() != 1 + ? "." + std::to_string(output_2.get_index()) + : "")); new_ops.emplace_back(output_2.get_node_shared_ptr()); } diff --git a/src/inference/src/dev/icompiled_model.cpp b/src/inference/src/dev/icompiled_model.cpp index b1cbedac1632ab..25d3a5c28fadeb 100644 --- a/src/inference/src/dev/icompiled_model.cpp +++ b/src/inference/src/dev/icompiled_model.cpp @@ -77,9 +77,12 @@ ov::ICompiledModel::ICompiledModel(const std::shared_ptr& model for (const auto& result : model->get_results()) { auto fake_param = std::make_shared(result->get_output_element_type(0), result->get_output_partial_shape(0)); - OPENVINO_SUPPRESS_DEPRECATED_START - const std::string res_name = ov::op::util::create_ie_output_name(result->input_value(0)); - OPENVINO_SUPPRESS_DEPRECATED_END + auto prev_layer = result->input_value(0).get_node_shared_ptr(); + const std::string res_name = prev_layer->get_friendly_name() + + std::string(prev_layer->get_output_size() != 1 + ? "." + std::to_string(result->input_value(0).get_index()) + : ""); + fake_param->set_friendly_name(res_name); fake_param->set_element_type(result->get_element_type()); fake_param->validate_and_infer_types(); diff --git a/src/inference/src/model_reader.cpp b/src/inference/src/model_reader.cpp index aaf620ea0f803a..3b771f2100b07d 100644 --- a/src/inference/src/model_reader.cpp +++ b/src/inference/src/model_reader.cpp @@ -76,11 +76,11 @@ void update_v10_model(std::shared_ptr& model, bool frontendMode = fal // we need to add operation names as tensor names for inputs and outputs { for (const auto& result : model->get_results()) { - OPENVINO_SUPPRESS_DEPRECATED_START - // Note, upon removal of 'create_ie_output_name', just move it to this file as a local function - // we still need to add operation names as tensor names for outputs for IR v10 - auto res_name = ov::op::util::create_ie_output_name(result->input_value(0)); - OPENVINO_SUPPRESS_DEPRECATED_END + auto prev_layer = result->input_value(0).get_node_shared_ptr(); + const std::string res_name = prev_layer->get_friendly_name() + + std::string(prev_layer->get_output_size() != 1 + ? "." + std::to_string(result->input_value(0).get_index()) + : ""); OPENVINO_ASSERT(leaf_names.find(res_name) == leaf_names.end() || result->output(0).get_names().find(res_name) != result->output(0).get_names().end(), "Model operation names have collisions with tensor names.",