From e3d0808820f72164975e80b040f347686e60a5e0 Mon Sep 17 00:00:00 2001 From: Oleg Pipikin Date: Wed, 26 Jul 2023 13:11:59 +0400 Subject: [PATCH] Rename CommonTestUtils namespace to ov::test::utils --- .../tests/functional/core_config.cpp | 4 +- .../executable_network/cpp_holders.cpp | 6 +- .../executable_network/exec_network_base.cpp | 4 +- .../executable_network/get_metric.cpp | 22 +- .../behavior/infer_request/callback.cpp | 2 +- .../behavior/infer_request/config.cpp | 2 +- .../behavior/infer_request/infer_request.cpp | 6 +- .../behavior/infer_request/io_blob.cpp | 2 +- .../behavior/infer_request/perf_counters.cpp | 6 +- .../ov_exec_net_import_export.cpp | 10 +- .../ov_executable_network/properties.cpp | 36 +- .../ov_infer_request/batched_tensors.cpp | 2 +- .../behavior/ov_infer_request/callback.cpp | 2 +- .../ov_infer_request/cancellation.cpp | 2 +- .../infer_request_dynamic.cpp | 6 +- .../behavior/ov_infer_request/inference.cpp | 2 +- .../ov_infer_request/inference_chaining.cpp | 6 +- .../behavior/ov_infer_request/io_tensor.cpp | 12 +- .../ov_infer_request/multithreading.cpp | 2 +- .../behavior/ov_infer_request/wait.cpp | 2 +- .../behavior/ov_plugin/caching_tests.cpp | 2 +- .../behavior/ov_plugin/core_integration.cpp | 34 +- .../behavior/ov_plugin/life_time.cpp | 4 +- .../behavior/ov_plugin/properties_tests.cpp | 32 +- .../behavior/plugin/caching_tests.cpp | 2 +- .../behavior/plugin/config.cpp | 4 +- .../behavior/plugin/core_integration.cpp | 32 +- .../behavior/plugin/life_time.cpp | 6 +- .../behavior/plugin/preprocessing.cpp | 4 +- .../behavior/plugin/set_preprocess.cpp | 14 +- .../behavior/plugin/version.cpp | 2 +- .../single_layer_tests/activation.cpp | 24 +- .../single_layer_tests/activation_slt.cpp | 336 ++++---- .../single_layer_tests/broadcast.cpp | 26 +- .../single_layer_tests/comparison.cpp | 8 +- .../single_layer_tests/concat.cpp | 2 +- .../single_layer_tests/convert.cpp | 8 +- .../single_layer_tests/convert_color_i420.cpp | 6 +- .../single_layer_tests/convert_color_nv12.cpp | 6 +- .../single_layer_tests/convolution.cpp | 808 +++++++++--------- .../convolution_asym_pad.cpp | 2 +- .../convolution_backprop_data.cpp | 92 +- .../convolution_backprop_data_add.cpp | 40 +- .../convolution_biasadd_activation.cpp | 140 +-- .../single_layer_tests/cuda_eltwise.cpp | 6 +- .../single_layer_tests/detection_output.cpp | 16 +- .../single_layer_tests/eltwise_test.cpp | 58 +- .../single_layer_tests/fake_quantize.cpp | 4 +- .../single_layer_tests/finite_comparer.hpp | 6 +- .../single_layer_tests/fully_connected.cpp | 20 +- .../single_layer_tests/gather.cpp | 10 +- .../generator/ops/avgpool.cpp.jinja2 | 2 +- .../generator/ops/clamp.cpp.jinja2 | 2 +- .../generator/ops/convolution.cpp.jinja2 | 2 +- .../ops/convolution_backprop_data.cpp.jinja2 | 2 +- .../convolution_backprop_data_add.cpp.jinja2 | 2 +- .../convolution_biasadd_activation.cpp.jinja2 | 2 +- .../ops/group_convolution.cpp.jinja2 | 2 +- ..._convolution_biasadd_activation.cpp.jinja2 | 2 +- .../generator/ops/mat_mul.cpp.jinja2 | 2 +- .../generator/ops/maxpool.cpp.jinja2 | 2 +- .../generator/ops/relu.cpp.jinja2 | 2 +- .../generator/ops/sigmoid.cpp.jinja2 | 2 +- .../generator/ops/swish.cpp.jinja2 | 2 +- .../single_layer_tests/group_convolution.cpp | 2 +- .../group_convolution_autogenerated.cpp | 66 +- .../group_convolution_backprop_data.cpp | 12 +- .../group_convolution_biasadd_activation.cpp | 12 +- ...ution_biasadd_activation_autogenerated.cpp | 56 +- .../single_layer_tests/gru_cell.cpp | 10 +- .../single_layer_tests/gru_sequence.cpp | 6 +- .../single_layer_tests/interpolate.cpp | 26 +- .../single_layer_tests/logical_test.cpp | 2 +- .../single_layer_tests/lstm_cell.cpp | 18 +- .../single_layer_tests/lstm_sequence.cpp | 10 +- .../single_layer_tests/mat_mul.cpp | 48 +- .../single_layer_tests/minimum_maximum.cpp | 2 +- .../single_layer_tests/mvn.cpp | 18 +- .../single_layer_tests/pad_test.cpp | 14 +- .../single_layer_tests/pooling.cpp | 104 +-- .../single_layer_tests/power.cpp | 2 +- .../single_layer_tests/reshape.cpp | 4 +- .../single_layer_tests/scatter_nd_update.cpp | 8 +- .../single_layer_tests/select.cpp | 6 +- .../single_layer_tests/softmax.cpp | 12 +- .../single_layer_tests/split.cpp | 2 +- .../single_layer_tests/squeeze_unsqueeze.cpp | 4 +- .../single_layer_tests/strided_slice.cpp | 8 +- .../single_layer_tests/tensor_iterator.cpp | 6 +- .../single_layer_tests/topk.cpp | 6 +- .../single_layer_tests/transpose_test.cpp | 2 +- .../single_layer_tests/variadic_split.cpp | 30 +- .../tests/include/cuda_test_constants.hpp | 8 +- 93 files changed, 1212 insertions(+), 1208 deletions(-) diff --git a/modules/nvidia_plugin/tests/functional/core_config.cpp b/modules/nvidia_plugin/tests/functional/core_config.cpp index 0893015b2..aece7fd6a 100644 --- a/modules/nvidia_plugin/tests/functional/core_config.cpp +++ b/modules/nvidia_plugin/tests/functional/core_config.cpp @@ -18,7 +18,7 @@ void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) { } // Set inference_precision hint to run fp32 model in fp32 runtime precision as default plugin execution precision may vary std::map config = {{ov::hint::inference_precision.name(), hint.get_type_name()}}; - core->SetConfig(config, CommonTestUtils::DEVICE_NVIDIA); + core->SetConfig(config, ov::test::utils::DEVICE_NVIDIA); } namespace ov { @@ -33,7 +33,7 @@ void core_configuration(ov::test::SubgraphBaseTest* test) { } } // Set inference_precision hint to run fp32 model in fp32 runtime precision as default plugin execution precision may vary - test->core->set_property(CommonTestUtils::DEVICE_NVIDIA, {{ov::hint::inference_precision.name(), hint.get_type_name()}}); + test->core->set_property(ov::test::utils::DEVICE_NVIDIA, {{ov::hint::inference_precision.name(), hint.get_type_name()}}); } } // namespace test diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/cpp_holders.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/cpp_holders.cpp index 2dcaaf1c4..5140ac296 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/cpp_holders.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/cpp_holders.cpp @@ -23,19 +23,19 @@ const std::vector> orders = { INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(orders)), HoldersTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTestImportNetwork, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA, "HETERO:NVIDIA"), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA, "HETERO:NVIDIA"), ::testing::ValuesIn(orders)), HoldersTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, "HETERO:NVIDIA"), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, "HETERO:NVIDIA"), HoldersTestOnImportedNetwork::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/exec_network_base.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/exec_network_base.cpp index 3c67eeebf..56907e64d 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/exec_network_base.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/exec_network_base.cpp @@ -14,7 +14,7 @@ const std::vector> configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecutableNetworkBaseTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), ExecutableNetworkBaseTest::getTestCaseName); @@ -24,7 +24,7 @@ const std::vector netPrecisions = {InferenceEngine:: INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecNetSetPrecision, ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), ExecNetSetPrecision::getTestCaseName); } // namespace \ No newline at end of file diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp index 666604f06..e797596f6 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp @@ -18,34 +18,34 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_NETWORK_NAME, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*""MULTI:NVIDIA", */"HETERO:NVIDIA")); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*""MULTI:NVIDIA", */"HETERO:NVIDIA")); INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported, IEClassExecutableNetworkGetMetricTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA")); // // Executable Network GetConfig / SetConfig // INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetConfigTest, IEClassExecutableNetworkGetConfigTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkSetConfigTest, IEClassExecutableNetworkSetConfigTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); // // Hetero Executable Network GetMetric @@ -55,19 +55,19 @@ INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkSetConfigTest, INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); #endif // ENABLE_INTEL_CPU } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/callback.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/callback.cpp index d156cad42..b8f288430 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/callback.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/callback.cpp @@ -24,7 +24,7 @@ const std::vector> configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestCallbackTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), InferRequestCallbackTests::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/config.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/config.cpp index 4be1629c4..ecab4453b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/config.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/config.cpp @@ -20,7 +20,7 @@ const std::vector> configs = {}; INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests_IncorrectConfig, InferRequestConfigTest, ::testing::Combine(::testing::Values(0ul), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), InferRequestConfigTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/infer_request.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/infer_request.cpp index 6a7832569..79da09521 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/infer_request.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/infer_request.cpp @@ -364,7 +364,7 @@ TEST_F(smoke_InferenceRequestTest, AsyncParameterResult) { InferenceEngine::Core ie{}; InferenceEngine::Blob::Ptr a{}; auto testNet = ie.ReadNetwork(model10, a); - auto execNet = ie.LoadNetwork(testNet, CommonTestUtils::DEVICE_NVIDIA); + auto execNet = ie.LoadNetwork(testNet, ov::test::utils::DEVICE_NVIDIA); InferenceEngine::InferRequest inferRequest{execNet.CreateInferRequest()}; const InferenceEngine::ConstInputsDataMap inputsInfo{execNet.GetInputsInfo()}; fillBlobs(inferRequest, inputsInfo, 1); @@ -379,7 +379,7 @@ TEST_F(InferenceRequestBasicTest, AsyncParameterResultCancel) { InferenceEngine::Core ie{}; InferenceEngine::Blob::Ptr a{}; auto testNet = ie.ReadNetwork(heavyModel10, a); - auto execNet = ie.LoadNetwork(testNet, CommonTestUtils::DEVICE_NVIDIA); + auto execNet = ie.LoadNetwork(testNet, ov::test::utils::DEVICE_NVIDIA); InferenceEngine::InferRequest inferRequest{execNet.CreateInferRequest()}; const InferenceEngine::ConstInputsDataMap inputsInfo{execNet.GetInputsInfo()}; fillBlobs(inferRequest, inputsInfo, 1); @@ -395,7 +395,7 @@ TEST_F(smoke_InferenceRequestTest, PerformanceCounters) { {InferenceEngine::PluginConfigParams::KEY_PERF_COUNT, InferenceEngine::PluginConfigParams::YES}}; auto testNet = ie.ReadNetwork(model10, a); - auto execNet = ie.LoadNetwork(testNet, CommonTestUtils::DEVICE_NVIDIA, config); + auto execNet = ie.LoadNetwork(testNet, ov::test::utils::DEVICE_NVIDIA, config); InferenceEngine::InferRequest request{execNet.CreateInferRequest()}; const InferenceEngine::ConstInputsDataMap inputsInfo{execNet.GetInputsInfo()}; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp index b9530b9f2..7e32fc7e7 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp @@ -19,7 +19,7 @@ const std::vector> configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestIOBBlobTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), InferRequestIOBBlobTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/perf_counters.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/perf_counters.cpp index 3f4e7f70e..347c6796f 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/perf_counters.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/perf_counters.cpp @@ -14,17 +14,17 @@ namespace { const std::vector> configs = {{}}; const std::vector> Multiconfigs = { - {{MULTI_CONFIG_KEY(DEVICE_PRIORITIES), CommonTestUtils::DEVICE_NVIDIA}}}; + {{MULTI_CONFIG_KEY(DEVICE_PRIORITIES), ov::test::utils::DEVICE_NVIDIA}}}; INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestPerfCountersTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), InferRequestPerfCountersTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestPerfCountersTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI), ::testing::ValuesIn(Multiconfigs)), InferRequestPerfCountersTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/ov_exec_net_import_export.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/ov_exec_net_import_export.cpp index 42c84d2a9..6727e3bd3 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/ov_exec_net_import_export.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/ov_exec_net_import_export.cpp @@ -16,28 +16,28 @@ const std::vector netPrecisions = { const std::vector configs = { {}, }; -const std::vector multiConfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}}; +const std::vector multiConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}}; -const std::vector heteroConfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}}; +const std::vector heteroConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVExecGraphImportExportTest, ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVExecGraphImportExportTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVExecGraphImportExportTest, ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_AUTO), + ::testing::Values(ov::test::utils::DEVICE_AUTO), ::testing::ValuesIn(multiConfigs)), OVExecGraphImportExportTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVExecGraphImportExportTest, ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(heteroConfigs)), OVExecGraphImportExportTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp index c785d3f3f..7d7607f53 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp @@ -31,37 +31,37 @@ const std::vector auto_inproperties = { const std::vector auto_batch_inproperties = { {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_NVIDIA) + "(4)"}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(ov::test::utils::DEVICE_NVIDIA) + "(4)"}, {ov::auto_batch_timeout(-1)}}, }; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(inproperties)), OVCompiledModelPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(hetero_inproperties)), OVCompiledModelPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI), ::testing::ValuesIn(multi_inproperties)), OVCompiledModelPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_AUTO), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_AUTO), ::testing::ValuesIn(auto_inproperties)), OVCompiledModelPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH), ::testing::ValuesIn(auto_batch_inproperties)), OVCompiledModelPropertiesIncorrectTests::getTestCaseName); @@ -78,7 +78,7 @@ const std::vector default_properties = { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesDefaultTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(default_properties)), OVCompiledModelPropertiesDefaultTests::getTestCaseName); @@ -98,44 +98,44 @@ const std::vector properties = { }; const std::vector hetero_properties = { - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::enable_profiling(true)}, - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::device::id("0")}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::enable_profiling(true)}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::device::id("0")}, }; const std::vector multi_properties = { - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::enable_profiling(true)}, - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::device::id("0")}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::enable_profiling(true)}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::device::id("0")}, }; const std::vector auto_batch_properties = { - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_NVIDIA) + "(4)"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_NVIDIA) + "(4)"}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(ov::test::utils::DEVICE_NVIDIA) + "(4)"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(ov::test::utils::DEVICE_NVIDIA) + "(4)"}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_NVIDIA) + "(4)"}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(ov::test::utils::DEVICE_NVIDIA) + "(4)"}, {ov::auto_batch_timeout(10)}}, }; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(properties)), OVCompiledModelPropertiesTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledModelPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(hetero_properties)), OVCompiledModelPropertiesTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVCompiledModelPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI), ::testing::ValuesIn(multi_properties)), OVCompiledModelPropertiesTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH), ::testing::ValuesIn(auto_batch_properties)), OVCompiledModelPropertiesTests::getTestCaseName); } // namespace \ No newline at end of file diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/batched_tensors.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/batched_tensors.cpp index ea5a02168..363400e6b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/batched_tensors.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/batched_tensors.cpp @@ -81,7 +81,7 @@ using namespace ov; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestBatchedTests, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), OVInferRequestBatchedTests::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/callback.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/callback.cpp index a6fda3bf6..a850ca2f2 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/callback.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/callback.cpp @@ -14,7 +14,7 @@ const std::vector configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCallbackTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVInferRequestCallbackTests::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp index aa25fca5e..013f73b2f 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp @@ -15,7 +15,7 @@ const std::vector configs = { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCancellationTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVInferRequestCancellationTests::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp index 42cbdaf34..f4ace0b62 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/infer_request_dynamic.cpp @@ -13,7 +13,7 @@ namespace { const std::vector configs = {{}}; -const std::vector HeteroConfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}}; +const std::vector HeteroConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}}; INSTANTIATE_TEST_SUITE_P( smoke_BehaviorTests, @@ -21,7 +21,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Combine(::testing::Values(ngraph::builder::subgraph::makeSplitConvConcat()), ::testing::Values(std::vector, std::vector>>{ {{1, 4, 20, 20}, {1, 10, 18, 18}}, {{2, 4, 20, 20}, {2, 10, 18, 18}}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVInferRequestDynamicTests::getTestCaseName); @@ -31,7 +31,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Combine(::testing::Values(ngraph::builder::subgraph::makeSplitConvConcat()), ::testing::Values(std::vector, std::vector>>{ {{1, 4, 20, 20}, {1, 10, 18, 18}}, {{2, 4, 20, 20}, {2, 10, 18, 18}}}), - ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(HeteroConfigs)), OVInferRequestDynamicTests::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference.cpp index ec5c592ad..062073c8d 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference.cpp @@ -15,7 +15,7 @@ using namespace ov; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestInferenceTests, ::testing::Combine(::testing::Values(tensor_roi::roi_nchw(), tensor_roi::roi_1d()), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), OVInferRequestInferenceTests::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference_chaining.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference_chaining.cpp index 3f31ebcba..bb91625cc 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference_chaining.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference_chaining.cpp @@ -14,17 +14,17 @@ namespace { const std::vector configs = {{}}; -const std::vector HeteroConfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}}; +const std::vector HeteroConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferenceChaining, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVInferenceChaining::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferenceChaining, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(HeteroConfigs)), OVInferenceChaining::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp index d11b7cdcc..10c0e19ab 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp @@ -14,7 +14,7 @@ const std::vector configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestIOTensorTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVInferRequestIOTensorTest::getTestCaseName); @@ -25,28 +25,28 @@ std::vector prcs = { const std::vector emptyConfigs = {{}}; -const std::vector HeteroConfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}}; +const std::vector HeteroConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}}; -const std::vector Multiconfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}}; +const std::vector Multiconfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCheckTensorPrecision, ::testing::Combine(::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(emptyConfigs)), OVInferRequestCheckTensorPrecision::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferRequestCheckTensorPrecision, ::testing::Combine(::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(HeteroConfigs)), OVInferRequestCheckTensorPrecision::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestCheckTensorPrecision, ::testing::Combine(::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::Values(ov::test::utils::DEVICE_MULTI), ::testing::ValuesIn(Multiconfigs)), OVInferRequestCheckTensorPrecision::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp index 08d8477e0..5952718f2 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp @@ -15,7 +15,7 @@ const std::vector configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestMultithreadingTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVInferRequestMultithreadingTests::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/wait.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/wait.cpp index c3e5a1974..75e235d0f 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/wait.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_infer_request/wait.cpp @@ -14,7 +14,7 @@ const std::vector configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestWaitTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), OVInferRequestWaitTests::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp index 1e8a0984e..cbd71a3d4 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/caching_tests.cpp @@ -20,7 +20,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Behavior_CachingSupportCase_Template, ::testing::Combine(::testing::ValuesIn(CompileModelCacheTestBase::getStandardFunctions()), ::testing::ValuesIn(precisionsTemplate), ::testing::ValuesIn(batchSizesTemplate), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(ov::AnyMap())), CompileModelCacheTestBase::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 81b791468..c31cf2598 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -20,11 +20,11 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_OVClassBasicTestP, OVClassBasicTestP, ::testing::Values(std::make_pair("openvino_nvidia_gpu_plugin", - CommonTestUtils::DEVICE_NVIDIA))); + ov::test::utils::DEVICE_NVIDIA))); INSTANTIATE_TEST_SUITE_P(smoke_OVClassNetworkTestP, OVClassNetworkTestP, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); // // OV Class GetMetric @@ -32,48 +32,48 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassNetworkTestP, INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_SUPPORTED_CONFIG_KEYS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_SUPPORTED_METRICS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_DEVICE_UUID, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_AVAILABLE_DEVICES, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_FULL_DEVICE_NAME, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_OPTIMIZATION_CAPABILITIES, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetMetricTest, OVClassGetMetricTest_ThrowUnsupported, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetConfigTest, OVClassGetConfigTest_ThrowUnsupported, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); #ifdef PROXY_PLUGIN_ENABLED INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetAvailableDevices, OVClassGetAvailableDevices, - ::testing::Values(CommonTestUtils::DEVICE_GPU)); + ::testing::Values(ov::test::utils::DEVICE_GPU)); #else INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetAvailableDevices, OVClassGetAvailableDevices, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); #endif // @@ -82,12 +82,12 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetAvailableDevices, INSTANTIATE_TEST_SUITE_P(smoke_OVClassGetConfigTest, OVClassGetConfigTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); TEST(OVClassBasicTest, smoke_CUDAGetSetConfigNoThrow) { ov::Core core = createCoreWithTemplate(); - auto device_name = CommonTestUtils::DEVICE_NVIDIA; + auto device_name = ov::test::utils::DEVICE_NVIDIA; for (auto&& property : core.get_property(device_name, ov::supported_properties)) { if (ov::device::id == property) { @@ -109,11 +109,11 @@ TEST(OVClassBasicTest, smoke_CUDAGetSetConfigNoThrow) { INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryNetworkTest, OVClassQueryNetworkTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); // OV Class Load network INSTANTIATE_TEST_SUITE_P(smoke_OVClassLoadNetworkTest, OVClassLoadNetworkTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp index 5294055cf..adab22aec 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp @@ -12,12 +12,12 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVHoldersTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), OVHoldersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVHoldersTestOnImportedNetwork, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, "HETERO:NVIDIA"), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, "HETERO:NVIDIA"), OVHoldersTestOnImportedNetwork::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp index 2c700993f..951e6a08a 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp @@ -34,31 +34,31 @@ const std::vector auto_batch_inproperties = { INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_BehaviorTests, OVPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(inproperties)), OVPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Hetero_BehaviorTests, OVPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(hetero_inproperties)), OVPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Multi_BehaviorTests, OVPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI), ::testing::ValuesIn(multi_inproperties)), OVPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Auto_BehaviorTests, OVPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_AUTO), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_AUTO), ::testing::ValuesIn(auto_inproperties)), OVPropertiesIncorrectTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, OVPropertiesIncorrectTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH), ::testing::ValuesIn(auto_batch_inproperties)), OVPropertiesIncorrectTests::getTestCaseName); @@ -73,7 +73,7 @@ const std::vector default_properties = { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVPropertiesDefaultTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(default_properties)), OVPropertiesDefaultTests::getTestCaseName); @@ -92,41 +92,41 @@ const std::vector properties = { }; const std::vector hetero_properties = { - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::enable_profiling(true)}, - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::device::id(0)}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::enable_profiling(true)}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::device::id(0)}, }; const std::vector multi_properties = { - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::enable_profiling(true)}, - {ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA), ov::device::id(0)}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::enable_profiling(true)}, + {ov::device::priorities(ov::test::utils::DEVICE_NVIDIA), ov::device::id(0)}, }; const std::vector auto_batch_properties = { - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_NVIDIA}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_NVIDIA}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), ov::test::utils::DEVICE_NVIDIA}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), ov::test::utils::DEVICE_NVIDIA}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, }; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(properties)), OVPropertiesTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Hetero_BehaviorTests, OVPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(hetero_properties)), OVPropertiesTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Multi_BehaviorTests, OVPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI), ::testing::ValuesIn(multi_properties)), OVPropertiesTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, OVPropertiesTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH), ::testing::ValuesIn(auto_batch_properties)), OVPropertiesTests::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp index b8f96a538..8d3431942 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/caching_tests.cpp @@ -20,6 +20,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Behavior_CachingSupportCase_Template, ::testing::Combine(::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()), ::testing::ValuesIn(precisionsTemplate), ::testing::ValuesIn(batchSizesTemplate), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), LoadNetworkCacheTestBase::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/config.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/config.cpp index 323f3baf7..eda10ce4f 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/config.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/config.cpp @@ -29,13 +29,13 @@ const std::vector> inconfigs = { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(inconfigs)), IncorrectConfigTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigAPITests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(inconfigs)), IncorrectConfigAPITests::getTestCaseName); } // namespace \ No newline at end of file diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp index 3ccd67478..c60feeef5 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp @@ -20,11 +20,11 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_IEClassBasicTestP, IEClassBasicTestP, ::testing::Values(std::make_pair("openvino_nvidia_gpu_plugin", - CommonTestUtils::DEVICE_NVIDIA))); + ov::test::utils::DEVICE_NVIDIA))); INSTANTIATE_TEST_SUITE_P(smoke_IEClassNetworkTestP, IEClassNetworkTestP, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); // // IE Class GetMetric @@ -32,44 +32,44 @@ INSTANTIATE_TEST_SUITE_P(smoke_IEClassNetworkTestP, INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_CONFIG_KEYS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_METRICS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetMetricTest, IEClassGetMetricTest_AVAILABLE_DEVICES, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetMetricTest, IEClassGetMetricTest_FULL_DEVICE_NAME, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetMetricTest, IEClassGetMetricTest_OPTIMIZATION_CAPABILITIES, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetMetricTest, IEClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetMetricTest, IEClassGetMetricTest_ThrowUnsupported, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetConfigTest, IEClassGetConfigTest_ThrowUnsupported, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); #ifdef PROXY_PLUGIN_ENABLED INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetAvailableDevices, IEClassGetAvailableDevices, - ::testing::Values(CommonTestUtils::DEVICE_GPU)); + ::testing::Values(ov::test::utils::DEVICE_GPU)); #else INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetAvailableDevices, IEClassGetAvailableDevices, - ::testing::Values(CommonTestUtils::DEVICE_GPU)); + ::testing::Values(ov::test::utils::DEVICE_GPU)); #endif // @@ -126,7 +126,7 @@ TEST_F(IEClassSetConfigTestHETERO, smoke_SetConfigNoThrow) { INSTANTIATE_TEST_SUITE_P(smoke_IEClassGetConfigTest, IEClassGetConfigTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); class IEClassGetConfigTestCUDA : public BehaviorTestsUtils::IEClassNetworkTest, public BehaviorTestsUtils::IEPluginTestBase { @@ -139,7 +139,7 @@ class IEClassGetConfigTestCUDA : public BehaviorTestsUtils::IEClassNetworkTest, TEST_F(IEClassGetConfigTestCUDA, smoke_GetConfigNoThrow) { InferenceEngine::Core ie = BehaviorTestsUtils::createIECoreWithTemplate(); InferenceEngine::Parameter p; - std::string deviceName = CommonTestUtils::DEVICE_NVIDIA; + std::string deviceName = ov::test::utils::DEVICE_NVIDIA; ASSERT_NO_THROW(p = ie.GetMetric(deviceName, METRIC_KEY(SUPPORTED_CONFIG_KEYS))); auto configValues = p.as>(); @@ -162,11 +162,11 @@ TEST_F(IEClassGetConfigTestCUDA, smoke_GetConfigNoThrow) { INSTANTIATE_TEST_SUITE_P(smoke_IEClassQueryNetworkTest, IEClassQueryNetworkTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); // IE Class Load network INSTANTIATE_TEST_SUITE_P(smoke_IEClassLoadNetworkTest, IEClassLoadNetworkTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/life_time.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/life_time.cpp index 112ac190b..b2ff378a8 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/life_time.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/life_time.cpp @@ -23,19 +23,19 @@ const std::vector> orders = { INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(orders)), HoldersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTestImportNetwork, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA, "HETERO:NVIDIA"), + ::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA, "HETERO:NVIDIA"), ::testing::ValuesIn(orders)), HoldersTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA, "HETERO:NVIDIA"), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA, "HETERO:NVIDIA"), HoldersTestOnImportedNetwork::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/preprocessing.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/preprocessing.cpp index f80481bb7..181761c00 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/preprocessing.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/preprocessing.cpp @@ -22,7 +22,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Behavior_PreprocessingPrecisionConvertTestsViaSet ::testing::Combine(::testing::ValuesIn(inputPrecisions), ::testing::Values(4), // Number of input tensor channels ::testing::Values(true), // Use SetInput - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), PreprocessingPrecisionConvertTest::getTestCaseName); @@ -32,7 +32,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Behavior_PreprocessingPrecisionConvertTestsViaGet ::testing::Values(4), // Number of input tensor channels (blob_copy only // supports 4d and 5d tensors) ::testing::Values(false), // use GetBlob - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), PreprocessingPrecisionConvertTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/set_preprocess.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/set_preprocess.cpp index 5fc640d9a..0f4a0bd83 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/set_preprocess.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/set_preprocess.cpp @@ -18,29 +18,29 @@ const std::vector netPrecisions = {InferenceEngine:: const std::vector> configs = {{}}; const std::vector> multiConfigs = { - {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_NVIDIA}}}; + {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, ov::test::utils::DEVICE_NVIDIA}}}; const std::vector> heteroConfigs = { - {{"TARGET_FALLBACK", CommonTestUtils::DEVICE_NVIDIA}}}; + {{"TARGET_FALLBACK", ov::test::utils::DEVICE_NVIDIA}}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestPreprocessTest, ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), InferRequestPreprocessTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestPreprocessTest, ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_MULTI), + ::testing::Values(ov::test::utils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferRequestPreprocessTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, InferRequestPreprocessTest, ::testing::Combine(::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_HETERO), + ::testing::Values(ov::test::utils::DEVICE_HETERO), ::testing::ValuesIn(heteroConfigs)), InferRequestPreprocessTest::getTestCaseName); @@ -60,7 +60,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ::testing::ValuesIn(ioLayouts), ::testing::Bool(), ::testing::Bool(), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), InferRequestPreprocessConversionTest::getTestCaseName); @@ -74,7 +74,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ::testing::Bool(), ::testing::Values(true), // only SetBlob ::testing::Values(true), // only SetBlob - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(configs)), InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/version.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/version.cpp index b18741836..9f6b21d17 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/version.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/plugin/version.cpp @@ -14,7 +14,7 @@ const std::vector> configs = {{}}; INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, VersionTest, - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), VersionTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp index 7026c91ec..f7cb09eac 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp @@ -89,45 +89,45 @@ std::map, std::vector>> preluBasic = { {{3, 2, 5, 7}, {{1}, {7}, {2}, {5, 7}, {2, 5, 7}, {2, 1, 1}, {1, 2, 1, 1}, {3, 2, 1, 1}, {3, 2, 5, 7}}}, }; -const auto basicCases = ::testing::Combine(::testing::ValuesIn(CommonTestUtils::combineParams(activationTypes)), +const auto basicCases = ::testing::Combine(::testing::ValuesIn(ov::test::utils::combineParams(activationTypes)), ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(CommonTestUtils::combineParams(basic)), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::ValuesIn(ov::test::utils::combineParams(basic)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); const auto basicPreluCases = - ::testing::Combine(::testing::ValuesIn(CommonTestUtils::combineParams(preluActivationParamTypes)), + ::testing::Combine(::testing::ValuesIn(ov::test::utils::combineParams(preluActivationParamTypes)), ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(CommonTestUtils::combineParams(preluBasic)), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::ValuesIn(ov::test::utils::combineParams(preluBasic)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); const auto basicPReluConstParamCases = - ::testing::Combine(::testing::ValuesIn(CommonTestUtils::combineParams(preluActivationParamTypes)), + ::testing::Combine(::testing::ValuesIn(ov::test::utils::combineParams(preluActivationParamTypes)), ::testing::ValuesIn(preluConstParamNetPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::ValuesIn(CommonTestUtils::combineParams(preluBasic)), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::ValuesIn(ov::test::utils::combineParams(preluBasic)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); // TODO int parameter activation tests don't work for CUDA now // const auto basicIntegerOperations = -// ::testing::Combine(::testing::ValuesIn(CommonTestUtils::combineParams(intActivationTypes)), +// ::testing::Combine(::testing::ValuesIn(ov::test::utils::combineParams(intActivationTypes)), // ::testing::ValuesIn(intPrecisions), // ::testing::ValuesIn(intPrecisions), // ::testing::ValuesIn(intPrecisions), // ::testing::Values(InferenceEngine::Layout::ANY), // ::testing::Values(InferenceEngine::Layout::ANY), -// ::testing::ValuesIn(CommonTestUtils::combineParams(basic)), -// ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); +// ::testing::ValuesIn(ov::test::utils::combineParams(basic)), +// ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); TEST_P(ActivationLayerTest, CompareWithRefs) { Run(); } diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp index 98ec087cb..e8d200390 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp @@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1000, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); // Attrs: {} @@ -76,7 +76,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1024, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -95,7 +95,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 100, 171}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -114,7 +114,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 112, 112}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -133,7 +133,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 16, 16}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -152,7 +152,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 17, 17}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -171,7 +171,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 18, 18, 18}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -190,7 +190,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 28, 28}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -209,7 +209,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 50, 86}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -228,7 +228,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 56, 56}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 16, 128, 128}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -266,7 +266,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 16, 144, 144, 144}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -285,7 +285,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 16, 56, 56}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -304,7 +304,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 160, 50, 86}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -323,7 +323,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 192, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -342,7 +342,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 192, 17, 17}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -361,7 +361,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 192, 200, 342}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -380,7 +380,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 192, 35, 35}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -399,7 +399,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 192, 50, 86}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -418,7 +418,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 192, 8, 8}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -437,7 +437,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 2048, 7, 7}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -456,7 +456,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 224, 17, 17}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -475,7 +475,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 224, 35, 35}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -494,7 +494,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 224, 50, 86}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -513,7 +513,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -532,7 +532,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -551,7 +551,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 17, 17}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -570,7 +570,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 28, 28}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -589,7 +589,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 56, 56}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -608,7 +608,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 8, 8}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -627,7 +627,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 9, 9, 9}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -646,7 +646,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 100, 171}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -665,7 +665,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 147, 147}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -684,7 +684,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 149, 149}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -703,7 +703,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 224, 224}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -722,7 +722,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 28, 28}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -741,7 +741,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 64, 64}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -760,7 +760,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 72, 72, 72}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -779,7 +779,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 320, 17, 17}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -798,7 +798,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 320, 8, 8}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -817,7 +817,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 384, 17, 17}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -836,7 +836,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 384, 8, 8}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -855,7 +855,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 4096}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -874,7 +874,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 448, 8, 8}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -893,7 +893,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 48, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -912,7 +912,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 512, 1000}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -931,7 +931,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 512, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -950,7 +950,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 512, 28, 28}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -969,7 +969,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 512, 7, 7}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -988,7 +988,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 512, 8, 8}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1007,7 +1007,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 100, 171}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1026,7 +1026,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 112, 112}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1045,7 +1045,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 113, 113}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1064,7 +1064,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1083,7 +1083,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 147, 147}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1102,7 +1102,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 200, 342}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1121,7 +1121,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 224, 224}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1140,7 +1140,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 32, 32}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1159,7 +1159,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 35, 35}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1178,7 +1178,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 36, 36, 36}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1197,7 +1197,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 400, 683}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1216,7 +1216,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 50, 86}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1235,7 +1235,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 56, 56}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1254,7 +1254,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 73, 73}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1273,7 +1273,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 100, 171}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1292,7 +1292,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 35, 35}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1311,7 +1311,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 50, 86}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1330,7 +1330,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 71, 71}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1349,7 +1349,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 73, 73}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1368,7 +1368,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 128, 4, 4}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1387,7 +1387,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 128, 7, 7}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1406,7 +1406,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 160, 4, 4}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1425,7 +1425,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 192, 4, 4}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1444,7 +1444,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 192, 7, 7}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1463,7 +1463,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 224, 4, 4}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1482,7 +1482,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 256, 15, 15}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1501,7 +1501,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 256, 4, 4}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1520,7 +1520,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 256, 7, 7}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1539,7 +1539,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 320, 4, 4}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1558,7 +1558,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 352, 4, 4}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1577,7 +1577,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{64, 1024}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1596,7 +1596,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{64, 6272}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1615,7 +1615,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{64, 64, 14, 14}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG_RELU} @@ -1641,7 +1641,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1, 128, 128}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1660,7 +1660,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1, 144, 144, 144}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1679,7 +1679,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1, 1917, 91}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1698,7 +1698,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1152, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1717,7 +1717,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 144, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1736,7 +1736,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 16, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1755,7 +1755,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1920, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1774,7 +1774,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 240, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1793,7 +1793,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 3, 20, 20, 85}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1812,7 +1812,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 3, 40, 40, 85}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1831,7 +1831,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 3, 80, 80, 85}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1850,7 +1850,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1869,7 +1869,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 480, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1888,7 +1888,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 672, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1907,7 +1907,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 76725, 90}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1926,7 +1926,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1945,7 +1945,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{100, 90, 15, 15}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -1964,7 +1964,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{64, 1, 28, 28}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG_SIGMOID} @@ -1998,7 +1998,7 @@ const auto basicTanhCases = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(listToVectors(tanhShapes)), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Tanh, ActivationLayerTest, @@ -2041,7 +2041,7 @@ const auto clampCasesSmoke = ::testing::Combine(::testing::ValuesIn(clampParamsS ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(clampInShapesSmoke), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Clamp, ActivationLayerTest, @@ -2055,7 +2055,7 @@ const auto clampCasesSmokeU32 = ::testing::Combine(::testing::ValuesIn(clampPara ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(clampInShapesSmoke), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Clamp_U32, ActivationLayerTest, @@ -2069,7 +2069,7 @@ const auto clampCasesSmokeI64 = ::testing::Combine(::testing::ValuesIn(clampPara ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(clampInShapesSmoke), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Clamp_I64, ActivationLayerTest, @@ -2098,7 +2098,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid357_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2119,7 +2119,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid329_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2140,7 +2140,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid306_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2161,7 +2161,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid301_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2182,7 +2182,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid265_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2203,7 +2203,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid57_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2224,7 +2224,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid37_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2245,7 +2245,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid101_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2266,7 +2266,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid66_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2287,7 +2287,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid278_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2308,7 +2308,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid334_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2329,7 +2329,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid311_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2350,7 +2350,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid283_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2371,7 +2371,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid14_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2392,7 +2392,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid110_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2413,7 +2413,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid288_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2434,7 +2434,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_mask_rcnn_inception_v2_coco_opid277_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2455,7 +2455,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid212_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2476,7 +2476,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid169_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2497,7 +2497,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid352_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2518,7 +2518,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid347_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2539,7 +2539,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid23_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2560,7 +2560,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid28_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2581,7 +2581,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(autogen_Clamp_ssd_mobilenet_v2_coco_opid221_params.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); const std::vector> autogen_Clamp_all_params{ @@ -2631,7 +2631,7 @@ const auto clampCasesBig = ::testing::Combine(::testing::Values(clampParamsBig), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(clampInShapeBig), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); struct ClampBenchmark : testing::Test { template @@ -2722,8 +2722,8 @@ struct ClampBenchmark : testing::Test { } const auto end = std::chrono::steady_clock::now(); microseconds averageExecTime = (end - start) / NUM_ATTEMPTS; - std::cout << std::fixed << std::setfill('0') << "Clamp " << CommonTestUtils::vec2str(shape.first) - << ", minMax = " << CommonTestUtils::vec2str(minMax) << ": " << averageExecTime.count() << " us\n"; + std::cout << std::fixed << std::setfill('0') << "Clamp " << ov::test::utils::vec2str(shape.first) + << ", minMax = " << ov::test::utils::vec2str(minMax) << ": " << averageExecTime.count() << " us\n"; } }; @@ -2767,7 +2767,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Swish, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(listToVectors(smoke_SwishShapes)), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); // clang-format off @@ -2788,7 +2788,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 10, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2807,7 +2807,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1152, 20, 20}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2826,7 +2826,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 40, 40}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2845,7 +2845,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 128, 80, 80}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2864,7 +2864,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 144, 160, 160}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2883,7 +2883,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 144, 80, 80}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2902,7 +2902,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 16, 320, 320}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2921,7 +2921,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 1920, 20, 20}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2940,7 +2940,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 20, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2959,7 +2959,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 240, 40, 40}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2978,7 +2978,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 240, 80, 80}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -2997,7 +2997,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 20, 20}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3016,7 +3016,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 256, 40, 40}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3035,7 +3035,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 28, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3054,7 +3054,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 160, 160}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3073,7 +3073,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 32, 320, 320}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3092,7 +3092,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 4, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3111,7 +3111,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 48, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3130,7 +3130,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 480, 40, 40}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3149,7 +3149,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 512, 20, 20}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3168,7 +3168,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 6, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3187,7 +3187,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 160, 160}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3206,7 +3206,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 64, 80, 80}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3225,7 +3225,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 672, 20, 20}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3244,7 +3244,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 672, 40, 40}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3263,7 +3263,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 8, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3282,7 +3282,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 80, 1, 1}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3301,7 +3301,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 88, 10, 10}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3320,7 +3320,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 88, 20, 20}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3339,7 +3339,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 88, 40, 40}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3358,7 +3358,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 88, 5, 5}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3377,7 +3377,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 88, 80, 80}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3396,7 +3396,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 160, 160}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); @@ -3415,7 +3415,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::pair, std::vector>{{1, 96, 320, 320}, {}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG_SWISH} @@ -3436,7 +3436,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(listToVectors(Floor_shapes)), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ActivationLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/broadcast.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/broadcast.cpp index ecce5efda..5503590b8 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/broadcast.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/broadcast.cpp @@ -23,7 +23,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestNumpyBroadcast1, ::testing::Values(ov::op::BroadcastType::NUMPY), ::testing::Values(ov::Shape{3, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_TestNumpyBroadcast2, @@ -33,7 +33,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestNumpyBroadcast2, ::testing::Values(ov::op::BroadcastType::NUMPY), ::testing::Values(ov::Shape{1, 4, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_TestNumpyBroadcast3, @@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestNumpyBroadcast3, ::testing::Values(ov::op::BroadcastType::NUMPY), ::testing::Values(ov::Shape{3, 1, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_TestNumpyBroadcast4, @@ -53,7 +53,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestNumpyBroadcast4, ::testing::Values(ov::op::BroadcastType::NUMPY), ::testing::Values(ov::Shape{1, 3, 1, 3, 1, 3, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); // BIDIRECTIONAL MODE @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestBidirectionalBroadcast1, ::testing::Values(ov::op::BroadcastType::BIDIRECTIONAL), ::testing::Values(ov::Shape{4, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_TestBidirectionalBroadcast2, @@ -75,7 +75,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestBidirectionalBroadcast2, ::testing::Values(ov::op::BroadcastType::BIDIRECTIONAL), ::testing::Values(ov::Shape{1, 4, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_TestBidirectionalBroadcas3, @@ -85,7 +85,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestBidirectionalBroadcas3, ::testing::Values(ov::op::BroadcastType::BIDIRECTIONAL), ::testing::Values(ov::Shape{4, 1, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); // EXPLICIT MODE @@ -97,7 +97,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestExplicitBroadcast1, ::testing::Values(ov::op::BroadcastType::EXPLICIT), ::testing::Values(ov::Shape{3, 1}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_TestExplicitBroadcast2, @@ -107,7 +107,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestExplicitBroadcast2, ::testing::Values(ov::op::BroadcastType::EXPLICIT), ::testing::Values(ov::Shape{5, 7}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_TestExplicitBroadcast3, @@ -117,7 +117,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TestExplicitBroadcast3, ::testing::Values(ov::op::BroadcastType::EXPLICIT), ::testing::Values(ov::Shape{4, 7, 6}), // input shape ::testing::ValuesIn(inputPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); // YOLOv5 operators @@ -134,7 +134,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_BroadcastTest1, ::testing::Values(ov::op::BroadcastType::BIDIRECTIONAL), ::testing::Values(ov::Shape{1, 3, 80, 80, 2}), ::testing::ValuesIn(precisionsYOLOv5), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_BroadcastTest2, @@ -144,7 +144,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_BroadcastTest2, ::testing::Values(ov::op::BroadcastType::BIDIRECTIONAL), ::testing::Values(ov::Shape{1, 3, 40, 40, 2}), ::testing::ValuesIn(precisionsYOLOv5), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_BroadcastTest3, @@ -154,7 +154,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_BroadcastTest3, ::testing::Values(ov::op::BroadcastType::BIDIRECTIONAL), ::testing::Values(ov::Shape{1, 3, 20, 20, 2}), ::testing::ValuesIn(precisionsYOLOv5), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), BroadcastLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp index 9ffb1cadd..4e8c0d6c7 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp @@ -52,22 +52,22 @@ std::vector secondInputTypes = { std::map additional_config = {}; const auto smokeComparisonTestParams = - ::testing::Combine(::testing::ValuesIn(CommonTestUtils::combineParams(smokeShapes)), + ::testing::Combine(::testing::ValuesIn(ov::test::utils::combineParams(smokeShapes)), ::testing::ValuesIn(inputsPrecisions), ::testing::ValuesIn(comparisonOpTypes), ::testing::ValuesIn(secondInputTypes), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); -const auto comparisonTestParams = ::testing::Combine(::testing::ValuesIn(CommonTestUtils::combineParams(shapes)), +const auto comparisonTestParams = ::testing::Combine(::testing::ValuesIn(ov::test::utils::combineParams(shapes)), ::testing::ValuesIn(inputsPrecisions), ::testing::ValuesIn(comparisonOpTypes), ::testing::ValuesIn(secondInputTypes), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(smoke_ComparisonCompareWithRefs, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/concat.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/concat.cpp index ef19c7654..e6568ce69 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/concat.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/concat.cpp @@ -33,7 +33,7 @@ INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConcatLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert.cpp index 8f175de89..c153ecd06 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert.cpp @@ -58,7 +58,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConversionLayerTest_From_F32, ::testing::ValuesIn(out_precisions), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConversionLayerTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_ConversionLayerTest_To_F32, @@ -69,7 +69,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_ConversionLayerTest_To_F32, ::testing::Values(Precision::FP32), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConversionLayerTest::getTestCaseName); /* TODO Uncomment when BF16 support is implemented @@ -80,7 +80,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvertLayerTest_From_BF16, ConversionCUDALayerTes ::testing::ValuesIn(precisions), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvertLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_ConvertLayerTest_To_BF16, ConversionCUDALayerTest, ::testing::Combine( @@ -89,7 +89,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvertLayerTest_To_BF16, ConversionCUDALayerTest, ::testing::Values(Precision::BF16), ::testing::Values(Layout::ANY), ::testing::Values(Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvertLayerTest::getTestCaseName); */ } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_i420.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_i420.cpp index 00ef0e52e..ef0eabc02 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_i420.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_i420.cpp @@ -122,7 +122,7 @@ const auto testCase_values = ::testing::Combine(::testing::ValuesIn(inShapes_nhw ::testing::ValuesIn(inTypes), ::testing::Bool(), ::testing::Bool(), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_TestsConvertColorI420, ConvertColorI420CUDALayerTest, @@ -133,7 +133,7 @@ const auto testCase_accuracy_values = ::testing::Combine(::testing::Values(ov::S ::testing::Values(ov::element::u8), ::testing::Values(false), ::testing::Values(true), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_TestsConvertColorI420_acc, ConvertColorI420CUDAAccuracyTest, @@ -144,7 +144,7 @@ const auto testCase_accuracy_values_nightly = ::testing::Combine(::testing::Valu ::testing::Values(ov::element::u8), ::testing::Values(false), ::testing::Values(true), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(nightly_TestsConvertColorI420_acc, ConvertColorI420CUDAAccuracyTest, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_nv12.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_nv12.cpp index 636ad50df..eacc64a0e 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_nv12.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convert_color_nv12.cpp @@ -43,7 +43,7 @@ const auto testCase_values = ::testing::Combine(::testing::ValuesIn(inShapes_nhw ::testing::ValuesIn(inTypes), ::testing::Bool(), ::testing::Bool(), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_TestsConvertColorNV12, ConvertColorNV12CUDALayerTest, @@ -63,7 +63,7 @@ const auto testCase_accuracy_values = ::testing::Combine(::testing::Values(ov::S ::testing::Values(ov::element::u8), ::testing::Values(false), ::testing::Values(true), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(smoke_TestsConvertColorNV12_acc, ConvertColorNV12CUDAAccuracyTest, @@ -74,7 +74,7 @@ const auto testCase_accuracy_values_nightly = ::testing::Combine(::testing::Valu ::testing::Values(ov::element::u8), ::testing::Values(false), ::testing::Values(true), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_SUITE_P(nightly_TestsConvertColorNV12_acc, ConvertColorNV12CUDAAccuracyTest, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp index 651e82eff..974da8370 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp @@ -95,7 +95,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_ExplicitPaddingSymmetric1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_ExplicitPaddingSymmetric2, ConvolutionLayerThresholdTest, @@ -106,7 +106,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_ExplicitPaddingSymmetric2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_ExplicitPaddingAsymmetric1, ConvolutionLayerThresholdTest, @@ -117,7 +117,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_ExplicitPaddingAsymmetric1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_ExplicitPaddingAsymmetric2, ConvolutionLayerThresholdTest, @@ -128,7 +128,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_ExplicitPaddingAsymmetric2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_AutoPadValid, @@ -140,7 +140,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution1D_AutoPadValid, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); /* ============= 2D Convolution ============= */ @@ -199,7 +199,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingSymmetric1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingSymmetric2_FP32, @@ -211,7 +211,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingSymmetric2_FP32, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingSymmetric2, @@ -223,7 +223,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingSymmetric2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingAsymmetric1, @@ -235,7 +235,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingAsymmetric1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingAsymmetric2, @@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPaddingAsymmetric2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, @@ -259,7 +259,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); /* ============= 3D Convolution ============= */ @@ -317,7 +317,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPaddingSymmetric1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPaddingSymmetric2, @@ -329,7 +329,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPaddingSymmetric2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPaddingAsymmetric1, @@ -341,7 +341,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPaddingAsymmetric1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPaddingAsymmetric2, @@ -353,7 +353,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPaddingAsymmetric2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_AutoPadValid, @@ -365,7 +365,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_AutoPadValid, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 10, 10, 10})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); // ============================================================================= @@ -394,7 +394,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 2, 1000})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -420,7 +420,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 1000})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -446,7 +446,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 1000})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -472,7 +472,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 80, 1000})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -498,7 +498,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -524,7 +524,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -550,7 +550,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -576,7 +576,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 114, 114})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -602,7 +602,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -628,7 +628,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -654,7 +654,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -680,7 +680,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -706,7 +706,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 58, 58})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -732,7 +732,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -758,7 +758,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -784,7 +784,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -810,7 +810,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -836,7 +836,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 2048, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -862,7 +862,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -888,7 +888,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -914,7 +914,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -940,7 +940,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -966,7 +966,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -992,7 +992,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1018,7 +1018,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1044,7 +1044,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1070,7 +1070,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1096,7 +1096,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1122,7 +1122,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 232, 232})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1148,7 +1148,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1174,7 +1174,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 232, 232})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1200,7 +1200,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1226,7 +1226,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1252,7 +1252,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1278,7 +1278,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 48, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1304,7 +1304,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1330,7 +1330,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1356,7 +1356,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1382,7 +1382,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1408,7 +1408,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1434,7 +1434,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1460,7 +1460,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1486,7 +1486,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1512,7 +1512,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1538,7 +1538,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1564,7 +1564,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1590,7 +1590,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1616,7 +1616,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 226, 226})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1642,7 +1642,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1668,7 +1668,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1694,7 +1694,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1720,7 +1720,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1746,7 +1746,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 5, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1772,7 +1772,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1798,7 +1798,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1824,7 +1824,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 227, 227})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1850,7 +1850,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 226, 226})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1876,7 +1876,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1902,7 +1902,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 114, 114})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1928,7 +1928,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 104, 104})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1954,7 +1954,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 152, 152})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -1980,7 +1980,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2006,7 +2006,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2032,7 +2032,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 52, 52})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2058,7 +2058,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2084,7 +2084,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 416, 416})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2110,7 +2110,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 608, 608})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2136,7 +2136,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 26, 26})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2162,7 +2162,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2188,7 +2188,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 208, 208})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2214,7 +2214,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 304, 304})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2240,7 +2240,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 12, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2266,7 +2266,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 112, 112})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2292,7 +2292,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2318,7 +2318,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2344,7 +2344,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2370,7 +2370,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2396,7 +2396,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2422,7 +2422,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2448,7 +2448,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2474,7 +2474,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2500,7 +2500,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2526,7 +2526,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2552,7 +2552,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2578,7 +2578,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 48, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2604,7 +2604,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2630,7 +2630,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2656,7 +2656,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2682,7 +2682,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 112, 112})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2708,7 +2708,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2734,7 +2734,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2760,7 +2760,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2786,7 +2786,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2812,7 +2812,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2838,7 +2838,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2864,7 +2864,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2890,7 +2890,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2916,7 +2916,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2942,7 +2942,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2968,7 +2968,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -2994,7 +2994,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3020,7 +3020,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3046,7 +3046,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3072,7 +3072,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({64, 106, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3098,7 +3098,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({64, 128, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3124,7 +3124,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3150,7 +3150,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3176,7 +3176,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 10, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3202,7 +3202,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 13, 13})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3228,7 +3228,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 13, 13})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3254,7 +3254,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3280,7 +3280,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3306,7 +3306,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3332,7 +3332,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3358,7 +3358,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3384,7 +3384,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3410,7 +3410,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3436,7 +3436,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3462,7 +3462,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3488,7 +3488,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 112, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3514,7 +3514,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 112, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3540,7 +3540,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3566,7 +3566,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3592,7 +3592,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3618,7 +3618,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3644,7 +3644,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3670,7 +3670,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 104, 104})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3696,7 +3696,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 152, 152})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3722,7 +3722,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 152, 152})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3748,7 +3748,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 16, 16})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3774,7 +3774,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 2, 2})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3800,7 +3800,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3826,7 +3826,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3852,7 +3852,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 3, 3})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3878,7 +3878,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 304, 304})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3904,7 +3904,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 32, 32})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3930,7 +3930,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3956,7 +3956,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -3982,7 +3982,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4008,7 +4008,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 52, 52})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4034,7 +4034,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4060,7 +4060,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4086,7 +4086,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4112,7 +4112,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4138,7 +4138,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1280, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4164,7 +4164,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1280, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4190,7 +4190,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1280, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4216,7 +4216,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4242,7 +4242,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4268,7 +4268,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4294,7 +4294,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 75, 75})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4320,7 +4320,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4346,7 +4346,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1536, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4372,7 +4372,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1536, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4398,7 +4398,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4424,7 +4424,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4450,7 +4450,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 150, 150})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4476,7 +4476,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4502,7 +4502,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4528,7 +4528,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 64, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4554,7 +4554,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 160, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4580,7 +4580,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 160, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4606,7 +4606,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 160, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4632,7 +4632,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 160, 73, 73})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4658,7 +4658,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4684,7 +4684,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4710,7 +4710,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4736,7 +4736,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4762,7 +4762,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4788,7 +4788,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4814,7 +4814,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4840,7 +4840,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4866,7 +4866,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4892,7 +4892,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1920, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4918,7 +4918,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1920, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4944,7 +4944,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 20, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4970,7 +4970,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 2048, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -4996,7 +4996,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 2048, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5022,7 +5022,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 224, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5048,7 +5048,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 224, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5074,7 +5074,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 224, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5100,7 +5100,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 24, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5126,7 +5126,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 24, 75, 75})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5152,7 +5152,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5178,7 +5178,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5204,7 +5204,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5230,7 +5230,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5256,7 +5256,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5282,7 +5282,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5308,7 +5308,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 16, 16})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5334,7 +5334,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5360,7 +5360,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5386,7 +5386,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 2, 2})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5412,7 +5412,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 2, 2})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5438,7 +5438,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 2, 2})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5464,7 +5464,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 26, 26})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5490,7 +5490,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 26, 26})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5516,7 +5516,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 3, 3})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5542,7 +5542,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 3, 3})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5568,7 +5568,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 3, 3})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5594,7 +5594,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5620,7 +5620,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5646,7 +5646,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5672,7 +5672,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5698,7 +5698,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5724,7 +5724,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 52, 52})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5750,7 +5750,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 52, 52})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5776,7 +5776,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5802,7 +5802,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5828,7 +5828,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5854,7 +5854,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5880,7 +5880,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 76, 76})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5906,7 +5906,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5932,7 +5932,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 28, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5958,7 +5958,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 416, 416})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -5984,7 +5984,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 608, 608})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6010,7 +6010,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6036,7 +6036,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6062,7 +6062,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 147, 147})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6088,7 +6088,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 150, 150})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6114,7 +6114,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 208, 208})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6140,7 +6140,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6166,7 +6166,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6192,7 +6192,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 304, 304})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6218,7 +6218,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 32, 32})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6244,7 +6244,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6270,7 +6270,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6296,7 +6296,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 64, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6322,7 +6322,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 320, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6348,7 +6348,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 320, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6374,7 +6374,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 320, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6400,7 +6400,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 320, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6426,7 +6426,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 320, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6452,7 +6452,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6478,7 +6478,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6504,7 +6504,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6530,7 +6530,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6556,7 +6556,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6582,7 +6582,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 52, 52})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6608,7 +6608,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6634,7 +6634,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6660,7 +6660,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6686,7 +6686,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 4, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6712,7 +6712,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 4, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6738,7 +6738,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 40, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6764,7 +6764,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 40, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6790,7 +6790,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 448, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6816,7 +6816,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 48, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6842,7 +6842,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6868,7 +6868,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6894,7 +6894,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6920,7 +6920,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 5, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6946,7 +6946,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 5, 224, 224})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6972,7 +6972,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 13, 13})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -6998,7 +6998,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 13, 13})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7024,7 +7024,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7050,7 +7050,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7076,7 +7076,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7102,7 +7102,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7128,7 +7128,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 26, 26})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7154,7 +7154,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 26, 26})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7180,7 +7180,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7206,7 +7206,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7232,7 +7232,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7258,7 +7258,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7284,7 +7284,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7310,7 +7310,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7336,7 +7336,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7362,7 +7362,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7388,7 +7388,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7414,7 +7414,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7440,7 +7440,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7466,7 +7466,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7492,7 +7492,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7518,7 +7518,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7544,7 +7544,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7570,7 +7570,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7596,7 +7596,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7622,7 +7622,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7648,7 +7648,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7674,7 +7674,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7700,7 +7700,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7726,7 +7726,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7752,7 +7752,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7778,7 +7778,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7804,7 +7804,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7830,7 +7830,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 6, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7856,7 +7856,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7882,7 +7882,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7908,7 +7908,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7934,7 +7934,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 104, 104})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7960,7 +7960,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 152, 152})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -7986,7 +7986,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 152, 152})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8012,7 +8012,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 16, 16})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8038,7 +8038,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8064,7 +8064,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 200, 342})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8090,7 +8090,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 200, 342})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8116,7 +8116,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 208, 208})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8142,7 +8142,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 304, 304})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8168,7 +8168,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 304, 304})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8194,7 +8194,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 32, 32})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8220,7 +8220,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8246,7 +8246,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8272,7 +8272,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8298,7 +8298,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8324,7 +8324,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8350,7 +8350,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 64, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8376,7 +8376,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 73, 73})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8402,7 +8402,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 73, 73})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8428,7 +8428,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8454,7 +8454,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8480,7 +8480,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8506,7 +8506,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 768, 26, 26})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8532,7 +8532,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 8, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8558,7 +8558,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 80, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8584,7 +8584,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 80, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8610,7 +8610,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 1, 1})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8636,7 +8636,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8662,7 +8662,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8688,7 +8688,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8714,7 +8714,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8740,7 +8740,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 50, 86})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8766,7 +8766,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 75, 75})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8792,7 +8792,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 960, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8818,7 +8818,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 960, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8844,7 +8844,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 1024, 15, 15})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8870,7 +8870,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 1024, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8896,7 +8896,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 1024, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8922,7 +8922,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 1024, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8948,7 +8948,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 1024, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -8974,7 +8974,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 160, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9000,7 +9000,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 192, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9026,7 +9026,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 192, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9052,7 +9052,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 192, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9078,7 +9078,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 224, 4, 4})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9104,7 +9104,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 256, 15, 15})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9130,7 +9130,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 576, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9156,7 +9156,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 576, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9182,7 +9182,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9208,7 +9208,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 300, 300})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9234,7 +9234,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 640, 640})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9260,7 +9260,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 100, 171})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9286,7 +9286,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 128, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9312,7 +9312,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({100, 256, 7, 7})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9338,7 +9338,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9364,7 +9364,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 18, 18, 18})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9390,7 +9390,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 36, 36, 36})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9416,7 +9416,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 9, 9, 9})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9442,7 +9442,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9468,7 +9468,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 72, 72, 72})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9494,7 +9494,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 18, 18, 18})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9520,7 +9520,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 9, 9, 9})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9546,7 +9546,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9572,7 +9572,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 36, 36, 36})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9598,7 +9598,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 72, 72, 72})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9624,7 +9624,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 18, 18, 18})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9650,7 +9650,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 36, 36, 36})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9676,7 +9676,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 72, 72, 72})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9702,7 +9702,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9728,7 +9728,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 24, 400, 683})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9754,7 +9754,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 149, 149})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9780,7 +9780,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 73, 73})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9806,7 +9806,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9832,7 +9832,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9858,7 +9858,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9884,7 +9884,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9910,7 +9910,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9936,7 +9936,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9962,7 +9962,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -9988,7 +9988,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10014,7 +10014,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10040,7 +10040,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10066,7 +10066,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10092,7 +10092,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10118,7 +10118,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10144,7 +10144,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10170,7 +10170,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10196,7 +10196,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10222,7 +10222,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10248,7 +10248,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 71, 71})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10274,7 +10274,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 224, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10300,7 +10300,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10326,7 +10326,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 299, 299})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10352,7 +10352,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 320, 17, 17})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10378,7 +10378,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 35, 35})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10404,7 +10404,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10430,7 +10430,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 147, 147})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); @@ -10456,7 +10456,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionLayerThresholdTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_asym_pad.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_asym_pad.cpp index 0a10b6357..edef4f427 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_asym_pad.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_asym_pad.cpp @@ -42,7 +42,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionAsymPadCUDA2D_Run, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(inputShapes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionAsymPadCUDALayerTest::getTestCaseName); } // namespace } // namespace CUDALayerTestsDefinitions diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index bfe1c4751..36bd64dbb 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -59,14 +59,14 @@ class ConvolutionBackpropDataExtendedLayerTest convBackpropDataParams; std::ostringstream result; - result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; - result << "OSD=" << CommonTestUtils::vec2str(outputShapeData) << "_"; - result << "K" << CommonTestUtils::vec2str(kernel) << "_"; - result << "S" << CommonTestUtils::vec2str(stride) << "_"; - result << "PB" << CommonTestUtils::vec2str(padBegin) << "_"; - result << "PE" << CommonTestUtils::vec2str(padEnd) << "_"; - result << "D=" << CommonTestUtils::vec2str(dilation) << "_"; - result << "OP=" << CommonTestUtils::vec2str(outputPad) << "_"; + result << "IS=" << ov::test::utils::vec2str(inputShapes) << "_"; + result << "OSD=" << ov::test::utils::vec2str(outputShapeData) << "_"; + result << "K" << ov::test::utils::vec2str(kernel) << "_"; + result << "S" << ov::test::utils::vec2str(stride) << "_"; + result << "PB" << ov::test::utils::vec2str(padBegin) << "_"; + result << "PE" << ov::test::utils::vec2str(padEnd) << "_"; + result << "D=" << ov::test::utils::vec2str(dilation) << "_"; + result << "OP=" << ov::test::utils::vec2str(outputPad) << "_"; result << "O=" << convOutChannels << "_"; result << "AP=" << padType << "_"; result << "netPRC=" << netPrecision.name() << "_"; @@ -226,7 +226,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_0, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_0), ::testing::Values(output2D_group_0), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'dilations': '1,1', 'strides': '2,2'} @@ -242,7 +242,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_0, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_0), ::testing::Values(output2D_group_0), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -275,7 +275,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_1), ::testing::Values(output2D_group_1), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -291,7 +291,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_1), ::testing::Values(output2D_group_1), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -324,7 +324,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_2), ::testing::Values(output2D_group_2), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -340,7 +340,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_2), ::testing::Values(output2D_group_2), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -372,7 +372,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_3), ::testing::Values(output2D_group_3), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -388,7 +388,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_3), ::testing::Values(output2D_group_3), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -420,7 +420,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_4), ::testing::Values(output2D_group_4), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -436,7 +436,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_4), ::testing::Values(output2D_group_4), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'explicit', 'dilations': '1,1', 'strides': '2,2'} @@ -468,7 +468,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AsymPad_group_5, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_5), ::testing::Values(output2D_group_5), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AsymPad_group_5, ConvolutionBackpropDataExtendedLayerTest, @@ -480,7 +480,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AsymPad_group_5, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_5), ::testing::Values(output2D_group_5), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); /* ============= ConvolutionBackpropData params (3D) ============= */ @@ -513,7 +513,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_0, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_0), ::testing::Values(output3D_group_0), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'dilations': '1,1,1', 'strides': '2,2,2'} @@ -529,7 +529,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_0, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_0), ::testing::Values(output3D_group_0), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -561,7 +561,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_1), ::testing::Values(output3D_group_1), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -577,7 +577,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_1), ::testing::Values(output3D_group_1), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -609,7 +609,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_2), ::testing::Values(output3D_group_2), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -625,7 +625,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_2), ::testing::Values(output3D_group_2), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -657,7 +657,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_3), ::testing::Values(output3D_group_3), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -673,7 +673,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_3), ::testing::Values(output3D_group_3), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -705,7 +705,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_4), ::testing::Values(output3D_group_4), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -721,7 +721,7 @@ INSTANTIATE_TEST_CASE_P(Convolution3D_group_4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_4), ::testing::Values(output3D_group_4), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'padbegin': '2,2,2', 'padend': '2,2,2', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -753,7 +753,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_group_5, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_5), ::testing::Values(output3D_group_5), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'padbegin': '2,2,2', 'padend': '2,2,2', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -769,7 +769,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_group_5, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_5), ::testing::Values(output3D_group_5), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -801,7 +801,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_group_6, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_6), ::testing::Values(output3D_group_6), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -817,7 +817,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_group_6, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_6), ::testing::Values(output3D_group_6), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'explicit', 'dilations': '1,1,1', 'strides': '2,2,2'} @@ -849,7 +849,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_AsymPad_group_7, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_7), ::testing::Values(output3D_group_7), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_AsymPad_group_7, ConvolutionBackpropDataExtendedLayerTest, @@ -861,7 +861,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_AsymPad_group_7, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input3D_group_7), ::testing::Values(output3D_group_7), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // ============================================================================= @@ -892,7 +892,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 128, 16, 16}), // Input shape ::testing::Values(InferenceEngine::SizeVector {32, 32}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -920,7 +920,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 256, 8, 8}), // Input shape ::testing::Values(InferenceEngine::SizeVector {16, 16}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -948,7 +948,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 32, 64, 64}), // Input shape ::testing::Values(InferenceEngine::SizeVector {128, 128}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -976,7 +976,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 64, 32, 32}), // Input shape ::testing::Values(InferenceEngine::SizeVector {64, 64}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -1004,7 +1004,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {64, 128, 7, 7}), // Input shape ::testing::Values(InferenceEngine::SizeVector {14, 14}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -1032,7 +1032,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {64, 64, 14, 14}), // Input shape ::testing::Values(InferenceEngine::SizeVector {28, 28}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -1060,7 +1060,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 128, 18, 18, 18}), // Input shape ::testing::Values(InferenceEngine::SizeVector {36, 36, 36}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -1088,7 +1088,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 256, 9, 9, 9}), // Input shape ::testing::Values(InferenceEngine::SizeVector {18, 18, 18}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -1116,7 +1116,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 32, 72, 72, 72}), // Input shape ::testing::Values(InferenceEngine::SizeVector {144, 144, 144}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); @@ -1144,7 +1144,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(InferenceEngine::SizeVector {1, 64, 36, 36, 36}), // Input shape ::testing::Values(InferenceEngine::SizeVector {72, 72, 72}), // Output shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name ConvolutionBackpropDataExtendedLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp index 4581b7d89..43b00ad26 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp @@ -58,13 +58,13 @@ class ConvolutionBackpropDataAddExtendedLayerTest convBackpropDataParams; std::ostringstream result; - result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; - result << "OSD=" << CommonTestUtils::vec2str(outputShapeData) << "_"; - result << "K" << CommonTestUtils::vec2str(kernel) << "_"; - result << "S" << CommonTestUtils::vec2str(stride) << "_"; - result << "PB" << CommonTestUtils::vec2str(padBegin) << "_"; - result << "PE" << CommonTestUtils::vec2str(padEnd) << "_"; - result << "D=" << CommonTestUtils::vec2str(dilation) << "_"; + result << "IS=" << ov::test::utils::vec2str(inputShapes) << "_"; + result << "OSD=" << ov::test::utils::vec2str(outputShapeData) << "_"; + result << "K" << ov::test::utils::vec2str(kernel) << "_"; + result << "S" << ov::test::utils::vec2str(stride) << "_"; + result << "PB" << ov::test::utils::vec2str(padBegin) << "_"; + result << "PE" << ov::test::utils::vec2str(padEnd) << "_"; + result << "D=" << ov::test::utils::vec2str(dilation) << "_"; result << "O=" << convOutChannels << "_"; result << "AP=" << padType << "_"; result << "netPRC=" << netPrecision.name() << "_"; @@ -215,7 +215,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_group_0, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_0), ::testing::Values(output2D_group_0), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_lower', 'dilations': '1,1', 'strides': '2,2'} @@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AsymPad_group_1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_1), ::testing::Values(output2D_group_1), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'same_upper', 'dilations': '1,1', 'strides': '2,2'} @@ -279,7 +279,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AsymPad_group_2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_2), ::testing::Values(output2D_group_2), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'explicit', 'dilations': '1,1', 'strides': '2,2'} @@ -311,7 +311,7 @@ INSTANTIATE_TEST_CASE_P(Convolution2D_AsymPad_group_3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_3), ::testing::Values(output2D_group_3), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); // Attributes: {'auto_pad': 'explicit', 'dilations': '1,1', 'strides': '2,2'} @@ -343,7 +343,7 @@ INSTANTIATE_TEST_CASE_P(Convolution2D_AsymPad_group_4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(input2D_group_4), ::testing::Values(output2D_group_4), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); // ============================================================================= @@ -374,7 +374,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 128, 16, 16}), // Input shape ::testing::Values(InferenceEngine::SizeVector {32, 32}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); @@ -402,7 +402,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 256, 8, 8}), // Input shape ::testing::Values(InferenceEngine::SizeVector {16, 16}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); @@ -430,7 +430,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 32, 64, 64}), // Input shape ::testing::Values(InferenceEngine::SizeVector {128, 128}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); @@ -458,7 +458,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 64, 32, 32}), // Input shape ::testing::Values(InferenceEngine::SizeVector {64, 64}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); @@ -486,7 +486,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 128, 18, 18, 18}), // Input shape ::testing::Values(InferenceEngine::SizeVector {36, 36, 36}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); @@ -514,7 +514,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 256, 9, 9, 9}), // Input shape ::testing::Values(InferenceEngine::SizeVector {18, 18, 18}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); @@ -542,7 +542,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 32, 72, 72, 72}), // Input shape ::testing::Values(InferenceEngine::SizeVector {144, 144, 144}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); @@ -570,7 +570,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {1, 64, 36, 36, 36}), // Input shape ::testing::Values(InferenceEngine::SizeVector {72, 72, 72}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ConvolutionBackpropDataAddExtendedLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp index df8581576..e0a8c87ae 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp @@ -151,7 +151,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -165,7 +165,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -179,7 +179,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -193,7 +193,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -207,7 +207,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -221,7 +221,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -242,7 +242,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::Values(ngraph::helpers::ActivationTypes::None)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -267,7 +267,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -290,7 +290,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -313,7 +313,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 14, 14})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -336,7 +336,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 224, 224})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -359,7 +359,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -382,7 +382,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -405,7 +405,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -428,7 +428,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 14, 14})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -451,7 +451,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -474,7 +474,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -497,7 +497,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 14, 14})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -520,7 +520,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -543,7 +543,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -566,7 +566,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -589,7 +589,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -612,7 +612,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 2048, 7, 7})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -635,7 +635,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -658,7 +658,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 7, 7})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -681,7 +681,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -704,7 +704,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -727,7 +727,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 7, 7})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -750,7 +750,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -773,7 +773,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1024, 14, 14})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -796,7 +796,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 224, 224})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -819,7 +819,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 3, 224, 224})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -842,7 +842,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -865,7 +865,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -888,7 +888,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 512, 14, 14})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -911,7 +911,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 28, 28})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -934,7 +934,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 56, 56})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -957,7 +957,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 112, 112})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -980,7 +980,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 112, 112})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1003,7 +1003,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 112, 112})), // Input shapes - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1042,7 +1042,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1070,7 +1070,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 16, 16})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1098,7 +1098,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 32, 32})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1126,7 +1126,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1154,7 +1154,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1182,7 +1182,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 64, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1210,7 +1210,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 16, 16})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1238,7 +1238,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 8, 8})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1266,7 +1266,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1294,7 +1294,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 32, 32})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1322,7 +1322,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 64, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1350,7 +1350,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 16, 16})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1378,7 +1378,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 32, 32})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1406,7 +1406,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 64, 64})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1434,7 +1434,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1462,7 +1462,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 18, 18, 18})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1490,7 +1490,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 36, 36, 36})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1518,7 +1518,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 9, 9, 9})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1546,7 +1546,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1574,7 +1574,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 72, 72, 72})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1602,7 +1602,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 18, 18, 18})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1630,7 +1630,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 9, 9, 9})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1658,7 +1658,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1686,7 +1686,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 36, 36, 36})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1714,7 +1714,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 72, 72, 72})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1742,7 +1742,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 18, 18, 18})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1770,7 +1770,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 36, 36, 36})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1798,7 +1798,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 72, 72, 72})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1826,7 +1826,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 128, 128})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); @@ -1854,7 +1854,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 144, 144, 144})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu})), ConvolutionBiasAddActivationLayerFiniteComparerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp index 1903b07ee..a1d4d9d76 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp @@ -194,7 +194,7 @@ void CudaEltwiseLayerTest::SetUp() { ov::test::ElementType in_prc; ov::test::ElementType out_prc; ngraph::helpers::InputLayerType secondaryInputType; - CommonTestUtils::OpType opType; + ov::test::utils::OpType opType; ngraph::helpers::EltwiseTypes eltwiseType; ov::AnyMap additionalConfig; const ov::test::subgraph::EltwiseTestParams ew_params = std::get<0>(this->GetParam()); @@ -212,11 +212,11 @@ void CudaEltwiseLayerTest::SetUp() { ov::PartialShape shape_input_secondary; switch (opType) { - case CommonTestUtils::OpType::SCALAR: { + case ov::test::utils::OpType::SCALAR: { shape_input_secondary = {1}; break; } - case CommonTestUtils::OpType::VECTOR: + case ov::test::utils::OpType::VECTOR: shape_input_secondary = inputDynamicShapes.back(); break; default: diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/detection_output.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/detection_output.cpp index e14244594..d0bb10c81 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/detection_output.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/detection_output.cpp @@ -20,15 +20,15 @@ struct TestDetectionOutputResult { template static bool similar(const TDataType &res, const TOtherDataType &ref) { - const auto absoluteDifference = CommonTestUtils::ie_abs(res - ref); + const auto absoluteDifference = ov::test::utils::ie_abs(res - ref); if (absoluteDifference <= threshold) { return true; } double max; if (sizeof(TDataType) < sizeof(TOtherDataType)) { - max = std::max(CommonTestUtils::ie_abs(TOtherDataType(res)), CommonTestUtils::ie_abs(ref)); + max = std::max(ov::test::utils::ie_abs(TOtherDataType(res)), ov::test::utils::ie_abs(ref)); } else { - max = std::max(CommonTestUtils::ie_abs(res), CommonTestUtils::ie_abs(TDataType(ref))); + max = std::max(ov::test::utils::ie_abs(res), ov::test::utils::ie_abs(TDataType(ref))); } double diff = static_cast(absoluteDifference) / max; if (max == 0 || (diff > static_cast(threshold)) || std::isnan(static_cast(res)) || @@ -203,7 +203,7 @@ const auto params3Inputs = ::testing::Combine(commonAttributes, ::testing::ValuesIn(specificParams3In), ::testing::ValuesIn(numberBatch), ::testing::Values(0.0f), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_DetectionOutput3In, CudaDetectionOutputLayerTest, @@ -227,7 +227,7 @@ const auto params5Inputs = ::testing::Combine(commonAttributes, ::testing::ValuesIn(specificParams5In), ::testing::ValuesIn(numberBatch), ::testing::Values(objectnessScore), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_DetectionOutput5In, CudaDetectionOutputLayerTest, @@ -267,7 +267,7 @@ const auto paramsSSDMobileNetInputs = ::testing::Combine(commonAttributesSSDMobi ::testing::ValuesIn(specificParamsSSDMobileNetIn), ::testing::ValuesIn(numberBatchSSDMobileNet), ::testing::Values(objectnessScoreSSDMobileNet), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(DetectionOutputSSDMobileNetIn, CudaDetectionOutputLayerTest, @@ -307,7 +307,7 @@ const auto paramsEfficientDetInputs = ::testing::Combine(commonAttributesEfficie ::testing::ValuesIn(specificParamsEfficientDetIn), ::testing::ValuesIn(numberBatchEfficientDet), ::testing::Values(objectnessScoreEfficientDet), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); // NOTE: Too many elements with similar confidence that leads test to fail INSTANTIATE_TEST_CASE_P(DISABLED_DetectionOutputEfficientDetIn, @@ -332,7 +332,7 @@ const auto paramsEfficientDetInputs = ::testing::Combine(commonAttributesEfficie ::testing::ValuesIn(specificParamsEfficientDetIn), ::testing::ValuesIn(numberBatchEfficientDet), ::testing::Values(objectnessScoreEfficientDet), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(DetectionOutputEfficientDetIn, CudaDetectionOutputLayerBenchmarkTest, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp index a376281de..b5ec013f4 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp @@ -36,8 +36,8 @@ const std::vector> smoke_shapes = {{{1, 2, 3, 4, 5}, {1, {{10, 10}, {1}}, {{8, 1, 6, 1}, {7, 1, 5}}}; -const std::vector smoke_op_types = {CommonTestUtils::OpType::SCALAR, - CommonTestUtils::OpType::VECTOR}; +const std::vector smoke_op_types = {ov::test::utils::OpType::SCALAR, + ov::test::utils::OpType::VECTOR}; const std::vector add_precisions = {ov::test::ElementType::f16, ov::test::ElementType::f32, @@ -56,7 +56,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(add_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -72,7 +72,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(ov::test::ElementType::u32), ::testing::Values(ov::test::ElementType::u32), ::testing::Values(ov::test::ElementType::u32), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -88,7 +88,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(ov::test::ElementType::i64), ::testing::Values(ov::test::ElementType::i64), ::testing::Values(ov::test::ElementType::i64), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -107,7 +107,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(mul_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -126,7 +126,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(sub_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -145,7 +145,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(div_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::ValuesIn({OperationMode::NORMAL, OperationMode::PYTHON_DIVIDE})), CudaEltwiseLayerTest::getTestCaseName); @@ -161,7 +161,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(ov::test::ElementType::u32), ::testing::Values(ov::test::ElementType::u32), ::testing::Values(ov::test::ElementType::u32), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::ValuesIn({OperationMode::NORMAL, OperationMode::PYTHON_DIVIDE})), CudaEltwiseLayerTest::getTestCaseName); @@ -177,7 +177,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(ov::test::ElementType::i64), ::testing::Values(ov::test::ElementType::i64), ::testing::Values(ov::test::ElementType::i64), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::ValuesIn({OperationMode::NORMAL, OperationMode::PYTHON_DIVIDE})), CudaEltwiseLayerTest::getTestCaseName); @@ -199,7 +199,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(sq_diff_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -218,7 +218,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(floor_mod_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -234,7 +234,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(ov::test::ElementType::u32), ::testing::Values(ov::test::ElementType::u32), ::testing::Values(ov::test::ElementType::u32), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -250,7 +250,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(ov::test::ElementType::i64), ::testing::Values(ov::test::ElementType::i64), ::testing::Values(ov::test::ElementType::i64), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -274,7 +274,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(mod_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -308,7 +308,7 @@ const std::vector> renset50_vgg16_add_shapes = {{{1, 1000 const std::vector renset50_vgg16_input_precisions = {ov::test::ElementType::f16, ov::test::ElementType::f32}; -const std::vector renset50_vgg16_op_types = {CommonTestUtils::OpType::VECTOR}; +const std::vector renset50_vgg16_op_types = {ov::test::utils::OpType::VECTOR}; INSTANTIATE_TEST_CASE_P( renset50_vgg16_Add, @@ -321,7 +321,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(renset50_vgg16_input_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -348,11 +348,11 @@ INSTANTIATE_TEST_CASE_P( tacotron2_Multiply_shapes)), ::testing::Values(ngraph::helpers::EltwiseTypes::MULTIPLY), ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), - ::testing::Values(CommonTestUtils::OpType::VECTOR), + ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(tacotron2_Multiply_input_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -391,11 +391,11 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), ::testing::Values(ngraph::helpers::EltwiseTypes::ADD), ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), - ::testing::Values(CommonTestUtils::OpType::VECTOR), + ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_add_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -420,11 +420,11 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), ::testing::Values(ngraph::helpers::EltwiseTypes::MULTIPLY), ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), - ::testing::Values(CommonTestUtils::OpType::VECTOR), + ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_mul_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -449,11 +449,11 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), ::testing::Values(ngraph::helpers::EltwiseTypes::SUBTRACT), ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), - ::testing::Values(CommonTestUtils::OpType::VECTOR), + ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_sub_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); @@ -478,11 +478,11 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), ::testing::Values(ngraph::helpers::EltwiseTypes::DIVIDE), ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), - ::testing::Values(CommonTestUtils::OpType::VECTOR), + ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_div_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::ValuesIn({OperationMode::NORMAL, OperationMode::PYTHON_DIVIDE})), CudaEltwiseLayerTest::getTestCaseName); @@ -512,11 +512,11 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), ::testing::Values(ngraph::helpers::EltwiseTypes::MOD), ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), - ::testing::Values(CommonTestUtils::OpType::VECTOR), + ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_mod_precisions), ::testing::Values(ov::test::ElementType::undefined), ::testing::Values(ov::test::ElementType::undefined), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fake_quantize.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fake_quantize.cpp index 352f18932..cfa3e5adf 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fake_quantize.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fake_quantize.cpp @@ -50,7 +50,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDAFakeQuantize, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(config)), FakeQuantizeLayerTest::getTestCaseName); @@ -71,7 +71,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDAFakeQuantizeBr, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapesBr), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(config)), FakeQuantizeLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/finite_comparer.hpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/finite_comparer.hpp index 3ba519c9c..98f7172be 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/finite_comparer.hpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/finite_comparer.hpp @@ -165,15 +165,15 @@ class FiniteLayerComparer : virtual public LayerTestsUtils::LayerTestsCommon { if (to_check_nans && details::equal_nans(ref, res)) { continue; } - const auto absoluteDifference = CommonTestUtils::ie_abs(res - ref); + const auto absoluteDifference = ov::test::utils::ie_abs(res - ref); if (absoluteDifference <= threshold) { continue; } double max; if (sizeof(T_IE) < sizeof(T_NGRAPH)) { - max = std::max(CommonTestUtils::ie_abs(T_NGRAPH(res)), CommonTestUtils::ie_abs(ref)); + max = std::max(ov::test::utils::ie_abs(T_NGRAPH(res)), ov::test::utils::ie_abs(ref)); } else { - max = std::max(CommonTestUtils::ie_abs(res), CommonTestUtils::ie_abs(T_IE(ref))); + max = std::max(ov::test::utils::ie_abs(res), ov::test::utils::ie_abs(T_IE(ref))); } double diff = static_cast(absoluteDifference) / max; if (max == 0 || (diff > static_cast(threshold)) || std::isnan(static_cast(res)) || diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp index b304e9d38..bd74352d6 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp @@ -47,8 +47,8 @@ class FullyConnectedLayerTest : public testing::WithParamInterface @@ -754,8 +754,8 @@ void test_one_shape(const GatherTestParams& params, bool is_v7) { const auto end = std::chrono::steady_clock::now(); microseconds average_exec_time = (end - start) / NUM_ATTEMPTS; std::cout << std::fixed << std::setfill('0') << "Gather_v" << (is_v7 ? "7 " : "1 ") - << CommonTestUtils::vec2str(params.params_shape_) << ", " - << CommonTestUtils::vec2str(params.indices_shape_) << ", axis = " << params.axis_ + << ov::test::utils::vec2str(params.params_shape_) << ", " + << ov::test::utils::vec2str(params.indices_shape_) << ", axis = " << params.axis_ << ", batch_dims = " << params.batch_dims_ << ": " << average_exec_time.count() << " us\n"; } diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/avgpool.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/avgpool.cpp.jinja2 index ec3d99e24..f15f0503b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/avgpool.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/avgpool.cpp.jinja2 @@ -20,7 +20,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{{op.cpp_list_input}}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 index 86da945bf..718a2ec93 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 @@ -16,7 +16,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values({{op.cpp_params_name}}.second), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution.cpp.jinja2 index b7497c9cc..f5c1ec2eb 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution.cpp.jinja2 @@ -18,7 +18,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({{op.cpp_list_input}})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data.cpp.jinja2 index 3577944e8..8c02f3fef 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data.cpp.jinja2 @@ -21,7 +21,7 @@ INSTANTIATE_TEST_CASE_P( {%- if op.has_outputshape_input %} ::testing::Values(InferenceEngine::SizeVector {{op.cpp_list_output_shape}}), // Output shape {%- endif %} - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), // Device name + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Device name {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data_add.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data_add.cpp.jinja2 index 394641514..75a6c2651 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data_add.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_backprop_data_add.cpp.jinja2 @@ -19,7 +19,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::SizeVector {{op.cpp_list_input_shape}}), // Input shape ::testing::Values(InferenceEngine::SizeVector {{op.cpp_list_output_shape}}), // Output spatial shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 index 8dd67108a..312b1b9bb 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 @@ -19,7 +19,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({{op.cpp_list_input}})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{{op.cpp_activations}})), {{op.cpp_test_class_name}}::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution.cpp.jinja2 index 39812b4fe..bdb703ebe 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution.cpp.jinja2 @@ -19,7 +19,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({{op.cpp_list_input}})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 index 53927c69b..cdb888b4a 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 @@ -20,7 +20,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({{op.cpp_list_input}})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{{op.cpp_activations}})), {{op.cpp_test_class_name}}::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.cpp.jinja2 index e91ef45b2..1c365631d 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.cpp.jinja2 @@ -10,7 +10,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn({{op.cpp_secondary_input_types}}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values({{op.cpp_additional_config}})), // additional config {{op.cpp_test_class_name}}::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/maxpool.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/maxpool.cpp.jinja2 index a9d0b6250..8c5f8fa06 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/maxpool.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/maxpool.cpp.jinja2 @@ -20,7 +20,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{{op.cpp_list_input}}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 index 9c0a53bfc..4d13f85f6 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 @@ -11,7 +11,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values({{op.cpp_shape}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 index ec01a489a..fb575046b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 @@ -11,7 +11,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values({{op.cpp_shape}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 index 91fef8c50..2c8badb53 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 @@ -14,7 +14,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values({{op.cpp_shape}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution.cpp index 8a1d66688..59e7d228f 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution.cpp @@ -46,7 +46,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionCUDA2D_Run, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(inputShapes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionCUDALayerTest::getTestCaseName); } // namespace } // namespace CUDALayerTestsDefinitions diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_autogenerated.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_autogenerated.cpp index bb4162765..ff40d9ca0 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_autogenerated.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_autogenerated.cpp @@ -61,7 +61,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 75, 75})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -88,7 +88,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -115,7 +115,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 150, 150})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -142,7 +142,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -169,7 +169,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -196,7 +196,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 960, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -223,7 +223,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 3, 3})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -250,7 +250,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -277,7 +277,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 75, 75})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -304,7 +304,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -331,7 +331,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -358,7 +358,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -385,7 +385,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 2, 2})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -412,7 +412,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 150, 150})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -439,7 +439,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -466,7 +466,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -493,7 +493,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -520,7 +520,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -547,7 +547,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1920, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -574,7 +574,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -601,7 +601,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -628,7 +628,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -655,7 +655,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -682,7 +682,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -709,7 +709,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -736,7 +736,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -763,7 +763,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -790,7 +790,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -817,7 +817,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -844,7 +844,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -871,7 +871,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -898,7 +898,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); @@ -925,7 +925,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvolutionLayerThresholdTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp index 732bee963..05d60ee7c 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp @@ -70,7 +70,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop2D_ExplicitPadding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvBackpropDataLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop2D_AutoPadding, @@ -82,7 +82,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop2D_AutoPadding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvBackpropDataLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop2D_AsymPadding, @@ -94,7 +94,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop2D_AsymPadding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes2D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvBackpropDataLayerTest::getTestCaseName); /* ============= 3D GroupConvolution ============= */ @@ -143,7 +143,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop3D_ExpicitPadding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvBackpropDataLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop3D_AutoPadding, @@ -155,7 +155,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop3D_AutoPadding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvBackpropDataLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop3D_AsymPadding, @@ -167,7 +167,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackprop3D_AsymPadding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputShapes3D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GroupConvBackpropDataLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp index 1325216b2..fe23482bc 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp @@ -65,7 +65,7 @@ const auto smoke_1D_AutoPadValid_Params = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({5, 8, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)); const auto smoke_1D_ExplicitPaddingAsymmetric_Params = ::testing::Combine( @@ -83,7 +83,7 @@ const auto smoke_1D_ExplicitPaddingAsymmetric_Params = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 16, 15})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)); INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAdd_1D_AutoPadValid_Params, @@ -128,7 +128,7 @@ const auto smoke_2D_ExplicitPaddingSymmetric_Params = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 16, 12, 6})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)); const auto smoke_2D_ExplicitPaddingAsymmetric_Params = ::testing::Combine( @@ -146,7 +146,7 @@ const auto smoke_2D_ExplicitPaddingAsymmetric_Params = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({3, 8, 21, 11})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)); INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAdd_2D_ExplicitPaddingSymmetric, @@ -195,7 +195,7 @@ const auto smoke_3D_ExplicitPaddingSymmetric_Params = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 6, 9, 12, 10})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)); const auto smoke_3D_ExplicitPaddingAsymmetric_Params = ::testing::Combine( @@ -213,7 +213,7 @@ const auto smoke_3D_ExplicitPaddingAsymmetric_Params = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({2, 6, 12, 15, 20})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(netActivations)); INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBiasAdd_3D_ExplicitPaddingSymmetric, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp index 374ac0bb6..532bd10b4 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp @@ -44,7 +44,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 163, 163})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -73,7 +73,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 39, 39})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -102,7 +102,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 81, 81})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -131,7 +131,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 256, 11, 11})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -160,7 +160,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 64, 3, 3})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -189,7 +189,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 43, 43})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -218,7 +218,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 151, 151})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 96, 321, 321})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -276,7 +276,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -305,7 +305,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 160, 160})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -334,7 +334,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 75, 75})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -363,7 +363,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 16, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -392,7 +392,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 192, 38, 38})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -421,7 +421,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1920, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -450,7 +450,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 150, 150})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -479,7 +479,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 32, 320, 320})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -508,7 +508,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 384, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -537,7 +537,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -566,7 +566,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -595,7 +595,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 960, 10, 10})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -624,7 +624,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 3, 3})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -653,7 +653,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 128, 5, 5})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -682,7 +682,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 144, 75, 75})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -711,7 +711,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 576, 19, 19})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -740,7 +740,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 1152, 20, 20})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -769,7 +769,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 240, 80, 80})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -798,7 +798,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 480, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); @@ -827,7 +827,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Input layout ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 672, 40, 40})), // Input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), ::testing::ValuesIn(std::vector{ngraph::helpers::ActivationTypes::None})), GroupConvolutionBiasAddActivationLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp index 211cca71a..2168cde31 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp @@ -87,7 +87,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GRUCellCommon_01, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(net_precisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GRUCellTest::getTestCaseName); const size_t smoke_batch_02 = 9; @@ -107,7 +107,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GRUCellCommon_02_FP32, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::Values(InferenceEngine::Precision::FP32), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GRUCellTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_GRUCellCommon_02_FP16, @@ -123,7 +123,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GRUCellCommon_02_FP16, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::Values(InferenceEngine::Precision::FP16), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GRUCellTest::getTestCaseName); // ------------- LPCNet shapes ------------- @@ -144,7 +144,7 @@ INSTANTIATE_TEST_CASE_P(GRUCell_LPCNet, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(net_precisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GRUCellTest::getTestCaseName); } // namespace @@ -161,7 +161,7 @@ const auto benchmark_params = ::testing::Combine(::testing::Values(should_decomp ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::Values(net_precisions[0]), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); namespace benchmark { diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp index 89f601f04..275b1967e 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -175,7 +175,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(direction), ::testing::Values(InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GRUSequenceTest::getTestCaseName); // ------------- Smoke test ------------- @@ -196,7 +196,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(direction), ::testing::Values(InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GRUSequenceTest::getTestCaseName); // ------------- LPCNet shapes ------------- @@ -216,7 +216,7 @@ INSTANTIATE_TEST_CASE_P(LPCNetCUDNNGRUSequenceShapeTest, ::testing::ValuesIn(direction), ::testing::Values(InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), GRUSequenceTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp index fa403b1f0..b10847b79 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/interpolate.cpp @@ -147,7 +147,7 @@ const auto simpleCombine4DScaleParamTests = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(targetShapes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(smoke_Simple_Interpolate_Nearest_4D_Scale_Param_Test, @@ -164,7 +164,7 @@ const auto simpleCombine2DScaleParamTests = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inShapes), ::testing::ValuesIn(targetShapes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(smoke_Simple_Interpolate_Nearest_2D_Scale_Param_Test, @@ -180,7 +180,7 @@ const auto downscaleCombineTests = ::testing::Combine(interpolate4DScaleParams, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(downscaleInShapes), ::testing::ValuesIn(downscaleTargetShapes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(smoke_Downscale_Interpolate_Nearest_Test, CUDAInterpolateLayerTest, @@ -199,7 +199,7 @@ const auto highResolutionCombineTest = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector>{{1, 88, 20, 20}}), ::testing::ValuesIn(std::vector>{{1, 88, 40, 40}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(smoke_High_Resolution_Interpolate_Nearest_4D_Scale_Param_Test, @@ -215,7 +215,7 @@ const auto efficientdetCombinations = ::testing::Combine(interpolate4DScaleParam ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(efficientdetShapes), ::testing::ValuesIn(efficientdetShapes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(efficientdetInterpolateCombinationTests, CUDAInterpolateLayerTest, @@ -231,7 +231,7 @@ const auto yolov5InterpolateFrom20To40Shape = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(yolov5From20To40Shape), ::testing::ValuesIn(yolov5From20To40Shape), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(yolov5InterpolateFrom20To40ShapeTests, CUDAInterpolateLayerTest, @@ -247,7 +247,7 @@ const auto yolov5InterpolateFrom40To80Shape = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(yolov5From40To80Shape), ::testing::ValuesIn(yolov5From40To80Shape), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(yolov5InterpolateFrom40To80ShapeTests, CUDAInterpolateLayerTest, @@ -293,7 +293,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinear_2D_Scale_Test, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(linearInput2DScaleShapes), ::testing::ValuesIn(linearTest2DSizes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), InterpolateLayerTest::getTestCaseName); @@ -321,7 +321,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinear_3D_Scale_Test, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(linearInput3DScaleShapes), ::testing::ValuesIn(linearTest3DSizes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), InterpolateLayerTest::getTestCaseName); @@ -367,7 +367,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateCubic_2D_Scale_Test, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(cubicInput2DScaleShapes), ::testing::ValuesIn(cubicTest2DSizes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), InterpolateLayerTest::getTestCaseName); @@ -395,7 +395,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateCubic_3D_Scale_Test, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(cubicInput3DScaleShapes), ::testing::ValuesIn(cubicTest3DSizes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), InterpolateLayerTest::getTestCaseName); @@ -417,7 +417,7 @@ const auto nearestBenchmarkParams = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector>{{1, 88, 40, 40}}), ::testing::ValuesIn(std::vector>{{1, 88, 80, 80}}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(CUDAInterpolate_Nearest_Benchmark, @@ -449,7 +449,7 @@ const auto benchmarkParams = ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 50, 50, 50}), // input data shape ::testing::Values(std::vector{0, 0, 0}), // sizes, not used - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(CUDAInterpolate_Benchmark, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/logical_test.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/logical_test.cpp index 69ea5e05b..7bcbf3f67 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/logical_test.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/logical_test.cpp @@ -37,7 +37,7 @@ const auto LogicalTestParamsNot = ::testing::Values(InferenceEngine::Precision::BOOL), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)); INSTANTIATE_TEST_CASE_P(smoke_LogicalNot, LogicalLayerTest, LogicalTestParamsNot, LogicalLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp index 9cd93d1a9..22bff0b1f 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp @@ -89,7 +89,7 @@ INSTANTIATE_TEST_CASE_P(smoke_LSTMCell_01, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); const std::vector smoke_input_sizes_02{2, 3, 30}; @@ -107,7 +107,7 @@ INSTANTIATE_TEST_CASE_P(smoke_LSTMCell_02, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); // ------------- Other shapes ------------- @@ -133,7 +133,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCell_Tacotron2_dec_01, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); LSTMCellTestParams tacotron2_dec_02{1, 1536, 1024, 0.0f}; @@ -150,7 +150,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCell_Tacotron2_dec_02, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); LSTMCellTestParams tacotron2_enc_01{1, 512, 256, 0.0f}; @@ -167,7 +167,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCell_Tacotron2_enc_01, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); // ------------- Big shapes ------------- @@ -185,7 +185,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCell_OV_Doc_01, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); LSTMCellTestParams big_01{10, 2048, 2048, 0.0f}; @@ -202,7 +202,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCell_Big_01, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); LSTMCellTestParams big_02{1, 8192, 4096, 0.0f}; @@ -219,7 +219,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCell_Big_02, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); LSTMCellTestParams big_03{3, 1781, 5003, 0.0f}; @@ -236,7 +236,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCell_Big_03, ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(WRBLayerTypes), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDNNLSTMCellTest::getTestCaseName); // ------------- Benchmark ------------- diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp index 51f09cf51..a982302d0 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp @@ -76,7 +76,7 @@ INSTANTIATE_TEST_CASE_P(smoke_LSTMSequence_01, ::testing::ValuesIn(sequenceDirections), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDALSTMSequenceTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_LSTMSequence_02, @@ -91,7 +91,7 @@ INSTANTIATE_TEST_CASE_P(smoke_LSTMSequence_02, ::testing::ValuesIn(sequenceDirections), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDALSTMSequenceTest::getTestCaseName); // ------------- Tacotron2 Tests ------------- @@ -108,7 +108,7 @@ INSTANTIATE_TEST_CASE_P(LSTMSequence_Tacotron2_decoder_01, ::testing::Values(ov::op::RecurrentSequenceDirection::FORWARD), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDALSTMSequenceTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(LSTMSequence_Tacotron2_decoder_02, @@ -123,7 +123,7 @@ INSTANTIATE_TEST_CASE_P(LSTMSequence_Tacotron2_decoder_02, ::testing::Values(ov::op::RecurrentSequenceDirection::FORWARD), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDALSTMSequenceTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(LSTMSequence_Tacotron2_encoder_01, @@ -138,7 +138,7 @@ INSTANTIATE_TEST_CASE_P(LSTMSequence_Tacotron2_encoder_01, ::testing::Values(ov::op::RecurrentSequenceDirection::BIDIRECTIONAL), ::testing::Values(ngraph::helpers::InputLayerType::CONSTANT), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CUDALSTMSequenceTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mat_mul.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mat_mul.cpp index abdb0db63..b5a77db14 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mat_mul.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mat_mul.cpp @@ -135,7 +135,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MatMul, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(secondaryInputTypes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), MatMulLayerTest::getTestCaseName); @@ -147,7 +147,7 @@ INSTANTIATE_TEST_CASE_P(MatMul_Resnet50, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(secondaryInputTypes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), MatMulLayerTest::getTestCaseName); @@ -159,7 +159,7 @@ INSTANTIATE_TEST_CASE_P(MatMul_VGG16, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(secondaryInputTypes), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(additional_config)), MatMulLayerTest::getTestCaseName); @@ -181,7 +181,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -200,7 +200,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -219,7 +219,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -238,7 +238,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -257,7 +257,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -276,7 +276,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -295,7 +295,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -314,7 +314,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -333,7 +333,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -352,7 +352,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -371,7 +371,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -390,7 +390,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -409,7 +409,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -428,7 +428,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -447,7 +447,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -466,7 +466,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -485,7 +485,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -504,7 +504,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -523,7 +523,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -542,7 +542,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); @@ -561,7 +561,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(std::vector {ngraph::helpers::InputLayerType::CONSTANT, ngraph::helpers::InputLayerType::PARAMETER}), // secondary input types - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map {})), // additional config MatMulLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/minimum_maximum.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/minimum_maximum.cpp index 3f9ecc838..dae8a59f0 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/minimum_maximum.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/minimum_maximum.cpp @@ -46,7 +46,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxMin, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(inputType), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), MaxMinLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp index 4643f0c6d..568d9f2ee 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp @@ -54,7 +54,7 @@ const auto MvnCases = ::testing::Combine(::testing::ValuesIn(inputShapes), ::testing::ValuesIn(acrossChannels), ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilon), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_CUDA_TestsMVN, Mvn1LayerTest, MvnCases, Mvn1LayerTest::getTestCaseName); @@ -79,7 +79,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDA_MVN_5D, ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilonF), ::testing::ValuesIn(epsMode), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), Mvn6_4DPreprocessLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P( @@ -92,7 +92,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilonF), ::testing::ValuesIn(epsMode), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), Mvn6_4DPreprocessLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P( @@ -105,7 +105,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilonF), ::testing::ValuesIn(epsMode), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), Mvn6_4DPreprocessLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_CUDA_MVN_2D, @@ -117,7 +117,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDA_MVN_2D, ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilonF), ::testing::ValuesIn(epsMode), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), Mvn6_4DPreprocessLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_CUDA_MVN_1D, @@ -129,7 +129,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDA_MVN_1D, ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilonF), ::testing::ValuesIn(epsMode), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), Mvn6_4DPreprocessLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_CUDA_Decomposition_3D, @@ -142,7 +142,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDA_Decomposition_3D, ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilonF), ::testing::ValuesIn(epsMode), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), Mvn6_4DPreprocessLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_CUDA_Decomposition_4D, @@ -156,7 +156,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDA_Decomposition_4D, ::testing::ValuesIn(normalizeVariance), ::testing::ValuesIn(epsilonF), ::testing::ValuesIn(epsMode), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), Mvn6_4DPreprocessLayerTest::getTestCaseName); // TODO: uncomment this when implementation for higher rang tensor will be supported, current CUDNN implementation @@ -172,6 +172,6 @@ INSTANTIATE_TEST_CASE_P(smoke_CUDA_Decomposition_4D, // ::testing::ValuesIn(normalizeVariance), // ::testing::ValuesIn(epsilonF), // ::testing::ValuesIn(epsMode), -// ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), +// ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), // Mvn6_4DPreprocessLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pad_test.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pad_test.cpp index 1d92655c5..77f1a178b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pad_test.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pad_test.cpp @@ -51,7 +51,7 @@ const auto pad1DConstparams = testing::Combine(testing::ValuesIn(padsBegin1D), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputs1d), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Pad1DConst, PadLayerTest, pad1DConstparams, PadLayerTest::getTestCaseName); @@ -67,7 +67,7 @@ const auto pad2DConstparams = testing::Combine(testing::ValuesIn(padsBegin2D), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{3, 512}), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Pad2DConst, PadLayerTest, pad2DConstparams, PadLayerTest::getTestCaseName); @@ -83,7 +83,7 @@ const auto pad3DConstparams = testing::Combine(testing::ValuesIn(padsBegin3D), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{3, 5, 11}), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Pad3DConst, PadLayerTest, pad3DConstparams, PadLayerTest::getTestCaseName); @@ -99,7 +99,7 @@ const auto pad4DConstparams = testing::Combine(testing::ValuesIn(padsBegin4D), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{3, 5, 10, 512}), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Pad4DConst, PadLayerTest, pad4DConstparams, PadLayerTest::getTestCaseName); @@ -115,7 +115,7 @@ const auto pad5DConstparams = testing::Combine(testing::ValuesIn(padsBegin5D), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{7, 3, 5, 10, 512}), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Pad5DConst, PadLayerTest, pad5DConstparams, PadLayerTest::getTestCaseName); @@ -128,7 +128,7 @@ const auto padPrecesionParams = testing::Combine(testing::ValuesIn(padsBegin2D), testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::ANY), testing::Values(std::vector{3, 128}), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_PadPrecesionParams, PadLayerTest, padPrecesionParams, PadLayerTest::getTestCaseName); @@ -151,7 +151,7 @@ const auto pad4DBenchmarkParams = testing::Values(InferenceEngine::Precision::UNSPECIFIED), testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(benchmarkShapes), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(Benchmark4DPadOperation, NCHWFormatPadBenchmarkTest, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pooling.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pooling.cpp index 88583ea97..23c5efbc6 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/pooling.cpp @@ -47,7 +47,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRounding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); /* ========== Explicit Pad Ceil Rounding ========== */ @@ -74,7 +74,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_CeilRounding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); ////* ========== Avg Pooling ========== */ @@ -100,7 +100,7 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); /* +========== Explicit Pad Floor Rounding ========== */ @@ -122,7 +122,7 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); ////* ========== Avg and Max Pooling Cases ========== */ @@ -150,7 +150,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MAX_and_AVGPool_ValidPad, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({1, 3, 50, 50})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); // ============================================================================= @@ -181,7 +181,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 256, 20, 20}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -209,7 +209,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 128, 112, 112}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -237,7 +237,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 256, 56, 56}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -265,7 +265,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 512, 14, 14}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -293,7 +293,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 512, 28, 28}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -321,7 +321,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 224, 224}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -349,7 +349,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 128, 56, 56}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -377,7 +377,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 256, 28, 28}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -405,7 +405,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 113, 113}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -433,7 +433,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 112, 112}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -461,7 +461,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 256, 20, 20}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -489,7 +489,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 256, 20, 20}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -517,7 +517,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 512, 19, 19}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -545,7 +545,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{100, 1024, 4, 4}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -573,7 +573,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 192, 200, 342}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -601,7 +601,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 320, 100, 171}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -629,7 +629,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 112, 112}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -657,7 +657,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 400, 683}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -685,7 +685,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 88, 10, 10}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -713,7 +713,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 88, 20, 20}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -741,7 +741,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 88, 40, 40}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -769,7 +769,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 88, 80, 80}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -797,7 +797,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{100, 576, 7, 7}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -825,7 +825,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 512, 19, 19}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -853,7 +853,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 512, 19, 19}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -881,7 +881,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 128, 16, 16}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -909,7 +909,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 16, 128, 128}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -937,7 +937,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 32, 64, 64}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -965,7 +965,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 32, 32}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -993,7 +993,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{100, 576, 14, 14}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1021,7 +1021,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 128, 18, 18, 18}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1049,7 +1049,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 16, 144, 144, 144}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1077,7 +1077,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 32, 72, 72, 72}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1105,7 +1105,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 36, 36, 36}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1133,7 +1133,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 1024, 17, 17}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1161,7 +1161,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 192, 71, 71}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1189,7 +1189,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 384, 35, 35}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1217,7 +1217,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 64, 147, 147}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG_MAXPOOL} @@ -1252,7 +1252,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 2048, 7, 7}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1280,7 +1280,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 1024, 17, 17}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1308,7 +1308,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 1536, 8, 8}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1336,7 +1336,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 192, 100, 171}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1364,7 +1364,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 256, 100, 171}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1392,7 +1392,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 384, 35, 35}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1420,7 +1420,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 576, 50, 86}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1448,7 +1448,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{100, 1024, 4, 4}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); @@ -1476,7 +1476,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 1536, 8, 8}), // input shape - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), PoolingLayerTest::getTestCaseName); // {AUTOGENERATED_TESTS_END_TAG_AVGPOOL} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/power.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/power.cpp index 355ae1dbb..af4b541df 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/power.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/power.cpp @@ -50,7 +50,7 @@ INSTANTIATE_TEST_CASE_P(smoke_powerCuda, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::ValuesIn(Power)), PowerLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp index ca5f8fa07..658a293c3 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp @@ -26,7 +26,7 @@ INSTANTIATE_TEST_CASE_P(ReshapeCheckDynBatch, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(std::vector({30, 30, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map({}))), ReshapeLayerTest::getTestCaseName); @@ -40,7 +40,7 @@ INSTANTIATE_TEST_CASE_P(ReshapeCheck, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({10, 10, 10, 10})), ::testing::Values(std::vector({10, 0, 100})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map({}))), ReshapeLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp index 9b491c1bf..6e87f2f2b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp @@ -143,7 +143,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(CudaScatterNDUpdateLayerTest::combineShapes(smoke_shapes)), ::testing::ValuesIn(inputPrecisions), ::testing::ValuesIn(idxPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CudaScatterNDUpdateLayerTest::getTestCaseName); // map> @@ -167,7 +167,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(CudaScatterNDUpdateLayerTest::combineShapes(smoke_shapes_index_generation)), ::testing::ValuesIn(inputPrecisions), ::testing::ValuesIn(idxPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CudaScatterNDUpdateLayerTest::getTestCaseName); // yolov5b6 shapes @@ -182,7 +182,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(CudaScatterNDUpdateLayerTest::combineShapes(yolov5b6_shapes)), ::testing::ValuesIn(inputPrecisions), ::testing::ValuesIn(idxPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CudaScatterNDUpdateLayerTest::getTestCaseName); namespace benchmark { @@ -206,7 +206,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Combine(::testing::ValuesIn(CudaScatterNDUpdateLayerTest::combineShapes(benchmark_shapes)), ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(InferenceEngine::Precision::I64), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), CudaScatterNDUpdateLayerTest::getTestCaseName); } // namespace benchmark } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/select.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/select.cpp index 0da43b73b..891575de5 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/select.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/select.cpp @@ -28,7 +28,7 @@ const std::vector>> noneShapes = {{{1}, {1}, {1} const auto noneCases = ::testing::Combine(::testing::ValuesIn(noneShapes), ::testing::ValuesIn(inputPrecision), ::testing::Values(ov::op::AutoBroadcastType::NONE), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); const std::vector>> numpyShapes = {{{1}, {1}, {1}}, {{1}, {16}, {1}}, @@ -71,7 +71,7 @@ const std::vector>> numpyShapes = {{{1}, {1}, {1 const auto numpyCases = ::testing::Combine(::testing::ValuesIn(numpyShapes), ::testing::ValuesIn(inputPrecision), ::testing::Values(ov::op::AutoBroadcastType::NUMPY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); const std::vector>> tacotronShapes = { {{}, {1, 200}, {1, 200}}, @@ -82,7 +82,7 @@ const std::vector>> tacotronShapes = { const auto tacotronCases = ::testing::Combine(::testing::ValuesIn(noneShapes), ::testing::ValuesIn(inputPrecision), ::testing::Values(ov::op::AutoBroadcastType::NUMPY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_CUDA_TestsSelect_none, SelectLayerTest, noneCases, SelectLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp index c69223d73..d4a77ac99 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp @@ -36,7 +36,7 @@ const auto params2D = testing::Combine(testing::ValuesIn(netPrecisions), testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes2D)), testing::ValuesIn(axis2D), - testing::Values(CommonTestUtils::DEVICE_NVIDIA), + testing::Values(ov::test::utils::DEVICE_NVIDIA), testing::Values(ov::AnyMap())); INSTANTIATE_TEST_CASE_P(SoftMax2D, SoftMaxLayerTest, params2D, SoftMaxLayerTest::getTestCaseName); @@ -55,7 +55,7 @@ const auto params3D = testing::Combine(testing::ValuesIn(netPrecisions), testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes3D)), testing::ValuesIn(axis3D), - testing::Values(CommonTestUtils::DEVICE_NVIDIA), + testing::Values(ov::test::utils::DEVICE_NVIDIA), testing::Values(ov::AnyMap())); INSTANTIATE_TEST_CASE_P(SoftMax3D, SoftMaxLayerTest, params3D, SoftMaxLayerTest::getTestCaseName); @@ -77,7 +77,7 @@ const auto params4D = testing::Combine(testing::ValuesIn(netPrecisions), testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes4D)), testing::ValuesIn(axis4D), - testing::Values(CommonTestUtils::DEVICE_NVIDIA), + testing::Values(ov::test::utils::DEVICE_NVIDIA), testing::Values(ov::AnyMap())); INSTANTIATE_TEST_CASE_P(SoftMax4D, SoftMaxLayerTest, params4D, SoftMaxLayerTest::getTestCaseName); @@ -96,7 +96,7 @@ const auto params5D = testing::Combine(testing::ValuesIn(netPrecisions), testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(inputShapes5D)), testing::ValuesIn(axis5D), - testing::Values(CommonTestUtils::DEVICE_NVIDIA), + testing::Values(ov::test::utils::DEVICE_NVIDIA), testing::Values(ov::AnyMap())); INSTANTIATE_TEST_CASE_P(SoftMax5D, SoftMaxLayerTest, params5D, SoftMaxLayerTest::getTestCaseName); @@ -115,7 +115,7 @@ const auto resnet5Params = testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(resnet5Shapes)), testing::ValuesIn(axis2D), - testing::Values(CommonTestUtils::DEVICE_NVIDIA), + testing::Values(ov::test::utils::DEVICE_NVIDIA), testing::Values(ov::AnyMap())); INSTANTIATE_TEST_CASE_P(SoftMax2Dresnet5, SoftMaxLayerTest, resnet5Params, SoftMaxLayerTest::getTestCaseName); @@ -129,7 +129,7 @@ const auto vggParams = testing::Combine(testing::ValuesIn(netPrecisions), testing::Values(ov::element::undefined), testing::ValuesIn(ov::test::static_shapes_to_test_representation(vggShapes)), testing::ValuesIn(axis2D), - testing::Values(CommonTestUtils::DEVICE_NVIDIA), + testing::Values(ov::test::utils::DEVICE_NVIDIA), testing::Values(ov::AnyMap())); INSTANTIATE_TEST_CASE_P(SoftMax2Dvgg, SoftMaxLayerTest, vggParams, SoftMaxLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp index 857b25f48..96a965286 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp @@ -23,7 +23,7 @@ INSTANTIATE_TEST_CASE_P(NumSplitsCheck, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), ::testing::Values(std::vector({})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), SplitLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp index bf107665f..3af2ee285 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp @@ -30,13 +30,13 @@ const std::vector opTypes = {ngraph::helpers::Sq INSTANTIATE_TEST_CASE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, - ::testing::Combine(::testing::ValuesIn(CommonTestUtils::combineParams(axesVectors)), + ::testing::Combine(::testing::ValuesIn(ov::test::utils::combineParams(axesVectors)), ::testing::ValuesIn(opTypes), ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), SqueezeUnsqueezeLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp index 023d36814..f06071fbd 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -142,7 +142,7 @@ INSTANTIATE_TEST_CASE_P(StridedSliceTest_FP32, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map())), StridedSliceLayerTest::getTestCaseName); @@ -154,7 +154,7 @@ INSTANTIATE_TEST_CASE_P(StridedSliceTest_FP16, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map())), StridedSliceLayerTest::getTestCaseName); @@ -166,7 +166,7 @@ INSTANTIATE_TEST_CASE_P(StridedSliceTest_I32, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map())), StridedSliceLayerTest::getTestCaseName); @@ -178,7 +178,7 @@ INSTANTIATE_TEST_CASE_P(smoke_StridedSliceTest_FP32, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA), ::testing::Values(std::map())), StridedSliceLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/tensor_iterator.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/tensor_iterator.cpp index bbad88f2e..25dc5a4f8 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/tensor_iterator.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/tensor_iterator.cpp @@ -66,7 +66,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(body_type), ::testing::ValuesIn(direction), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), TensorIteratorDisabledTransformationsTest::getTestCaseName); std::vector seq_lengths_clip_non_zero{1000}; @@ -83,7 +83,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(body_type), ::testing::ValuesIn(direction), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), TensorIteratorDisabledTransformationsTest::getTestCaseName); // ------------- Benchmark ------------- @@ -127,7 +127,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(body_type), ::testing::ValuesIn(direction), ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), TensorIteratorBenchmarkTest::getTestCaseName); } // namespace benchmark diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp index 0b6b9ce26..0466dd162 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/topk.cpp @@ -56,7 +56,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TopK3D, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(shapes3D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), TopKLayerTest::getTestCaseName); const std::vector axes4D = { @@ -83,7 +83,7 @@ INSTANTIATE_TEST_CASE_P(TopK4D, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(shapes4D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), TopKLayerTest::getTestCaseName); const std::vector axes5D = { @@ -111,7 +111,7 @@ INSTANTIATE_TEST_CASE_P(TopK5D, ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::ValuesIn(shapes5D), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), TopKLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp index c111b9a02..c7f801e6d 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/transpose_test.cpp @@ -36,7 +36,7 @@ const auto params = testing::Combine(testing::ValuesIn(inputOrder), testing::Values(InferenceEngine::Layout::ANY), testing::Values(InferenceEngine::Layout::ANY), testing::ValuesIn(inputShapes), - testing::Values(CommonTestUtils::DEVICE_NVIDIA)); + testing::Values(ov::test::utils::DEVICE_NVIDIA)); INSTANTIATE_TEST_CASE_P(smoke_Transpose, TransposeLayerTest, params, TransposeLayerTest::getTestCaseName); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp index 0ca2cf3a4..ab3235398 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/variadic_split.cpp @@ -39,7 +39,7 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck_U32, @@ -52,7 +52,7 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck_U32, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck_I64, @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck_I64, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector({30, 30, 30, 30})), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis1, @@ -78,7 +78,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 40, 40, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis2, @@ -91,7 +91,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 40, 40, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis3, @@ -104,7 +104,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 40, 40, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis4, @@ -117,7 +117,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape0_axis4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 40, 40, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis1, @@ -130,7 +130,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 20, 20, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis2, @@ -143,7 +143,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 20, 20, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis3, @@ -156,7 +156,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 20, 20, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis4, @@ -169,7 +169,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape1_axis4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 20, 20, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis1, @@ -182,7 +182,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis1, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 80, 80, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis2, @@ -195,7 +195,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis2, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 80, 80, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis3, @@ -208,7 +208,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis3, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 80, 80, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis4, @@ -221,7 +221,7 @@ INSTANTIATE_TEST_CASE_P(yolov5_NumSplitsCheck_shape2_axis4, ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(std::vector{1, 3, 80, 80, 85}), - ::testing::Values(CommonTestUtils::DEVICE_NVIDIA)), + ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), VariadicSplitLayerTest::getTestCaseName); } // namespace diff --git a/modules/nvidia_plugin/tests/include/cuda_test_constants.hpp b/modules/nvidia_plugin/tests/include/cuda_test_constants.hpp index b10132fd6..5084226d9 100644 --- a/modules/nvidia_plugin/tests/include/cuda_test_constants.hpp +++ b/modules/nvidia_plugin/tests/include/cuda_test_constants.hpp @@ -3,8 +3,12 @@ // #pragma once -namespace CommonTestUtils { +namespace ov { +namespace test { +namespace utils { const char DEVICE_NVIDIA[] = "NVIDIA"; -} // namespace CommonTestUtils +} // namespace utils +} // namespace test +} // namespace ov