Skip to content

Commit cb0baac

Browse files
author
Oleg Pipikin
authored
Rename CommonTestUtils namespace to ov::test::utils (#692)
1 parent 5193413 commit cb0baac

File tree

93 files changed

+1212
-1208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1212
-1208
lines changed

‎modules/nvidia_plugin/tests/functional/core_config.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void CoreConfiguration(LayerTestsUtils::LayerTestsCommon* test) {
1818
}
1919
// Set inference_precision hint to run fp32 model in fp32 runtime precision as default plugin execution precision may vary
2020
std::map<std::string, std::string> config = {{ov::hint::inference_precision.name(), hint.get_type_name()}};
21-
core->SetConfig(config, CommonTestUtils::DEVICE_NVIDIA);
21+
core->SetConfig(config, ov::test::utils::DEVICE_NVIDIA);
2222
}
2323

2424
namespace ov {
@@ -33,7 +33,7 @@ void core_configuration(ov::test::SubgraphBaseTest* test) {
3333
}
3434
}
3535
// Set inference_precision hint to run fp32 model in fp32 runtime precision as default plugin execution precision may vary
36-
test->core->set_property(CommonTestUtils::DEVICE_NVIDIA, {{ov::hint::inference_precision.name(), hint.get_type_name()}});
36+
test->core->set_property(ov::test::utils::DEVICE_NVIDIA, {{ov::hint::inference_precision.name(), hint.get_type_name()}});
3737
}
3838

3939
} // namespace test

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/cpp_holders.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ const std::vector<std::vector<int>> orders = {
2323

2424
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests,
2525
HoldersTest,
26-
::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
26+
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
2727
::testing::ValuesIn(orders)),
2828
HoldersTest::getTestCaseName);
2929

3030
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests,
3131
HoldersTestImportNetwork,
32-
::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA, "HETERO:NVIDIA"),
32+
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA, "HETERO:NVIDIA"),
3333
::testing::ValuesIn(orders)),
3434
HoldersTest::getTestCaseName);
3535

3636
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests,
3737
HoldersTestOnImportedNetwork,
38-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA, "HETERO:NVIDIA"),
38+
::testing::Values(ov::test::utils::DEVICE_NVIDIA, "HETERO:NVIDIA"),
3939
HoldersTestOnImportedNetwork::getTestCaseName);
4040

4141
} // namespace

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/exec_network_base.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const std::vector<std::map<std::string, std::string>> configs = {{}};
1414

1515
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
1616
ExecutableNetworkBaseTest,
17-
::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
17+
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
1818
::testing::ValuesIn(configs)),
1919
ExecutableNetworkBaseTest::getTestCaseName);
2020

@@ -24,7 +24,7 @@ const std::vector<InferenceEngine::Precision> netPrecisions = {InferenceEngine::
2424
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
2525
ExecNetSetPrecision,
2626
::testing::Combine(::testing::ValuesIn(netPrecisions),
27-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
27+
::testing::Values(ov::test::utils::DEVICE_NVIDIA),
2828
::testing::ValuesIn(configs)),
2929
ExecNetSetPrecision::getTestCaseName);
3030
} // namespace

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/executable_network/get_metric.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@ namespace {
1818

1919
INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest,
2020
IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS,
21-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
21+
::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
2222

2323
INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest,
2424
IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS,
25-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
25+
::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
2626

2727
INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest,
2828
IEClassExecutableNetworkGetMetricTest_NETWORK_NAME,
29-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*""MULTI:NVIDIA", */"HETERO:NVIDIA"));
29+
::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*""MULTI:NVIDIA", */"HETERO:NVIDIA"));
3030

3131
INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest,
3232
IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS,
33-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
33+
::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
3434

3535
INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported,
3636
IEClassExecutableNetworkGetMetricTest,
37-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
37+
::testing::Values(ov::test::utils::DEVICE_NVIDIA, /*"MULTI:NVIDIA", */"HETERO:NVIDIA"));
3838
//
3939
// Executable Network GetConfig / SetConfig
4040
//
4141

