diff --git a/src/plugins/intel_npu/tests/functional/behavior/fail_gracefully_forward_compatibility.hpp b/src/plugins/intel_npu/tests/functional/behavior/fail_gracefully_forward_compatibility.hpp index 5b56a5788b6..196844cd983 100644 --- a/src/plugins/intel_npu/tests/functional/behavior/fail_gracefully_forward_compatibility.hpp +++ b/src/plugins/intel_npu/tests/functional/behavior/fail_gracefully_forward_compatibility.hpp @@ -106,7 +106,7 @@ private: const ov::element::Type precision = ov::element::f32; ov::ParameterVector params{std::make_shared(precision, ov::Shape{input_shape})}; - auto constant = ov::test::utils::deprecated::make_constant(precision, {4096, 1024}, std::vector{}, true); + auto constant = ov::test::utils::make_constant(precision, ov::Shape{4096, 1024}); auto custom_op = std::make_shared(constant); ov::NodeVector results{custom_op}; diff --git a/src/plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/query_network.cpp b/src/plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/query_network.cpp index 2f79791b9d3..ee2db20d54b 100644 --- a/src/plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/query_network.cpp +++ b/src/plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/query_network.cpp @@ -51,7 +51,7 @@ std::shared_ptr createModelWithUnknownNode() { const ov::Shape input_shape = {1, 4096}; const ov::element::Type precision = ov::element::f32; ov::ParameterVector params = {std::make_shared(precision, ov::Shape{input_shape})}; - auto constant = ov::test::utils::deprecated::make_constant(precision, {4096, 1024}, std::vector{}, true); + auto constant = ov::test::utils::make_constant(precision, ov::Shape{4096, 1024}); auto custom_op = std::make_shared(constant); ov::NodeVector results{custom_op}; diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/node_builders/constant.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/node_builders/constant.hpp index 50446bf6bbb..7fe4f4cc1a5 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/node_builders/constant.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/node_builders/constant.hpp @@ -11,65 +11,6 @@ namespace ov { namespace test { namespace utils { - -namespace deprecated { -// Legacy implementation -// Remove after transition to new one -template -std::shared_ptr make_constant(const ov::element::Type& type, - const std::vector& shape, - const std::vector& data, - bool random = false, - T up_to = 10, - T start_from = 1, - const int seed = 1) { -#define makeNode(TYPE) \ - case TYPE: \ - if (random) { \ - return std::make_shared( \ - type, \ - shape, \ - generateVector(ov::shape_size(shape), \ - ov::element_type_traits::value_type(up_to), \ - ov::element_type_traits::value_type(start_from), \ - seed)); \ - } else { \ - if (std::is_same>::value) { \ - return std::make_shared(type, shape, data); \ - } else { \ - /* Convert std::vector data to required type */ \ - std::vector> converted_data(data.size()); \ - std::transform(data.cbegin(), data.cend(), converted_data.begin(), [](T e) { \ - return static_cast>(e); \ - }); \ - return std::make_shared(type, shape, converted_data); \ - } \ - } \ - break; - switch (type) { - makeNode(ov::element::bf16); - makeNode(ov::element::f16); - makeNode(ov::element::f32); - makeNode(ov::element::f64); - makeNode(ov::element::i8); - makeNode(ov::element::i16); - makeNode(ov::element::i32); - makeNode(ov::element::i64); - makeNode(ov::element::u8); - makeNode(ov::element::u16); - makeNode(ov::element::u32); - makeNode(ov::element::u64); - makeNode(ov::element::boolean); - makeNode(ov::element::nf4); - makeNode(ov::element::u4); - makeNode(ov::element::i4); - default: - throw std::runtime_error("Unhandled precision"); - } -#undef makeNode -} -} // namespace deprecated - std::shared_ptr make_constant(const ov::element::Type& type, const ov::Shape& shape, InputGenerateData in_data = InputGenerateData(1, 9, 1000, 1));