From bceb7dbfe1b2a406f7fa942fcebae3149839e109 Mon Sep 17 00:00:00 2001 From: Artemy Skrebkov Date: Thu, 8 Dec 2022 17:00:07 +0000 Subject: [PATCH] Fix segfault on windows with MSVC (#14517) * MSVC compiler cannot handle copying empty AnyMap --- .../include/ov_api_conformance_helpers.hpp | 2 -- .../src/behavior/ov_executable_network/exec_graph_info.cpp | 4 ++-- .../src/behavior/ov_executable_network/exec_network_base.cpp | 2 +- .../src/behavior/ov_infer_request/callback.cpp | 2 +- .../src/behavior/ov_infer_request/cancellation.cpp | 2 +- .../src/behavior/ov_infer_request/infer_request_dynamic.cpp | 4 ++-- .../src/behavior/ov_infer_request/inference_chaining.cpp | 2 +- .../src/behavior/ov_infer_request/io_tensor.cpp | 4 ++-- .../src/behavior/ov_infer_request/multithreading.cpp | 2 +- .../src/behavior/ov_infer_request/perf_counters.cpp | 2 +- .../src/behavior/ov_infer_request/wait.cpp | 2 +- 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp index 650483ed306..4bd34fad635 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp @@ -34,8 +34,6 @@ inline const std::vector generate_ov_configs(const std::string& targ return resultConfig; } -const ov::AnyMap ov_config = ov::test::conformance::pluginConfig; - } // namespace conformance } // namespace test } // namespace ov diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp index 55206537b61..3822d85f718 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp @@ -33,6 +33,6 @@ INSTANTIATE_TEST_SUITE_P(ov_compiled_model, ::testing::Combine( ::testing::ValuesIn(ovExecGraphInfoElemTypes), ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVExecGraphImportExportTest::getTestCaseName); -} // namespace \ No newline at end of file +} // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp index cedce958825..adac4976f5c 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp @@ -14,6 +14,6 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(ov_compiled_model, OVExecutableNetworkBaseTest, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVExecutableNetworkBaseTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp index 2f3949dc35e..103f39f3aba 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp @@ -15,7 +15,7 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestCallbackTests, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestCallbackTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp index 0645c2bf3bd..1ca9091541b 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp @@ -12,6 +12,6 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestCancellationTests, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestCancellationTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp index c4f9803d39e..1729e622c11 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp @@ -61,7 +61,7 @@ INSTANTIATE_TEST_SUITE_P(ov_infer_request_1, OVInferRequestDynamicTests, {{1, 4, 20, 20}, {1, 4, 20, 20}}, {{2, 4, 20, 20}, {2, 4, 20, 20}}}), ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestDynamicTests::getTestCaseName); INSTANTIATE_TEST_SUITE_P(ov_infer_request_2, OVInferRequestDynamicTests, @@ -71,6 +71,6 @@ INSTANTIATE_TEST_SUITE_P(ov_infer_request_2, OVInferRequestDynamicTests, {{1, 4, 20, 20}, {1, 2, 20, 40}}, {{2, 4, 20, 20}, {2, 2, 20, 40}}}), ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestDynamicTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp index 1244e5f005f..10b35071560 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp @@ -13,6 +13,6 @@ using namespace ov::test::conformance; INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferenceChaining, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferenceChaining::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp index e7a4e4e25e3..e04f0b60fd9 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp @@ -15,7 +15,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestIOTensorTest, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestIOTensorTest::getTestCaseName); std::vector ovIOTensorElemTypes = { @@ -41,6 +41,6 @@ INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestIOTensorSetPrecisionTes ::testing::Combine( ::testing::ValuesIn(ovIOTensorElemTypes), ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp index 4f9dec46bdd..ca600400407 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp @@ -16,7 +16,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestMultithreadingTests, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestMultithreadingTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp index d97a129ab2b..7e63416a2cd 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp @@ -13,7 +13,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestPerfCountersTest, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestPerfCountersTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp index 8382b84b70f..9ec938276b9 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp @@ -16,7 +16,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestWaitTests, ::testing::Combine( ::testing::ValuesIn(return_all_possible_device_combination()), - ::testing::Values(ov_config)), + ::testing::Values(pluginConfig)), OVInferRequestWaitTests::getTestCaseName); } // namespace