4242
INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkGetConfigTest,
4343
IEClassExecutableNetworkGetConfigTest,
44-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
44+
::testing::Values(ov::test::utils::DEVICE_NVIDIA));
4545

4646
INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkSetConfigTest,
4747
IEClassExecutableNetworkSetConfigTest,
48-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
48+
::testing::Values(ov::test::utils::DEVICE_NVIDIA));
4949

5050
//
5151
// Hetero Executable Network GetMetric
@@ -55,19 +55,19 @@ INSTANTIATE_TEST_SUITE_P(smoke_IEClassExecutableNetworkSetConfigTest,
5555

5656
INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest,
5757
IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS,
58-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
58+
::testing::Values(ov::test::utils::DEVICE_NVIDIA));
5959

6060
INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest,
6161
IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS,
62-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
62+
::testing::Values(ov::test::utils::DEVICE_NVIDIA));
6363

6464
INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest,
6565
IEClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME,
66-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
66+
::testing::Values(ov::test::utils::DEVICE_NVIDIA));
6767

6868
INSTANTIATE_TEST_SUITE_P(smoke_IEClassHeteroExecutableNetworlGetMetricTest,
6969
IEClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK,
70-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA));
70+
::testing::Values(ov::test::utils::DEVICE_NVIDIA));
7171

7272
#endif // ENABLE_INTEL_CPU
7373
} // namespace

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/callback.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const std::vector<std::map<std::string, std::string>> configs = {{}};
2424

2525
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
2626
InferRequestCallbackTests,
27-
::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
27+
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
2828
::testing::ValuesIn(configs)),
2929
InferRequestCallbackTests::getTestCaseName);
3030
} // namespace

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/config.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const std::vector<std::map<std::string, std::string>> configs = {};
2020
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests_IncorrectConfig,
2121
InferRequestConfigTest,
2222
::testing::Combine(::testing::Values(0ul),
23-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
23+
::testing::Values(ov::test::utils::DEVICE_NVIDIA),
2424
::testing::ValuesIn(configs)),
2525
InferRequestConfigTest::getTestCaseName);
2626

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/infer_request.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ TEST_F(smoke_InferenceRequestTest, AsyncParameterResult) {
364364
InferenceEngine::Core ie{};
365365
InferenceEngine::Blob::Ptr a{};
366366
auto testNet = ie.ReadNetwork(model10, a);
367-
auto execNet = ie.LoadNetwork(testNet, CommonTestUtils::DEVICE_NVIDIA);
367+
auto execNet = ie.LoadNetwork(testNet, ov::test::utils::DEVICE_NVIDIA);
368368
InferenceEngine::InferRequest inferRequest{execNet.CreateInferRequest()};
369369
const InferenceEngine::ConstInputsDataMap inputsInfo{execNet.GetInputsInfo()};
370370
fillBlobs(inferRequest, inputsInfo, 1);
@@ -379,7 +379,7 @@ TEST_F(InferenceRequestBasicTest, AsyncParameterResultCancel) {
379379
InferenceEngine::Core ie{};
380380
InferenceEngine::Blob::Ptr a{};
381381
auto testNet = ie.ReadNetwork(heavyModel10, a);
382-
auto execNet = ie.LoadNetwork(testNet, CommonTestUtils::DEVICE_NVIDIA);
382+
auto execNet = ie.LoadNetwork(testNet, ov::test::utils::DEVICE_NVIDIA);
383383
InferenceEngine::InferRequest inferRequest{execNet.CreateInferRequest()};
384384
const InferenceEngine::ConstInputsDataMap inputsInfo{execNet.GetInputsInfo()};
385385
fillBlobs(inferRequest, inputsInfo, 1);
@@ -395,7 +395,7 @@ TEST_F(smoke_InferenceRequestTest, PerformanceCounters) {
395395
{InferenceEngine::PluginConfigParams::KEY_PERF_COUNT, InferenceEngine::PluginConfigParams::YES}};
396396

397397
auto testNet = ie.ReadNetwork(model10, a);
398-
auto execNet = ie.LoadNetwork(testNet, CommonTestUtils::DEVICE_NVIDIA, config);
398+
auto execNet = ie.LoadNetwork(testNet, ov::test::utils::DEVICE_NVIDIA, config);
399399
InferenceEngine::InferRequest request{execNet.CreateInferRequest()};
400400

401401
const InferenceEngine::ConstInputsDataMap inputsInfo{execNet.GetInputsInfo()};

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const std::vector<std::map<std::string, std::string>> configs = {{}};
1919

2020
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
2121
InferRequestIOBBlobTest,
22-
::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
22+
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
2323
::testing::ValuesIn(configs)),
2424
InferRequestIOBBlobTest::getTestCaseName);
2525

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/infer_request/perf_counters.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ namespace {
1414
const std::vector<std::map<std::string, std::string>> configs = {{}};
1515

1616
const std::vector<std::map<std::string, std::string>> Multiconfigs = {
17-
{{MULTI_CONFIG_KEY(DEVICE_PRIORITIES), CommonTestUtils::DEVICE_NVIDIA}}};
17+
{{MULTI_CONFIG_KEY(DEVICE_PRIORITIES), ov::test::utils::DEVICE_NVIDIA}}};
1818

