diff --git a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp index b0c8aa009d21d9..ad8437d9d40c55 100644 --- a/src/common/transformations/tests/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/tests/common_optimizations/nop_elimination.cpp @@ -354,7 +354,7 @@ TEST(nop_elimination, reshape_elimination_v1_check_consumer_count) { TEST(nop_elimination, concat_elimination_single_node) { int64_t a = 0; auto A = make_shared(element::f32, Shape{2, 3}); - auto f = make_shared(make_shared(NodeVector{A}, a), ParameterVector{A}); + auto f = make_shared(make_shared(OutputVector{A}, a), ParameterVector{A}); pass::Manager pass_manager; pass_manager.register_pass(); diff --git a/src/core/dev_api/openvino/runtime/itensor.hpp b/src/core/dev_api/openvino/runtime/itensor.hpp index 6fb05d20fb9711..f57c3259cbfa7e 100644 --- a/src/core/dev_api/openvino/runtime/itensor.hpp +++ b/src/core/dev_api/openvino/runtime/itensor.hpp @@ -10,7 +10,6 @@ #include "openvino/core/core_visibility.hpp" #include "openvino/core/shape.hpp" #include "openvino/core/type/element_type.hpp" -#include "openvino/runtime/allocator.hpp" namespace ov { diff --git a/src/core/include/openvino/core/model.hpp b/src/core/include/openvino/core/model.hpp index 88706e05bd8dc4..7032bf566e93f7 100644 --- a/src/core/include/openvino/core/model.hpp +++ b/src/core/include/openvino/core/model.hpp @@ -53,10 +53,6 @@ class OPENVINO_API Model : public std::enable_shared_from_this { public: OPENVINO_RTTI_BASE("Model") - OPENVINO_DEPRECATED("This constructor is deprecated and will be remove in 2026.0. Use Model(const " - "ov::OutputVector&, const ov::ParameterVector&, const std::string&) instead.") - Model(const ov::NodeVector& results, const ov::ParameterVector& parameters, const std::string& name = ""); - Model(const ov::OutputVector& results, const ov::ParameterVector& parameters, const std::string& name = ""); Model(const std::shared_ptr& result, const ov::ParameterVector& parameters, const std::string& name = ""); diff --git a/src/core/include/openvino/runtime/allocator.hpp b/src/core/include/openvino/runtime/allocator.hpp index 14e31395a1beeb..33a1315da6c060 100644 --- a/src/core/include/openvino/runtime/allocator.hpp +++ b/src/core/include/openvino/runtime/allocator.hpp @@ -135,17 +135,6 @@ class OPENVINO_API Allocator { bool> = true> Allocator(A&& a) : _impl{std::make_shared>>(std::forward(a))} {} - template , Allocator> && - !std::is_abstract_v> && - !std::is_convertible_v, std::shared_ptr> && - !has_noexcept_deallocate_v, - bool> = true> - OPENVINO_DEPRECATED("Please annotate your allocator's deallocate method with noexcept. This method will be " - "removed in 2026.0.0 release") - Allocator(A&& a) - : _impl{std::make_shared>>(std::forward(a))} {} - /** * @brief Allocates memory * diff --git a/src/core/src/model.cpp b/src/core/src/model.cpp index 25e9ba6db59d99..45d1f098495c95 100644 --- a/src/core/src/model.cpp +++ b/src/core/src/model.cpp @@ -133,9 +133,6 @@ ov::Model::Model(const ResultVector& results, const ov::ParameterVector& paramet ov::Model::Model(const OutputVector& results, const ov::ParameterVector& parameters, const std::string& name) : Model(as_result_vector(results), parameters, name) {} -ov::Model::Model(const NodeVector& results, const ov::ParameterVector& parameters, const std::string& name) - : Model(as_output_vector(results), parameters, name) {} - ov::Model::Model(const std::shared_ptr& result, const ov::ParameterVector& parameters, const std::string& name) : Model(verify_node(result)->outputs(), parameters, name) {} diff --git a/src/core/src/op/util/variable_value.cpp b/src/core/src/op/util/variable_value.cpp index 76d28337e664e3..893f3513a8a2eb 100644 --- a/src/core/src/op/util/variable_value.cpp +++ b/src/core/src/op/util/variable_value.cpp @@ -8,7 +8,6 @@ #include "openvino/core/shape.hpp" #include "openvino/core/shape_util.hpp" -#include "openvino/runtime/allocator.hpp" #include "openvino/runtime/itensor.hpp" #include "openvino/runtime/tensor.hpp" diff --git a/src/core/src/runtime/itensor.cpp b/src/core/src/runtime/itensor.cpp index bf67835f38bbe9..23fc19717a52a4 100644 --- a/src/core/src/runtime/itensor.cpp +++ b/src/core/src/runtime/itensor.cpp @@ -10,7 +10,6 @@ #include "openvino/core/except.hpp" #include "openvino/core/memory_util.hpp" #include "openvino/core/shape_util.hpp" -#include "openvino/runtime/allocator.hpp" #include "openvino/runtime/iremote_tensor.hpp" #include "openvino/runtime/make_tensor.hpp" #include "openvino/runtime/properties.hpp" diff --git a/src/inference/dev_api/openvino/runtime/make_tensor.hpp b/src/inference/dev_api/openvino/runtime/make_tensor.hpp index 10d5de93f43eb0..c7026c3be7af95 100644 --- a/src/inference/dev_api/openvino/runtime/make_tensor.hpp +++ b/src/inference/dev_api/openvino/runtime/make_tensor.hpp @@ -12,6 +12,7 @@ #include "openvino/runtime/common.hpp" #include "openvino/runtime/itensor.hpp" #include "openvino/runtime/so_ptr.hpp" +#include "openvino/runtime/allocator.hpp" namespace ov { diff --git a/src/plugins/intel_cpu/tests/unit/transformations/arm/deconv_1d_decomposition.cpp b/src/plugins/intel_cpu/tests/unit/transformations/arm/deconv_1d_decomposition.cpp index 38ae6a5ad14c68..1366c216a3154f 100644 --- a/src/plugins/intel_cpu/tests/unit/transformations/arm/deconv_1d_decomposition.cpp +++ b/src/plugins/intel_cpu/tests/unit/transformations/arm/deconv_1d_decomposition.cpp @@ -210,7 +210,7 @@ class DeconvDecomposition1DTest : public TransformationTestsF, public ::testing: auto output_3d_shape = ov::op::util::make_try_fold(conv_shape, zero_1d, three_1d, one_const); auto output_3d = std::make_shared(conv, output_3d_shape, false); - return std::make_shared(ov::NodeVector{output_3d}, ov::ParameterVector{input_e}); + return std::make_shared(ov::OutputVector{output_3d}, ov::ParameterVector{input_e}); } protected: @@ -261,7 +261,7 @@ class DeconvDecomposition1DTest : public TransformationTestsF, public ::testing: p.pad_type); } - model = std::make_shared(ov::NodeVector{deconv}, ov::ParameterVector{input}); + model = std::make_shared(ov::OutputVector{deconv}, ov::ParameterVector{input}); if (p.expect_transformation && rank == 3) { model_ref = buildExpectedModel(p); diff --git a/src/plugins/intel_gpu/tests/common/subgraphs_builders.hpp b/src/plugins/intel_gpu/tests/common/subgraphs_builders.hpp index fa32d45c507b23..0061b1408b154b 100644 --- a/src/plugins/intel_gpu/tests/common/subgraphs_builders.hpp +++ b/src/plugins/intel_gpu/tests/common/subgraphs_builders.hpp @@ -55,7 +55,7 @@ inline std::shared_ptr makeLBRGRUSequence(ov::element::Type_t model_t Y_out->set_friendly_name("Y_out"); Ho->set_friendly_name("Ho"); - auto fn_ptr = std::make_shared(ov::NodeVector{Y_out, Ho}, ov::ParameterVector{X, Y}); + auto fn_ptr = std::make_shared(ov::OutputVector{Y_out, Ho}, ov::ParameterVector{X, Y}); fn_ptr->set_friendly_name("GRUSequence"); return fn_ptr; } diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/transpose_matmul_fusion.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/transpose_matmul_fusion.cpp index da464774922027..8aefdaee9a6f4c 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/transpose_matmul_fusion.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/transpose_matmul_fusion.cpp @@ -38,7 +38,7 @@ class TransposeMatmulFuseTest : public ::testing::Test, public testing::WithPara auto matmul = std::make_shared(transpose_a, input_b, false, false); - auto model = std::make_shared(ov::NodeVector{matmul}, ov::ParameterVector{input_a, input_b}); + auto model = std::make_shared(ov::OutputVector{matmul}, ov::ParameterVector{input_a, input_b}); return model; } @@ -125,7 +125,7 @@ class TransposeMatmulTransposeFuse3DTest : public ::testing::Test, public testin auto transpose_order_c = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{target_transpose_order_c.size()}, target_transpose_order_c); auto transpose_c = std::make_shared(matmul, transpose_order_c); - auto model = std::make_shared(ov::NodeVector{transpose_c}, ov::ParameterVector{input_a, input_b}); + auto model = std::make_shared(ov::OutputVector{transpose_c}, ov::ParameterVector{input_a, input_b}); return model; } diff --git a/src/plugins/intel_gpu/tests/unit/transformations/disable_fp16_compression_rms_test.cpp b/src/plugins/intel_gpu/tests/unit/transformations/disable_fp16_compression_rms_test.cpp index ac974c1be2bdfa..05d72d1e0f50bc 100644 --- a/src/plugins/intel_gpu/tests/unit/transformations/disable_fp16_compression_rms_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/transformations/disable_fp16_compression_rms_test.cpp @@ -47,7 +47,7 @@ static std::shared_ptr create_model_to_match() { auto rms_m = std::make_shared(add_1_m, rms_const_2, 1e-5); rms_m->set_friendly_name(name_rms_2); - return std::make_shared(ov::NodeVector{rms_m}, ov::ParameterVector{input1, input2, input3}); + return std::make_shared(ov::OutputVector{rms_m}, ov::ParameterVector{input1, input2, input3}); } // This model has a similar structure but doesn't match the specific pattern. @@ -64,7 +64,7 @@ static std::shared_ptr create_model_not_to_match() { auto rms_2 = std::make_shared(some_other_op, rms_const_2, 1e-5); rms_2->set_friendly_name(name_rms_2); - return std::make_shared(ov::NodeVector{rms_2}, ov::ParameterVector{input1}); + return std::make_shared(ov::OutputVector{rms_2}, ov::ParameterVector{input1}); } static void run_test(std::shared_ptr model, diff --git a/src/plugins/intel_gpu/tests/unit/transformations/transpose_matmul_fusion_test.cpp b/src/plugins/intel_gpu/tests/unit/transformations/transpose_matmul_fusion_test.cpp index 991c8fcf62631d..d4ab7a07cf3ba7 100644 --- a/src/plugins/intel_gpu/tests/unit/transformations/transpose_matmul_fusion_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/transformations/transpose_matmul_fusion_test.cpp @@ -219,7 +219,7 @@ TEST_F(TransformationTestsF, TransposeMatmulFusion8) { auto matmul = std::make_shared(transpose_a, input_b); - model = std::make_shared(ov::NodeVector{matmul}, ov::ParameterVector{input_a, input_b}); + model = std::make_shared(ov::OutputVector{matmul}, ov::ParameterVector{input_a, input_b}); manager.register_pass(); model_ref = model->clone(); @@ -238,7 +238,7 @@ TEST_F(TransformationTestsF, TransposeMatmulFusion9) { auto matmul = std::make_shared(transpose_a, input_b); - model = std::make_shared(ov::NodeVector{matmul}, ov::ParameterVector{input_a, input_b}); + model = std::make_shared(ov::OutputVector{matmul}, ov::ParameterVector{input_a, input_b}); bool support_immad = false; manager.register_pass(support_immad); diff --git a/src/plugins/intel_gpu/tests/unit/transformations/transpose_vlsdpa_fusion_test.cpp b/src/plugins/intel_gpu/tests/unit/transformations/transpose_vlsdpa_fusion_test.cpp index f1be05178bb16f..5a4e34e12e9813 100644 --- a/src/plugins/intel_gpu/tests/unit/transformations/transpose_vlsdpa_fusion_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/transformations/transpose_vlsdpa_fusion_test.cpp @@ -56,7 +56,7 @@ std::shared_ptr build_model() { auto transpose_o = std::make_shared(vlsdpa, Constant::create(element::i64, Shape{3}, {1,0,2})); transpose_o->set_friendly_name("transpose_o"); - return std::make_shared(NodeVector{transpose_o}, ParameterVector{q, k, v, cuseq_mask}); + return std::make_shared(OutputVector{transpose_o}, ParameterVector{q, k, v, cuseq_mask}); } std::shared_ptr build_target_model() { @@ -77,7 +77,7 @@ std::shared_ptr build_target_model() { v, cuseq_mask}); - return std::make_shared(NodeVector{vlsdpa}, ParameterVector{q, k, v, cuseq_mask}); + return std::make_shared(OutputVector{vlsdpa}, ParameterVector{q, k, v, cuseq_mask}); } }; // namespace diff --git a/src/plugins/template/tests/functional/op_reference/atanh.cpp b/src/plugins/template/tests/functional/op_reference/atanh.cpp index b7bcf94432c6a8..2650e4f8be4681 100644 --- a/src/plugins/template/tests/functional/op_reference/atanh.cpp +++ b/src/plugins/template/tests/functional/op_reference/atanh.cpp @@ -9,7 +9,6 @@ #include #include "base_reference_test.hpp" -#include "openvino/runtime/allocator.hpp" using namespace ov; diff --git a/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp b/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp index cacffcae733830..1c5459ac0517cc 100644 --- a/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp +++ b/src/plugins/template/tests/functional/op_reference/base_reference_test.cpp @@ -10,7 +10,6 @@ #include "common_test_utils/ov_tensor_utils.hpp" #include "functional_test_utils/skip_tests_config.hpp" #include "openvino/core/type/element_type.hpp" -#include "openvino/runtime/allocator.hpp" #include "openvino/runtime/tensor.hpp" #include "transformations/utils/utils.hpp" diff --git a/src/plugins/template/tests/functional/op_reference/base_reference_test.hpp b/src/plugins/template/tests/functional/op_reference/base_reference_test.hpp index 0ecb3ab7a95b45..56fc8dc0f99570 100644 --- a/src/plugins/template/tests/functional/op_reference/base_reference_test.hpp +++ b/src/plugins/template/tests/functional/op_reference/base_reference_test.hpp @@ -7,7 +7,6 @@ #include "openvino/core/shape.hpp" #include "openvino/core/type/element_type.hpp" #include "openvino/core/type/element_type_traits.hpp" -#include "openvino/runtime/allocator.hpp" #include "openvino/runtime/core.hpp" #include "openvino/runtime/tensor.hpp"