diff --git a/src/core/include/openvino/runtime/allocator.hpp b/src/core/include/openvino/runtime/allocator.hpp index a8721b72554306..f92be30a434d40 100644 --- a/src/core/include/openvino/runtime/allocator.hpp +++ b/src/core/include/openvino/runtime/allocator.hpp @@ -14,9 +14,9 @@ #include "openvino/core/any.hpp" #include "openvino/core/core_visibility.hpp" -#include "openvino/core/deprecated.hpp" namespace ov { + class Tensor; /** @@ -158,10 +158,4 @@ class OPENVINO_API Allocator { explicit operator bool() const noexcept; }; -OPENVINO_SUPPRESS_DEPRECATED_START -namespace runtime { -using ov::Allocator; -} // namespace runtime -OPENVINO_SUPPRESS_DEPRECATED_END - } // namespace ov diff --git a/src/core/include/openvino/runtime/tensor.hpp b/src/core/include/openvino/runtime/tensor.hpp index 43f63402e49da2..61b829fafb2ac1 100644 --- a/src/core/include/openvino/runtime/tensor.hpp +++ b/src/core/include/openvino/runtime/tensor.hpp @@ -259,9 +259,4 @@ class OPENVINO_API Tensor { */ using TensorVector = std::vector; -namespace runtime { -using ov::Tensor; -using ov::TensorVector; -} // namespace runtime - } // namespace ov diff --git a/src/core/src/preprocess/preprocess_impls.hpp b/src/core/src/preprocess/preprocess_impls.hpp index 4d72a826a286e3..0bf89fe0918441 100644 --- a/src/core/src/preprocess/preprocess_impls.hpp +++ b/src/core/src/preprocess/preprocess_impls.hpp @@ -218,7 +218,7 @@ class InputTensorInfo::InputTensorInfoImpl : public TensorInfoImplBase { m_shape_set = true; } - void set_from(const ov::runtime::Tensor& runtime_tensor) { + void set_from(const ov::Tensor& runtime_tensor) { set_shape(runtime_tensor.get_shape()); set_element_type(runtime_tensor.get_element_type()); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp index 3362bda02fdb78..02f92d7fc2f0b9 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/gather.cpp @@ -128,7 +128,7 @@ class GatherLayerTestCPU : public testing::WithParamInterfaceget_friendly_name() == "data") { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp index 3ef7ef621e0f3d..3a0f80868543c2 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/grid_sample.cpp @@ -136,7 +136,7 @@ class GridSampleLayerTestCPU : public testing::WithParamInterfaceget_friendly_name() == "data") { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp index 00b7c82bd1be15..567634cc6b9597 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/non_max_suppression.cpp @@ -96,7 +96,7 @@ class NmsLayerCPUTest : public testing::WithParamInterface, virtual p auto node = funcInputs[2].get_node_shared_ptr(); auto it = inputs.find(node); if (it == inputs.end()) return; - auto tensor = ov::runtime::Tensor(node->get_element_type(), targetInputStaticShapes[2], &maxOutBoxesPerClass); + auto tensor = ov::Tensor(node->get_element_type(), targetInputStaticShapes[2], &maxOutBoxesPerClass); inputs[node] = tensor; } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp index 18471afff43294..06b58627ebfa40 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/rdft.cpp @@ -152,21 +152,21 @@ class RDFTTestCPU : public testing::WithParamInterfaceinputs(); auto funcInput = funcInputs.begin(); inputs.clear(); - runtime::Tensor data_tensor = test::utils::create_and_fill_tensor_normal_distribution(funcInput->get_element_type(), + ov::Tensor data_tensor = test::utils::create_and_fill_tensor_normal_distribution(funcInput->get_element_type(), targetInputStaticShapes[0], 0, 1, 0); inputs.insert({funcInput->get_node_shared_ptr(), data_tensor}); funcInput++; if (!constAxes && funcInput != funcInputs.end()) { ASSERT_TRUE(inputIdx < axes.size()); - auto tensor = ov::runtime::Tensor{funcInput->get_element_type(), Shape{axes[inputIdx].size()}}; + auto tensor = ov::Tensor{funcInput->get_element_type(), Shape{axes[inputIdx].size()}}; std::memcpy(tensor.data(), axes[inputIdx].data(), axes[inputIdx].size() * sizeof(axes[0][0])); inputs.insert({funcInput->get_node_shared_ptr(), tensor}); funcInput++; } if (!constSignalSizes && funcInput != funcInputs.end()) { ASSERT_TRUE(inputIdx < signalSizes.size()); - auto tensor = ov::runtime::Tensor{funcInput->get_element_type(), Shape{signalSizes[inputIdx].size()}}; + auto tensor = ov::Tensor{funcInput->get_element_type(), Shape{signalSizes[inputIdx].size()}}; std::memcpy(tensor.data(), signalSizes[inputIdx].data(), signalSizes[inputIdx].size() * sizeof(signalSizes[0][0])); inputs.insert({funcInput->get_node_shared_ptr(), tensor}); } diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp index 576869d3fec977..bd3a32e13e93e5 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/shape_ops.cpp @@ -83,11 +83,11 @@ class ShapeOpsCPUTest : public testing::WithParamInterface, const auto& funcInputs = function->inputs(); for (size_t i = 0; i < funcInputs.size(); ++i) { const auto& funcInput = funcInputs[i]; - ov::runtime::Tensor tensor; + ov::Tensor tensor; if (i == 1) { #define RESHAPE_TEST_CASE(INT_TYPE) \ case ov::element::Type_t::INT_TYPE: { \ - tensor = ov::runtime::Tensor{ov::element::INT_TYPE, targetInputStaticShapes[i]}; \ + tensor = ov::Tensor{ov::element::INT_TYPE, targetInputStaticShapes[i]}; \ auto inputData = tensor.data::value_type>(); \ ASSERT_TRUE(idx < data.size()); \ for (size_t j = 0lu; j < data[idx].size(); ++j) { \ diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp index 9ad0401f789ade..0d96d3af3cc00b 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/unique.cpp @@ -120,7 +120,7 @@ class UniqueLayerTestCPU : public testing::WithParamInterfaceget_friendly_name() == "data") { int32_t range = std::accumulate(targetInputStaticShapes[0].begin(), targetInputStaticShapes[0].end(), 1, std::multiplies()); diff --git a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp index 7a6ed5be8aa8b5..52c588f962c42e 100644 --- a/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp +++ b/src/plugins/intel_cpu/tests/functional/subgraph_tests/src/reshape_inplace.cpp @@ -57,9 +57,9 @@ class InPlaceReshapeFromConstantCheck : public SubgraphBaseTest { const auto& funcInputs = function->inputs(); for (size_t i = 0; i < funcInputs.size(); ++i) { const auto& funcInput = funcInputs[i]; - ov::runtime::Tensor tensor; + ov::Tensor tensor; if (i == 1) { - tensor = ov::runtime::Tensor{ov::element::i32, targetInputStaticShapes[i]}; + tensor = ov::Tensor{ov::element::i32, targetInputStaticShapes[i]}; auto inputData = tensor.data::value_type>(); const std::vector data = {38, 38, 15, 4}; for (size_t j = 0lu; j < data.size(); ++j) { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp index 8c432154f730b3..6b0251cb21c4aa 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/grid_sample.cpp @@ -99,7 +99,7 @@ class GridSampleLayerTestGPU : public testing::WithParamInterfaceget_friendly_name() == "data") { diff --git a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp index ffda0040d446e4..1937b18bc73460 100644 --- a/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp +++ b/src/plugins/intel_gpu/tests/functional/single_layer_tests/dynamic/non_max_suppression.cpp @@ -103,7 +103,7 @@ class NmsLayerGPUTest : public testing::WithParamInterface, auto node = funcInputs[2].get_node_shared_ptr(); auto it = inputs.find(node); if (it == inputs.end()) return; - auto tensor = ov::runtime::Tensor(node->get_element_type(), targetInputStaticShapes[2], &maxOutBoxesPerClass); + auto tensor = ov::Tensor(node->get_element_type(), targetInputStaticShapes[2], &maxOutBoxesPerClass); inputs[node] = tensor; } diff --git a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp index 88ceb3ea6db14b..d9407640327cb8 100644 --- a/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp +++ b/src/plugins/intel_gpu/tests/functional/subgraph_tests/dynamic/dynamic_smoke_test_with_empty_tensor.cpp @@ -54,7 +54,7 @@ class EmptyTensorDynamicGPUTest : public testing::WithParamInterfaceinputs(); for (size_t i = 0; i < funcInputs.size(); ++i) { auto node = funcInputs[i].get_node_shared_ptr(); - auto tensor = ov::runtime::Tensor(node->get_element_type(), targetInputStaticShapes[i]); + auto tensor = ov::Tensor(node->get_element_type(), targetInputStaticShapes[i]); if (i == 0) { // All zero inputs for non_zero op auto tensor_ptr = static_cast(tensor.data()); diff --git a/src/plugins/template/backend/executable.hpp b/src/plugins/template/backend/executable.hpp index 2259cc5192a4c0..347c4493f04bc4 100644 --- a/src/plugins/template/backend/executable.hpp +++ b/src/plugins/template/backend/executable.hpp @@ -19,16 +19,16 @@ class Executable { Executable(); virtual ~Executable(); - /// \param outputs vector of runtime::Tensor used as outputs - /// \param inputs vector of runtime::Tensor used as inputs + /// \param outputs vector of Tensor used as outputs + /// \param inputs vector of Tensor used as inputs /// \param collect_performance Enable per operation performance statistic /// \returns true if iteration is successful, false otherwise virtual bool call(std::vector& outputs, const std::vector& inputs, bool collect_performance = false) = 0; - /// \param outputs vector of runtime::Tensor used as outputs - /// \param inputs vector of runtime::Tensor used as inputs + /// \param outputs vector of Tensor used as outputs + /// \param inputs vector of Tensor used as inputs /// \param context Evaluation context /// \param collect_performance Enable per operation performance statistic /// \returns true if iteration is successful, false otherwise @@ -41,14 +41,14 @@ class Executable { virtual void cancel() = 0; /// \brief Executes a single iteration of a Function. - /// \param outputs vector of runtime::Tensor used as outputs - /// \param inputs vector of runtime::Tensor used as inputs + /// \param outputs vector of Tensor used as outputs + /// \param inputs vector of Tensor used as inputs /// \returns true if iteration is successful, false otherwise bool call_with_validate(std::vector& outputs, const std::vector& inputs); /// \brief Validates a Function. - /// \param outputs vector of runtime::Tensor used as outputs - /// \param inputs vector of runtime::Tensor used as inputs + /// \param outputs vector of Tensor used as outputs + /// \param inputs vector of Tensor used as inputs void validate(const std::vector& outputs, const std::vector& inputs); /// \brief Query the input Parameters diff --git a/src/plugins/template/tests/functional/op_reference/interpolate.cpp b/src/plugins/template/tests/functional/op_reference/interpolate.cpp index 7eaed35bde1878..4805f4364c9401 100644 --- a/src/plugins/template/tests/functional/op_reference/interpolate.cpp +++ b/src/plugins/template/tests/functional/op_reference/interpolate.cpp @@ -50,8 +50,8 @@ struct InterpolateV1Params { Shape outShape; element::Type inType; element::Type outType; - runtime::Tensor inData; - runtime::Tensor outData; + ov::Tensor inData; + ov::Tensor outData; std::shared_ptr outShapeInput; op::v0::Interpolate::Attributes attrs; }; @@ -82,8 +82,8 @@ struct InterpolateV4Params { Shape outShape; element::Type inType; element::Type outType; - runtime::Tensor inData; - runtime::Tensor outData; + ov::Tensor inData; + ov::Tensor outData; std::vector outShapeInput; element::Type outShapeInputType; std::vector scales; diff --git a/src/plugins/template/tests/functional/op_reference/memory.cpp b/src/plugins/template/tests/functional/op_reference/memory.cpp index d2fad1ec59ad14..ffc1444c41a23c 100644 --- a/src/plugins/template/tests/functional/op_reference/memory.cpp +++ b/src/plugins/template/tests/functional/op_reference/memory.cpp @@ -36,8 +36,8 @@ struct ReadValueAssignParams { Shape m_output_shape; element::Type m_input_type; element::Type m_output_type; - runtime::Tensor m_input_data; - runtime::Tensor m_expected_data; + ov::Tensor m_input_data; + ov::Tensor m_expected_data; std::string m_variable_id; }; @@ -245,8 +245,8 @@ struct MemoryTestParams { ov::Shape m_output_shape; ov::element::Type m_input_type; ov::element::Type m_output_type; - ov::runtime::Tensor m_input_data; - ov::runtime::Tensor m_expected_data; + ov::Tensor m_input_data; + ov::Tensor m_expected_data; std::vector m_variable_id; size_t m_count_runs; size_t m_reset_on_run; diff --git a/src/plugins/template/tests/functional/op_reference/region_yolo.cpp b/src/plugins/template/tests/functional/op_reference/region_yolo.cpp index f1160722810f69..3e12ab8e4384ef 100644 --- a/src/plugins/template/tests/functional/op_reference/region_yolo.cpp +++ b/src/plugins/template/tests/functional/op_reference/region_yolo.cpp @@ -67,8 +67,8 @@ struct RegionYoloParams { ov::PartialShape inputShape; ov::element::Type inType; ov::element::Type outType; - ov::runtime::Tensor inputData; - ov::runtime::Tensor refData; + ov::Tensor inputData; + ov::Tensor refData; std::string testcaseName; }; diff --git a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir.cpp b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir.cpp index 5704638abe3094..10db7aebd9d195 100644 --- a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir.cpp @@ -312,7 +312,7 @@ std::vector ReadIRTest::calculate_refs() { size_t pos = 0; for (const auto& output : functionRefs->outputs()) { - auto out_tensor = ov::runtime::Tensor(output.get_element_type(), output.get_shape(), &ref_buffer[pos]); + auto out_tensor = ov::Tensor(output.get_element_type(), output.get_shape(), &ref_buffer[pos]); pos += out_tensor.get_byte_size(); } } diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp index ea36010c8ba189..6c309643c99334 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/infer_request_dynamic.hpp @@ -41,7 +41,7 @@ class OVInferRequestDynamicTests : public testing::WithParamInterface ie = utils::PluginCache::get().core(); std::shared_ptr function; diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/iteration_chaining.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/iteration_chaining.hpp index a9711fd97a7ea5..725899cd075c44 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/iteration_chaining.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_infer_request/iteration_chaining.hpp @@ -39,7 +39,7 @@ struct OVIterationChaining : public OVInferRequestTests { private: static std::shared_ptr getIterativeFunction(); - bool checkOutput(const ov::runtime::Tensor& in, const ov::runtime::Tensor& actual); + bool checkOutput(const ov::Tensor& in, const ov::Tensor& actual); }; } // namespace behavior diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp index 7390c0726747fb..8ea45c7e788116 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/infer_request_dynamic.cpp @@ -44,7 +44,7 @@ void OVInferRequestDynamicTests::SetUp() { APIBaseTest::SetUp(); } -bool OVInferRequestDynamicTests::checkOutput(const ov::runtime::Tensor& in, const ov::runtime::Tensor& actual) { +bool OVInferRequestDynamicTests::checkOutput(const ov::Tensor& in, const ov::Tensor& actual) { bool result = true; auto net = ie->compile_model(function, ov::test::utils::DEVICE_TEMPLATE); ov::InferRequest req; @@ -96,7 +96,7 @@ TEST_P(OVInferRequestDynamicTests, InferDynamicNetwork) { ov::test::utils::InputGenerateData in_data; in_data.start_from = -50; in_data.range = 100; - ov::runtime::Tensor inTensor = ov::test::utils::create_and_fill_tensor(element::f32, shape, in_data); + ov::Tensor inTensor = ov::test::utils::create_and_fill_tensor(element::f32, shape, in_data); OV_ASSERT_NO_THROW(req = execNet.create_infer_request()); OV_ASSERT_NO_THROW(req.set_tensor("input_tensor", inTensor)); OV_ASSERT_NO_THROW(req.infer()); @@ -115,7 +115,7 @@ TEST_P(OVInferRequestDynamicTests, InferDynamicNetworkSetUnexpectedOutputTensorB auto execNet = ie->compile_model(function, target_device, configuration); // Create InferRequest ov::InferRequest req; - ov::runtime::Tensor tensor, otensor; + ov::Tensor tensor, otensor; const std::string outputname = function->outputs().back().get_any_name(); OV_ASSERT_NO_THROW(req = execNet.create_infer_request()); ov::test::utils::InputGenerateData in_data; @@ -144,7 +144,7 @@ TEST_P(OVInferRequestDynamicTests, InferDynamicNetworkSetOutputTensorPreAllocate auto execNet = ie->compile_model(function, target_device, configuration); // Create InferRequest ov::InferRequest req; - ov::runtime::Tensor tensor; + ov::Tensor tensor; const std::string outputname = function->outputs().back().get_any_name(); OV_ASSERT_NO_THROW(req = execNet.create_infer_request()); ov::test::utils::InputGenerateData in_data; @@ -153,7 +153,7 @@ TEST_P(OVInferRequestDynamicTests, InferDynamicNetworkSetOutputTensorPreAllocate tensor = ov::test::utils::create_and_fill_tensor(element::f32, refShape, in_data); OV_ASSERT_NO_THROW(req.set_tensor("input_tensor", tensor)); float ptr[5000]; - ov::runtime::Tensor otensor(element::f32, refOutShape, ptr); + ov::Tensor otensor(element::f32, refOutShape, ptr); OV_ASSERT_NO_THROW(req.set_tensor(outputname, otensor)); OV_ASSERT_NO_THROW(req.infer()); ASSERT_EQ(req.get_tensor(outputname).data(), ptr); @@ -172,7 +172,7 @@ TEST_P(OVInferRequestDynamicTests, InferDynamicNetworkSetOutputShapeBeforeInfer) auto execNet = ie->compile_model(function, target_device, configuration); // Create InferRequest ov::InferRequest req; - ov::runtime::Tensor tensor, otensor; + ov::Tensor tensor, otensor; const std::string outputname = function->outputs().back().get_any_name(); OV_ASSERT_NO_THROW(req = execNet.create_infer_request()); ov::test::utils::InputGenerateData in_data; @@ -199,7 +199,7 @@ TEST_P(OVInferRequestDynamicTests, InferDynamicNetworkGetOutputThenSetOutputTens auto execNet = ie->compile_model(function, target_device, configuration); // Create InferRequest ov::InferRequest req; - ov::runtime::Tensor tensor; + ov::Tensor tensor; const std::string outputname = function->outputs().back().get_any_name(); OV_ASSERT_NO_THROW(req = execNet.create_infer_request()); ov::test::utils::InputGenerateData in_data; @@ -213,7 +213,7 @@ TEST_P(OVInferRequestDynamicTests, InferDynamicNetworkGetOutputThenSetOutputTens ASSERT_TRUE(checkOutput(req.get_tensor("input_tensor"), req.get_tensor(outputname))); // then, set output tensor float ptr[5000]; - ov::runtime::Tensor otensor(element::f32, refOutShape, ptr); + ov::Tensor otensor(element::f32, refOutShape, ptr); OV_ASSERT_NO_THROW(req.set_tensor(outputname, otensor)); OV_ASSERT_NO_THROW(req.infer()); ASSERT_EQ(req.get_tensor(outputname).data(), ptr); diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/io_tensor.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/io_tensor.cpp index c716486a369951..e5820ae8d58c79 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/io_tensor.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/io_tensor.cpp @@ -235,7 +235,7 @@ TEST_P(OVInferRequestIOTensorTest, InferStaticNetworkSetChangedInputTensorThrow) OV_ASSERT_NO_THROW(req = execNet.create_infer_request()); OV_ASSERT_NO_THROW(req.infer()); // Get input_tensor - ov::runtime::Tensor tensor; + ov::Tensor tensor; OV_ASSERT_NO_THROW(tensor = req.get_tensor(function->inputs().back().get_any_name())); // Set shape OV_ASSERT_NO_THROW(tensor.set_shape(shape2)); @@ -258,7 +258,7 @@ TEST_P(OVInferRequestIOTensorTest, InferStaticNetworkSetChangedOutputTensorThrow OV_ASSERT_NO_THROW(req = execNet.create_infer_request()); OV_ASSERT_NO_THROW(req.infer()); // Get output_tensor - ov::runtime::Tensor tensor; + ov::Tensor tensor; OV_ASSERT_NO_THROW(tensor = req.get_tensor(function->outputs().back().get_any_name());); // Set shape OV_ASSERT_NO_THROW(tensor.set_shape(shape2)); diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp index 2e77ec5475e29f..1bb87fccfaf32d 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_infer_request/iteration_chaining.cpp @@ -78,7 +78,7 @@ void OVIterationChaining::TearDown() { OVInferRequestTests::TearDown(); } -bool OVIterationChaining::checkOutput(const ov::runtime::Tensor& in, const ov::runtime::Tensor& actual) { +bool OVIterationChaining::checkOutput(const ov::Tensor& in, const ov::Tensor& actual) { bool result = true; auto net = core->compile_model(function, ov::test::utils::DEVICE_TEMPLATE); ov::InferRequest req; diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/compare_results.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/compare_results.hpp index 226d608bb687d2..0db366b4e7b034 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/compare_results.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/compare_results.hpp @@ -13,8 +13,8 @@ namespace utils { using CompareMap = std::map &node, size_t port, - const ov::runtime::Tensor &expected, - const ov::runtime::Tensor &actual, + const ov::Tensor &expected, + const ov::Tensor &actual, double absThreshold, double relThreshold)>>; diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/generate_inputs.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/generate_inputs.hpp index df2a47513e17de..6e1af8f967a6b8 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/generate_inputs.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/base/utils/generate_inputs.hpp @@ -17,7 +17,7 @@ void reset_const_ranges(); std::vector color_test_image(size_t height, size_t width, int b_step, ov::preprocess::ColorFormat format); -using InputsMap = std::map& node, size_t port, const ov::element::Type& elemType, diff --git a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stateful_model.hpp b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stateful_model.hpp index 70016ea8b6c840..807238dc6fa966 100644 --- a/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stateful_model.hpp +++ b/src/tests/functional/shared_test_classes/include/shared_test_classes/subgraph/stateful_model.hpp @@ -113,7 +113,7 @@ class StaticShapeStatefulModel : public StatefulModelTest { inputs.clear(); const auto& funcInputs = function->inputs(); const auto& funcInput = funcInputs.front(); - auto tensor = ov::runtime::Tensor{ov::element::f32, funcInput.get_shape()}; + auto tensor = ov::Tensor{ov::element::f32, funcInput.get_shape()}; auto inputData = tensor.data::value_type>(); inputData[0] = input_vals[i]; inputs.insert({funcInput.get_node_shared_ptr(), tensor}); @@ -222,7 +222,7 @@ class StaticShapeTwoStatesModel : public StatefulModelTest { inputs.clear(); const auto& funcInputs = function->inputs(); const auto& funcInput = funcInputs.front(); - auto tensor = ov::runtime::Tensor{testPrc, funcInput.get_shape()}; + auto tensor = ov::Tensor{testPrc, funcInput.get_shape()}; auto inputData = tensor.data::value_type>(); inputData[0] = input_vals[i]; inputs.insert({funcInput.get_node_shared_ptr(), tensor}); @@ -336,7 +336,7 @@ class DynamicShapeStatefulModel : public StatefulModelTest { auto states = inferRequest.query_state(); ASSERT_FALSE(states.empty()); - auto init_tensor = ov::runtime::Tensor{testPrc, ov::Shape{1, 1}}; + auto init_tensor = ov::Tensor{testPrc, ov::Shape{1, 1}}; auto init_data = init_tensor.data::value_type>(); init_data[0] = vec_state[0]; states.front().set_state(init_tensor); @@ -348,7 +348,7 @@ class DynamicShapeStatefulModel : public StatefulModelTest { auto &input_shape = shapes.front(); const auto& funcInputs = function->inputs(); const auto& funcInput = funcInputs.front(); - auto tensor = ov::runtime::Tensor{testPrc, input_shape}; + auto tensor = ov::Tensor{testPrc, input_shape}; auto input_data = tensor.data::value_type>(); for (size_t i = 0; i < input_shape.front(); ++i) { input_data[i] = input_vals[i]; @@ -507,7 +507,7 @@ class DynamicShapeStatefulModelStateAsInp : public StatefulModelTest { auto states = inferRequest.query_state(); ASSERT_FALSE(states.empty()); - auto init_tensor = ov::runtime::Tensor{testPrc, ov::Shape{1, 1}}; + auto init_tensor = ov::Tensor{testPrc, ov::Shape{1, 1}}; auto init_data = init_tensor.data::value_type>(); init_data[0] = vec_state[0]; states.front().set_state(init_tensor); @@ -519,7 +519,7 @@ class DynamicShapeStatefulModelStateAsInp : public StatefulModelTest { auto &input_shape = shapes.front(); const auto& funcInputs = function->inputs(); for (auto&& funcInput : funcInputs) { - auto tensor = ov::runtime::Tensor{testPrc, input_shape}; + auto tensor = ov::Tensor{testPrc, input_shape}; auto input_data = tensor.data::value_type>(); for (size_t i = 0; i < input_shape[1]; ++i) { input_data[i] = input_vals[i]; diff --git a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp index f3bf7d8bcf9edc..b11f0b530b1b4d 100644 --- a/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp +++ b/src/tests/functional/shared_test_classes/src/single_layer/experimental_detectron_prior_grid_generator.cpp @@ -74,7 +74,7 @@ void ExperimentalDetectronPriorGridGeneratorLayerTest::SetUp() { namespace { template -ov::runtime::Tensor generateTensorByShape(const Shape &shape) { +ov::Tensor generateTensorByShape(const Shape &shape) { return ov::test::utils::create_tensor( ov::element::from(), shape, @@ -98,7 +98,7 @@ void ExperimentalDetectronPriorGridGeneratorLayerTest::generate_inputs(const std inputs.insert({funcInputs[i].get_node_shared_ptr(), inputTensors.second[i]}); } for (auto j = i; j < funcInputs.size(); ++j) { - ov::runtime::Tensor inputTensor = (netPrecision == element::f16) + ov::Tensor inputTensor = (netPrecision == element::f16) ? generateTensorByShape(targetInputStaticShapes[j]) : generateTensorByShape( targetInputStaticShapes[j]); diff --git a/src/tests/functional/shared_test_classes/src/single_op/activation.cpp b/src/tests/functional/shared_test_classes/src/single_op/activation.cpp index d4f52dfd61fe71..e459d217052cbc 100644 --- a/src/tests/functional/shared_test_classes/src/single_op/activation.cpp +++ b/src/tests/functional/shared_test_classes/src/single_op/activation.cpp @@ -111,7 +111,7 @@ void ActivationLayerTest::generate_inputs(const std::vector& targetIn const auto& funcInputs = function->inputs(); auto funcInput = funcInputs.begin(); inputs.clear(); - runtime::Tensor data_tensor = ov::test::utils::create_and_fill_tensor_act_dft(funcInput->get_element_type(), + Tensor data_tensor = ov::test::utils::create_and_fill_tensor_act_dft(funcInput->get_element_type(), targetInputStaticShapes[0], data_range, data_start_from, @@ -132,7 +132,7 @@ void ActivationParamLayerTest::generate_inputs(const std::vector& tar const auto& funcInputs = function->inputs(); for (size_t i = 0; i < funcInputs.size(); ++i) { const auto& funcInput = funcInputs[i]; - runtime::Tensor data_tensor; + Tensor data_tensor; const std::string& name = funcInput.get_node()->get_friendly_name(); if (0 == name.compare("negativeSlope")) { ov::test::utils::InputGenerateData in_data; diff --git a/src/tests/functional/shared_test_classes/src/single_op/dft.cpp b/src/tests/functional/shared_test_classes/src/single_op/dft.cpp index 654a7185be1431..94a4c6d9f95e97 100644 --- a/src/tests/functional/shared_test_classes/src/single_op/dft.cpp +++ b/src/tests/functional/shared_test_classes/src/single_op/dft.cpp @@ -52,7 +52,7 @@ void DFTLayerTest::generate_inputs(const std::vector& targetInputStat } inputs.clear(); - runtime::Tensor data_tensor = ov::test::utils::create_and_fill_tensor_act_dft(funcInput->get_element_type(), + Tensor data_tensor = ov::test::utils::create_and_fill_tensor_act_dft(funcInput->get_element_type(), targetInputStaticShapes[0], inGenData.range, inGenData.start_from, inGenData.resolution, inGenData.seed); inputs.insert({funcInput->get_node_shared_ptr(), data_tensor}); diff --git a/src/tests/functional/shared_test_classes/src/single_op/rdft.cpp b/src/tests/functional/shared_test_classes/src/single_op/rdft.cpp index bbadca390fb492..361845d61ecd79 100644 --- a/src/tests/functional/shared_test_classes/src/single_op/rdft.cpp +++ b/src/tests/functional/shared_test_classes/src/single_op/rdft.cpp @@ -51,7 +51,7 @@ void RDFTLayerTest::generate_inputs(const std::vector& targetInputSta } inputs.clear(); - runtime::Tensor data_tensor = ov::test::utils::create_and_fill_tensor_act_dft(funcInput->get_element_type(), + Tensor data_tensor = ov::test::utils::create_and_fill_tensor_act_dft(funcInput->get_element_type(), targetInputStaticShapes[0], inGenData.range, inGenData.start_from, inGenData.resolution, inGenData.seed); inputs.insert({funcInput->get_node_shared_ptr(), data_tensor}); diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp index a64ae64f01e9e7..45471f0249fa28 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp @@ -170,7 +170,7 @@ void fill_psroi(ov::Tensor& tensor, int spatialBinsY, const std::string& mode); -void fill_data_roi(ov::runtime::Tensor& tensor, +void fill_data_roi(ov::Tensor& tensor, const uint32_t range, const int height, const int width, diff --git a/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp b/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp index 3c9d97eeb72822..0bd6140e2133ad 100644 --- a/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp +++ b/src/tests/test_utils/common_test_utils/include/common_test_utils/ov_tensor_utils.hpp @@ -36,46 +36,46 @@ ov::Tensor create_and_fill_tensor(const ov::element::Type element_type, const int seed = 1); template -static ov::runtime::Tensor create_tensor(const ov::element::Type& element_type, - const ov::Shape& shape, - const std::vector& values, - const size_t size = 0) { +static ov::Tensor create_tensor(const ov::element::Type& element_type, + const ov::Shape& shape, + const std::vector& values, + const size_t size = 0) { const size_t real_size = size ? size : values.size() * sizeof(T) / element_type.size(); - ov::runtime::Tensor tensor{element_type, shape}; + ov::Tensor tensor{element_type, shape}; std::memcpy(tensor.data(), values.data(), std::min(real_size * element_type.size(), sizeof(T) * values.size())); return tensor; } -ov::runtime::Tensor create_and_fill_tensor_act_dft(const ov::element::Type element_type, - const ov::Shape& shape, - const uint32_t range = 10, - const double_t start_from = 0, - const int32_t resolution = 1, - const int seed = 1); +ov::Tensor create_and_fill_tensor_act_dft(const ov::element::Type element_type, + const ov::Shape& shape, + const uint32_t range = 10, + const double_t start_from = 0, + const int32_t resolution = 1, + const int seed = 1); -ov::runtime::Tensor create_and_fill_tensor_unique_sequence(const ov::element::Type element_type, - const ov::Shape& shape, - const int32_t start_from = 0, - const int32_t resolution = 1, - const int seed = 1); +ov::Tensor create_and_fill_tensor_unique_sequence(const ov::element::Type element_type, + const ov::Shape& shape, + const int32_t start_from = 0, + const int32_t resolution = 1, + const int seed = 1); -ov::runtime::Tensor create_and_fill_tensor_normal_distribution(const ov::element::Type element_type, - const ov::Shape& shape, - const float mean, - const float stddev, - const int seed = 1); +ov::Tensor create_and_fill_tensor_normal_distribution(const ov::element::Type element_type, + const ov::Shape& shape, + const float mean, + const float stddev, + const int seed = 1); -ov::runtime::Tensor create_and_fill_tensor_consistently(const ov::element::Type element_type, - const ov::Shape& shape, - const uint32_t range, - const int32_t start_from, - const int32_t resolution); +ov::Tensor create_and_fill_tensor_consistently(const ov::element::Type element_type, + const ov::Shape& shape, + const uint32_t range, + const int32_t start_from, + const int32_t resolution); -ov::runtime::Tensor create_and_fill_tensor_real_distribution(const ov::element::Type element_type, - const ov::Shape& shape, - const float min, - const float max, - const int seed); +ov::Tensor create_and_fill_tensor_real_distribution(const ov::element::Type element_type, + const ov::Shape& shape, + const float min, + const float max, + const int seed); void compare(const ov::Tensor& expected, const ov::Tensor& actual, diff --git a/src/tests/test_utils/common_test_utils/src/data_utils.cpp b/src/tests/test_utils/common_test_utils/src/data_utils.cpp index dc43186c7f3142..c9c25f82235cec 100644 --- a/src/tests/test_utils/common_test_utils/src/data_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/data_utils.cpp @@ -338,7 +338,7 @@ void fill_psroi(ov::Tensor& tensor, } template -inline void fill_data_roi_impl(ov::runtime::Tensor& tensor, +inline void fill_data_roi_impl(ov::Tensor& tensor, const uint32_t range, const int height, const int width, @@ -384,7 +384,7 @@ inline void fill_data_roi_impl(ov::runtime::Tensor& tensor, } } -void fill_data_roi(ov::runtime::Tensor& tensor, +void fill_data_roi(ov::Tensor& tensor, const uint32_t range, const int height, const int width, diff --git a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp index 281310fb4e83c7..ee85e0c88cebad 100644 --- a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp @@ -174,12 +174,12 @@ ov::Tensor create_and_fill_tensor_unique_sequence(const ov::element::Type elemen return tensor; } -ov::runtime::Tensor create_and_fill_tensor_normal_distribution(const ov::element::Type element_type, - const ov::Shape& shape, - const float mean, - const float stddev, - const int seed) { - auto tensor = ov::runtime::Tensor{element_type, shape}; +ov::Tensor create_and_fill_tensor_normal_distribution(const ov::element::Type element_type, + const ov::Shape& shape, + const float mean, + const float stddev, + const int seed) { + auto tensor = ov::Tensor{element_type, shape}; #define CASE(X) \ case X: \ fill_data_ptr_normal_random_float(tensor.data::value_type>(), \ @@ -218,12 +218,12 @@ ov::runtime::Tensor create_and_fill_tensor_normal_distribution(const ov::element return tensor; } -ov::runtime::Tensor create_and_fill_tensor_real_distribution(const ov::element::Type element_type, - const ov::Shape& shape, - const float min, - const float max, - const int seed) { - auto tensor = ov::runtime::Tensor{element_type, shape}; +ov::Tensor create_and_fill_tensor_real_distribution(const ov::element::Type element_type, + const ov::Shape& shape, + const float min, + const float max, + const int seed) { + auto tensor = ov::Tensor{element_type, shape}; #define CASE(X) \ case X: \ fill_data_ptr_real_random_float(tensor.data::value_type>(), \ @@ -258,12 +258,12 @@ ov::runtime::Tensor create_and_fill_tensor_real_distribution(const ov::element:: return tensor; } -ov::runtime::Tensor create_and_fill_tensor_consistently(const ov::element::Type element_type, - const ov::Shape& shape, - const uint32_t range, - const int32_t start_from, - const int32_t resolution) { - auto tensor = ov::runtime::Tensor{element_type, shape}; +ov::Tensor create_and_fill_tensor_consistently(const ov::element::Type element_type, + const ov::Shape& shape, + const uint32_t range, + const int32_t start_from, + const int32_t resolution) { + auto tensor = ov::Tensor{element_type, shape}; #define CASE(X) \ case X: \ fill_data_ptr_consistently(tensor.data::value_type>(), \ diff --git a/thirdparty/open_model_zoo b/thirdparty/open_model_zoo index e8fb4cd86a516c..126fac1894c806 160000 --- a/thirdparty/open_model_zoo +++ b/thirdparty/open_model_zoo @@ -1 +1 @@ -Subproject commit e8fb4cd86a516ce5765290e9665f8afe87b79b2e +Subproject commit 126fac1894c806190a0e0a9737b5fc692d7f4baa