1919
INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests,
2020
InferRequestPerfCountersTest,
21-
::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
21+
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NVIDIA),
2222
::testing::ValuesIn(configs)),
2323
InferRequestPerfCountersTest::getTestCaseName);
2424

2525
INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests,
2626
InferRequestPerfCountersTest,
27-
::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_MULTI),
27+
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI),
2828
::testing::ValuesIn(Multiconfigs)),
2929
InferRequestPerfCountersTest::getTestCaseName);
3030

‎modules/nvidia_plugin/tests/functional/shared_tests_instances/behavior/ov_executable_network/ov_exec_net_import_export.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ const std::vector<ov::element::Type_t> netPrecisions = {
1616
const std::vector<ov::AnyMap> configs = {
1717
{},
1818
};
19-
const std::vector<ov::AnyMap> multiConfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}};
19+
const std::vector<ov::AnyMap> multiConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}};
2020

21-
const std::vector<ov::AnyMap> heteroConfigs = {{ov::device::priorities(CommonTestUtils::DEVICE_NVIDIA)}};
21+
const std::vector<ov::AnyMap> heteroConfigs = {{ov::device::priorities(ov::test::utils::DEVICE_NVIDIA)}};
2222

2323
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
2424
OVExecGraphImportExportTest,
2525
::testing::Combine(::testing::ValuesIn(netPrecisions),
26-
::testing::Values(CommonTestUtils::DEVICE_NVIDIA),
26+
::testing::Values(ov::test::utils::DEVICE_NVIDIA),
2727
::testing::ValuesIn(configs)),
2828
OVExecGraphImportExportTest::getTestCaseName);
2929

3030
INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests,
3131
OVExecGraphImportExportTest,
3232
::testing::Combine(::testing::ValuesIn(netPrecisions),
33-
::testing::Values(CommonTestUtils::DEVICE_AUTO),
33+
::testing::Values(ov::test::utils::DEVICE_AUTO),
3434
::testing::ValuesIn(multiConfigs)),
3535
OVExecGraphImportExportTest::getTestCaseName);
3636

3737
INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests,
3838
OVExecGraphImportExportTest,
3939
::testing::Combine(::testing::ValuesIn(netPrecisions),
40-
::testing::Values(CommonTestUtils::DEVICE_HETERO),
40+
::testing::Values(ov::test::utils::DEVICE_HETERO),
4141
::testing::ValuesIn(heteroConfigs)),
4242
OVExecGraphImportExportTest::getTestCaseName);
4343

0 commit comments

Comments
 (0)