From 85e813a069a851abd2af47206ac677855a17ab21 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Mon, 12 Aug 2024 10:08:55 +0800 Subject: [PATCH 01/27] skip query model test while mandatory --- .../include/base/ov_behavior_test_utils.hpp | 17 ++++++++++++++++- .../include/behavior/ov_plugin/query_model.hpp | 6 ++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 9de110a82b3032..f27af917d90670 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -53,6 +53,7 @@ class APIBaseTest : public ov::test::TestsCommon { protected: double k = 1.0; std::string target_device = ""; + bool is_mandatory = true; ov::test::utils::ov_entity api_entity = ov::test::utils::ov_entity::undefined; ov::test::utils::ApiSummary& api_summary = ov::test::utils::ApiSummary::getInstance(); @@ -219,7 +220,21 @@ class OVClassBaseTestP : public OVClassNetworkTest, OVClassNetworkTest::SetUp(); } }; -using OVClassModelTestP = OVClassBaseTestP; + +using PropertiesParamsforQureyModel = std::tuple; + +class OVClassModelTestP : public OVClassNetworkTest, + public ::testing::WithParamInterface, + public OVPluginTestBase { +public: + void SetUp() override { + std::tie(target_device, is_mandatory) = GetParam(); + SKIP_IF_CURRENT_TEST_IS_DISABLED(); + APIBaseTest::SetUp(); + OVClassNetworkTest::SetUp(); + } +}; + using OVClassModelOptionalTestP = OVClassBaseTestP; class OVCompiledModelClassBaseTestP : public OVClassNetworkTest, diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp index a8a5a7c4a299c7..339d7b476f050d 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp @@ -23,11 +23,17 @@ namespace behavior { using OVClassQueryModelTest = OVClassBaseTestP; TEST_P(OVClassModelTestP, QueryModelActualNoThrow) { + if (is_mandatory) { + GTEST_SKIP(); + } ov::Core ie = ov::test::utils::create_core(); ie.query_model(actualNetwork, target_device); } TEST_P(OVClassModelTestP, QueryModelWithKSO) { + if (is_mandatory) { + GTEST_SKIP(); + } ov::Core ie = ov::test::utils::create_core(); auto rl_map = ie.query_model(ksoNetwork, target_device); From 7581a27353c59ebde42cfec9c0d4f49c0f97ebb6 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 14 Aug 2024 15:41:26 +0800 Subject: [PATCH 02/27] Revert "skip query model test while mandatory" This reverts commit 85e813a069a851abd2af47206ac677855a17ab21. --- .../include/base/ov_behavior_test_utils.hpp | 17 +---------------- .../include/behavior/ov_plugin/query_model.hpp | 6 ------ 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index f27af917d90670..9de110a82b3032 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -53,7 +53,6 @@ class APIBaseTest : public ov::test::TestsCommon { protected: double k = 1.0; std::string target_device = ""; - bool is_mandatory = true; ov::test::utils::ov_entity api_entity = ov::test::utils::ov_entity::undefined; ov::test::utils::ApiSummary& api_summary = ov::test::utils::ApiSummary::getInstance(); @@ -220,21 +219,7 @@ class OVClassBaseTestP : public OVClassNetworkTest, OVClassNetworkTest::SetUp(); } }; - -using PropertiesParamsforQureyModel = std::tuple; - -class OVClassModelTestP : public OVClassNetworkTest, - public ::testing::WithParamInterface, - public OVPluginTestBase { -public: - void SetUp() override { - std::tie(target_device, is_mandatory) = GetParam(); - SKIP_IF_CURRENT_TEST_IS_DISABLED(); - APIBaseTest::SetUp(); - OVClassNetworkTest::SetUp(); - } -}; - +using OVClassModelTestP = OVClassBaseTestP; using OVClassModelOptionalTestP = OVClassBaseTestP; class OVCompiledModelClassBaseTestP : public OVClassNetworkTest, diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp index 339d7b476f050d..a8a5a7c4a299c7 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp @@ -23,17 +23,11 @@ namespace behavior { using OVClassQueryModelTest = OVClassBaseTestP; TEST_P(OVClassModelTestP, QueryModelActualNoThrow) { - if (is_mandatory) { - GTEST_SKIP(); - } ov::Core ie = ov::test::utils::create_core(); ie.query_model(actualNetwork, target_device); } TEST_P(OVClassModelTestP, QueryModelWithKSO) { - if (is_mandatory) { - GTEST_SKIP(); - } ov::Core ie = ov::test::utils::create_core(); auto rl_map = ie.query_model(ksoNetwork, target_device); From 0aa7547f7a0dbc641af75e3ead8e49e211a8948b Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Fri, 23 Aug 2024 11:06:23 +0800 Subject: [PATCH 03/27] add query model macro --- .../src/ov_plugin/core_integration.cpp | 17 +++++++++++++---- .../include/base/ov_behavior_test_utils.hpp | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 9259c1e852a809..bbba35eb11eae4 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -6,10 +6,14 @@ #include "behavior/ov_plugin/query_model.hpp" #include "openvino/runtime/core.hpp" #include "ov_api_conformance_helpers.hpp" +#include "behavior/ov_plugin/properties_tests.hpp" +#include "base/ov_behavior_test_utils.hpp" using namespace ov::test::behavior; using namespace ov::test::conformance; +static std::string (*null_GetTestName)(const testing::TestParamInfo& info) = nullptr; + namespace { // // OV Class Common tests with @@ -17,15 +21,20 @@ namespace { INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVClassModelTestP, - ::testing::Values(ov::test::utils::target_device)); + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_FOR_QUERY_MODEL(null_GetTestName)); INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelOptionalTestP, - ::testing::Values(ov::test::utils::target_device)); + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_FOR_QUERY_MODEL(null_GetTestName)); // OV Class Query network -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, + +INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, - ::testing::Values(ov::test::utils::target_device)); + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_FOR_QUERY_MODEL(null_GetTestName)); + } // namespace diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 686a3c797ba917..97d00ebf8e85a9 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -31,8 +31,20 @@ #include "common_test_utils/subgraph_builders/split_concat.hpp" #define MARK_MANDATORY_FOR_HW_DEVICE(GET_TEST_NAME) \ - [&](const testing::TestParamInfo& info) { \ - std::string name = GET_TEST_NAME(info); \ + [](const testing::TestParamInfo& info) { \ + std::string name = ""; \ + if (nullptr != GET_TEST_NAME) { \ + name = GET_TEST_NAME(info); \ + } \ + return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_" + name; \ + } + +#define MARK_MANDATORY_FOR_QUERY_MODEL(GET_TEST_NAME) \ + [](const testing::TestParamInfo& info) { \ + std::string name = ""; \ + if (nullptr != GET_TEST_NAME) { \ + name = GET_TEST_NAME(info); \ + } \ return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_" + name; \ } From 35dffc92ea3354fcfaf9a7a03fb9fa4d1f56ec01 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Fri, 23 Aug 2024 11:10:55 +0800 Subject: [PATCH 04/27] change mandatory to optional --- .../api_conformance_runner/src/ov_plugin/core_integration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index bbba35eb11eae4..21f961adeb6674 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -19,7 +19,7 @@ namespace { // OV Class Common tests with // -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, +INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelTestP, ::testing::Values(ov::test::utils::target_device), MARK_MANDATORY_FOR_QUERY_MODEL(null_GetTestName)); From 6d58a4ae5462a95bc1ae8897ef233ffc1fd2b42c Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Fri, 23 Aug 2024 15:12:13 +0800 Subject: [PATCH 05/27] fix comment --- .../src/ov_plugin/core_integration.cpp | 11 +++-------- .../shared/include/base/ov_behavior_test_utils.hpp | 10 +++------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 21f961adeb6674..1d6f1eecf36039 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -12,8 +12,6 @@ using namespace ov::test::behavior; using namespace ov::test::conformance; -static std::string (*null_GetTestName)(const testing::TestParamInfo& info) = nullptr; - namespace { // // OV Class Common tests with @@ -22,19 +20,16 @@ namespace { INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelTestP, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_FOR_QUERY_MODEL(null_GetTestName)); + MARK_MANDATORY_FOR_API_HW_DEVICE()); INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelOptionalTestP, - ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_FOR_QUERY_MODEL(null_GetTestName)); + ::testing::Values(ov::test::utils::target_device)); // OV Class Query network - INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_FOR_QUERY_MODEL(null_GetTestName)); - + MARK_MANDATORY_FOR_API_HW_DEVICE()); } // namespace diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 97d00ebf8e85a9..34b3ab5033fdd8 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -39,13 +39,9 @@ return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_" + name; \ } -#define MARK_MANDATORY_FOR_QUERY_MODEL(GET_TEST_NAME) \ - [](const testing::TestParamInfo& info) { \ - std::string name = ""; \ - if (nullptr != GET_TEST_NAME) { \ - name = GET_TEST_NAME(info); \ - } \ - return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_" + name; \ +#define MARK_MANDATORY_FOR_API_HW_DEVICE() \ + [](const testing::TestParamInfo& info) { \ + return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_"; \ } namespace ov { From 88ff413c4d1a61dc86fb91f4ef66222185813253 Mon Sep 17 00:00:00 2001 From: Chen Peter Date: Sun, 25 Aug 2024 22:36:45 +0800 Subject: [PATCH 06/27] Update to MARK_MANDATORY_API_FOR_HW_DEVICE --- .../api_conformance_runner/src/ov_plugin/core_integration.cpp | 4 ++-- .../plugin/shared/include/base/ov_behavior_test_utils.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 1d6f1eecf36039..7717f79fd14060 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -20,7 +20,7 @@ namespace { INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelTestP, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_FOR_API_HW_DEVICE()); + MARK_MANDATORY_API_FOR_HW_DEVICE()); INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelOptionalTestP, @@ -31,5 +31,5 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_FOR_API_HW_DEVICE()); + MARK_MANDATORY_API_FOR_HW_DEVICE()); } // namespace diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 34b3ab5033fdd8..94bb49b577e478 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -39,7 +39,7 @@ return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_" + name; \ } -#define MARK_MANDATORY_FOR_API_HW_DEVICE() \ +#define MARK_MANDATORY_API_FOR_HW_DEVICE() \ [](const testing::TestParamInfo& info) { \ return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_"; \ } From 1eb33d8f8aef58a643b69ea291abe6e196e88491 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Mon, 26 Aug 2024 22:04:38 +0800 Subject: [PATCH 07/27] change macro name --- .../src/ov_plugin/properties.cpp | 11 ++++++----- .../shared/include/base/ov_behavior_test_utils.hpp | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp index 594f4c68b61dc9..f9ffaed32a6801 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp @@ -89,11 +89,12 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckChangePropComplieModleGetPr OVCheckChangePropComplieModleGetPropTests_DEVICE_ID::getTestCaseName); /* Add prefix mandatory_ to suffix (getTestCaseName) of HW plugin test cases */ -INSTANTIATE_TEST_SUITE_P( - ov_plugin, - OVCheckChangePropComplieModleGetPropTests_InferencePrecision, - ::testing::Combine(::testing::Values(ov::test::utils::target_device), ::testing::Values(ov::AnyMap({}))), - MARK_MANDATORY_FOR_HW_DEVICE(OVCheckChangePropComplieModleGetPropTests_InferencePrecision::getTestCaseName)); +INSTANTIATE_TEST_SUITE_P(ov_plugin, + OVCheckChangePropComplieModleGetPropTests_InferencePrecision, + ::testing::Combine(::testing::Values(ov::test::utils::target_device), + ::testing::Values(ov::AnyMap({}))), + MARK_MANDATORY_PROPERTY_FOR_HW_DEVICE( + OVCheckChangePropComplieModleGetPropTests_InferencePrecision::getTestCaseName)); INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckMetricsPropsTests_ModelDependceProps, ::testing::Combine( diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 94bb49b577e478..8e562ec8582d6e 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -30,7 +30,7 @@ #include "common_test_utils/subgraph_builders/concat_with_params.hpp" #include "common_test_utils/subgraph_builders/split_concat.hpp" -#define MARK_MANDATORY_FOR_HW_DEVICE(GET_TEST_NAME) \ +#define MARK_MANDATORY_PROPERTY_FOR_HW_DEVICE(GET_TEST_NAME) \ [](const testing::TestParamInfo& info) { \ std::string name = ""; \ if (nullptr != GET_TEST_NAME) { \ From 820a47f4635a7c5cb8e4f5a29f3fc6fa80208954 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Tue, 27 Aug 2024 16:43:24 +0800 Subject: [PATCH 08/27] fix empty string failure --- .../plugin/shared/include/base/ov_behavior_test_utils.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 8e562ec8582d6e..8367129451f8e4 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -39,9 +39,9 @@ return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_" + name; \ } -#define MARK_MANDATORY_API_FOR_HW_DEVICE() \ - [](const testing::TestParamInfo& info) { \ - return sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_"; \ +#define MARK_MANDATORY_API_FOR_HW_DEVICE() \ + [](const testing::TestParamInfo& info) { \ + return sw_plugin_in_target_device(ov::test::utils::target_device) ? "optional_" : "mandatory_"; \ } namespace ov { From 2c6be6e2213c7d34031a5beee4c24c3e745fdb5f Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Thu, 29 Aug 2024 11:13:18 +0800 Subject: [PATCH 09/27] remove sw_plugin_in_target_device --- .../plugin/shared/include/behavior/ov_plugin/query_model.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp index a8a5a7c4a299c7..7d1a3084fe6717 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/query_model.hpp @@ -76,9 +76,6 @@ TEST_P(OVClassQueryModelTest, QueryModelWithMatMul) { } TEST_P(OVClassQueryModelTest, QueryModelHETEROWithDeviceIDNoThrow) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core ie = ov::test::utils::create_core(); auto deviceIDs = ie.get_property(target_device, ov::available_devices); From d0cedf66c5943bc714a5589686a1ea12ef090941 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Tue, 3 Sep 2024 13:26:25 +0800 Subject: [PATCH 10/27] remove OVClassModelTestP in test suite --- .../src/ov_plugin/core_integration.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 7717f79fd14060..04b9065672b0b2 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -17,11 +17,6 @@ namespace { // OV Class Common tests with // -INSTANTIATE_TEST_SUITE_P(ov_plugin, - OVClassModelTestP, - ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_API_FOR_HW_DEVICE()); - INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelOptionalTestP, ::testing::Values(ov::test::utils::target_device)); From 3da49e3bec824e70c0bccd80e646fb13bf44f0be Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Mon, 9 Sep 2024 15:54:14 +0800 Subject: [PATCH 11/27] fix OVCheckChangePropComplieModleGetPropTests_DEVICE_ID --- .../src/ov_plugin/properties.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp index 107301247cb339..5343b4a99bfb37 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp @@ -82,11 +82,11 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckSetIncorrectRWMetricsPropsTests, {}, sw_plugin_in_target_device(ov::test::utils::target_device)))), OVCheckSetIncorrectRWMetricsPropsTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckChangePropComplieModleGetPropTests_DEVICE_ID, - ::testing::Combine( - ::testing::Values(ov::test::utils::target_device), - ::testing::Values(ov::AnyMap({}))), - OVCheckChangePropComplieModleGetPropTests_DEVICE_ID::getTestCaseName); +INSTANTIATE_TEST_SUITE_P( + ov_plugin, + OVCheckChangePropComplieModleGetPropTests_DEVICE_ID, + ::testing::Combine(::testing::Values(ov::test::utils::target_device), ::testing::Values(ov::AnyMap({}))), + MARK_MANDATORY_PROPERTY_FOR_HW_DEVICE(OVCheckChangePropComplieModleGetPropTests_DEVICE_ID::getTestCaseName)); /* Add prefix mandatory_ to suffix (getTestCaseName) of HW plugin test cases */ INSTANTIATE_TEST_SUITE_P( From 746f47c390748c5a057f8fd7ff2410e7e50494b5 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Mon, 9 Sep 2024 15:55:19 +0800 Subject: [PATCH 12/27] remove sw_plugin_in_target_device in OVCheckChangePropComplieModleGetPropTests_DEVICE_ID --- .../plugin/shared/src/behavior/ov_plugin/properties_tests.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp index e144201d9b3fc4..91a464df65daf7 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp @@ -479,9 +479,6 @@ TEST_P(OVCheckGetSupportedROMetricsPropsTests, ChangeCorrectProperties) { } TEST_P(OVCheckChangePropComplieModleGetPropTests_DEVICE_ID, ChangeCorrectDeviceProperties) { - if (sw_plugin_in_target_device(target_device)) { - return; - } std::vector supported_properties; OV_ASSERT_NO_THROW(supported_properties = core->get_property(target_device, ov::supported_properties)); auto supported = util::contains(supported_properties, ov::device::id); From 26aae196a49c1954bc6e121c5c978d9310a5de9c Mon Sep 17 00:00:00 2001 From: Chen Peter Date: Mon, 9 Sep 2024 16:08:41 +0800 Subject: [PATCH 13/27] MARK_MANDATORY_API_FOR_HW_DEVICE support NULL --- .../src/ov_plugin/core_integration.cpp | 2 +- .../shared/include/base/ov_behavior_test_utils.hpp | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 04b9065672b0b2..278aeecb32d591 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -26,5 +26,5 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_API_FOR_HW_DEVICE()); + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); } // namespace diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 1f6a4ce8dcbab0..9d6d39abcfb9fd 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -36,11 +36,14 @@ return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } -#define MARK_MANDATORY_API_FOR_HW_DEVICE() \ - [](const testing::TestParamInfo& info) { \ - return sw_plugin_in_target_device(ov::test::utils::target_device) ? "optional_" : "mandatory_"; \ +static void (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; +#define MARK_MANDATORY_API_FOR_HW_DEVICE(GET_TEST_NAME) \ + [](const testing::TestParamInfo& info) { \ + std::string name = ""; \ + if (NULL ! = GET_TEST_NAME) \ + name += GET_TEST_NAME(info); \ + return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } - namespace ov { namespace test { namespace behavior { From 33ee9a0e1ce5a5b156c10e593af087c5887c3390 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 11:06:03 +0800 Subject: [PATCH 14/27] Revert "MARK_MANDATORY_API_FOR_HW_DEVICE support NULL" This reverts commit 26aae196a49c1954bc6e121c5c978d9310a5de9c. --- .../src/ov_plugin/core_integration.cpp | 2 +- .../shared/include/base/ov_behavior_test_utils.hpp | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 278aeecb32d591..04b9065672b0b2 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -26,5 +26,5 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); + MARK_MANDATORY_API_FOR_HW_DEVICE()); } // namespace diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 9d6d39abcfb9fd..1f6a4ce8dcbab0 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -36,14 +36,11 @@ return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } -static void (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; -#define MARK_MANDATORY_API_FOR_HW_DEVICE(GET_TEST_NAME) \ - [](const testing::TestParamInfo& info) { \ - std::string name = ""; \ - if (NULL ! = GET_TEST_NAME) \ - name += GET_TEST_NAME(info); \ - return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ +#define MARK_MANDATORY_API_FOR_HW_DEVICE() \ + [](const testing::TestParamInfo& info) { \ + return sw_plugin_in_target_device(ov::test::utils::target_device) ? "optional_" : "mandatory_"; \ } + namespace ov { namespace test { namespace behavior { From 47f064afd986d91d74b848e0892061636a63551f Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 11:16:33 +0800 Subject: [PATCH 15/27] remove sw_plugin_in_target_device --- .../src/ov_plugin/properties.cpp | 14 ++++++++------ .../shared/include/base/ov_behavior_test_utils.hpp | 6 +++--- .../src/behavior/ov_plugin/properties_tests.cpp | 12 ------------ 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp index 5343b4a99bfb37..27c65e0b0d1619 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp @@ -105,17 +105,19 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckMetricsPropsTests_ModelDependceProps, // OV Class GetMetric // -INSTANTIATE_TEST_SUITE_P( - ov_plugin_mandatory, OVGetMetricPropsTest, - ::testing::Values(ov::test::utils::target_device)); +INSTANTIATE_TEST_SUITE_P(ov_plugin, + OVGetMetricPropsTest, + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_API_FOR_HW_DEVICE()); INSTANTIATE_TEST_SUITE_P( ov_plugin, OVGetMetricPropsOptionalTest, ::testing::Values(ov::test::utils::target_device)); -INSTANTIATE_TEST_SUITE_P( - ov_plugin_mandatory, OVGetAvailableDevicesPropsTest, - ::testing::Values(ov::test::utils::target_device)); +INSTANTIATE_TEST_SUITE_P(ov_plugin, + OVGetAvailableDevicesPropsTest, + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_API_FOR_HW_DEVICE()); // // OV Class GetConfig diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 1f6a4ce8dcbab0..3ec93be548d29c 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -30,9 +30,9 @@ #include "common_test_utils/subgraph_builders/concat_with_params.hpp" #include "common_test_utils/subgraph_builders/split_concat.hpp" -#define MARK_MANDATORY_PROPERTY_FOR_HW_DEVICE(GET_TEST_NAME) \ - [](const testing::TestParamInfo& info) { \ - std::string name = GET_TEST_NAME(info); \ +#define MARK_MANDATORY_PROPERTY_FOR_HW_DEVICE(GET_TEST_NAME) \ + [](const testing::TestParamInfo& info) { \ + std::string name = GET_TEST_NAME(info); \ return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp index 91a464df65daf7..2c70ec46079994 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/properties_tests.cpp @@ -588,9 +588,6 @@ TEST_P(OVCheckMetricsPropsTests_ModelDependceProps, ChangeCorrectDevicePropertie TEST_P(OVClassSetDefaultDeviceIDPropTest, SetDefaultDeviceIDNoThrow) { ov::Core ie = ov::test::utils::create_core(); // sw plugins are not requested to support `ov::available_devices` and ` ov::device::id` property - if (sw_plugin_in_target_device(target_device)) { - return; - } auto deviceIDs = ie.get_property(target_device, ov::available_devices); if (std::find(deviceIDs.begin(), deviceIDs.end(), deviceID) == deviceIDs.end()) { GTEST_FAIL(); @@ -613,9 +610,6 @@ TEST_P(OVSpecificDeviceSetConfigTest, GetConfigSpecificDeviceNoThrow) { deviceID = target_device.substr(pos + 1, target_device.size()); } // sw plugins are not requested to support `ov::available_devices`, `ov::device::id` and `ov::num_streams` property - if (sw_plugin_in_target_device(target_device)) { - return; - } auto deviceIDs = ie.get_property(clear_target_device, ov::available_devices); if (std::find(deviceIDs.begin(), deviceIDs.end(), deviceID) == deviceIDs.end()) { GTEST_FAIL() << "No DeviceID" << std::endl; @@ -672,9 +666,6 @@ TEST_P(OVSpecificDeviceGetConfigTest, GetConfigSpecificDeviceNoThrow) { } TEST_P(OVGetAvailableDevicesPropsTest, GetAvailableDevicesNoThrow) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core ie = ov::test::utils::create_core(); std::vector devices; @@ -727,9 +718,6 @@ TEST_P(OVClassSetDevicePriorityConfigPropsTest, SetConfigAndCheckGetConfigNoThro } TEST_P(OVGetMetricPropsTest, GetMetricAndPrintNoThrow_AVAILABLE_DEVICES) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core ie = ov::test::utils::create_core(); std::vector device_ids; From b6ee44fb78504de53ae6f84abfb13f4a03c46f4c Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 11:57:59 +0800 Subject: [PATCH 16/27] remove sw_plugin_target_device in life_time.cpp --- .../api_conformance_runner/src/ov_plugin/life_time.cpp | 7 ++++--- .../plugin/shared/src/behavior/ov_plugin/life_time.cpp | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp index 2ca9df779c4295..85b20e24aeb6cd 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp @@ -14,7 +14,8 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVHoldersTest, ::testing::Values(ov::test::utils::target_device), OVHoldersTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVHoldersTestOnImportedNetwork, - ::testing::Values(ov::test::utils::target_device), - OVHoldersTestOnImportedNetwork::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(ov_plugin, + OVHoldersTestOnImportedNetwork, + ::testing::Values(ov::test::utils::target_device), + MARK_MANDATORY_API_FOR_HW_DEVICE(OVHoldersTestOnImportedNetwork::getTestCaseName)); } // namespace diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp index d465941ac0246f..23d161f7ec16a3 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/life_time.cpp @@ -148,9 +148,6 @@ void OVHoldersTestOnImportedNetwork::TearDown() { } TEST_P(OVHoldersTestOnImportedNetwork, LoadedTensor) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core core = ov::test::utils::create_core(); std::stringstream stream; { @@ -163,9 +160,6 @@ TEST_P(OVHoldersTestOnImportedNetwork, LoadedTensor) { } TEST_P(OVHoldersTestOnImportedNetwork, CreateRequestWithCoreRemoved) { - if (sw_plugin_in_target_device(target_device)) { - return; - } ov::Core core = ov::test::utils::create_core(); std::stringstream stream; { From 67809f9a777e66d16670262ddde96949119689d1 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 12:19:33 +0800 Subject: [PATCH 17/27] add header --- .../api_conformance_runner/src/ov_plugin/life_time.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp index 85b20e24aeb6cd..01c94259eb9d69 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/life_time.cpp @@ -4,6 +4,7 @@ #include "behavior/ov_plugin/life_time.hpp" #include "ov_api_conformance_helpers.hpp" +#include "base/ov_behavior_test_utils.hpp" using namespace ov::test::behavior; using namespace ov::test::conformance; From e2f8ab802e568804e26936e72c19d6d57756823f Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 15:49:06 +0800 Subject: [PATCH 18/27] add function point for MARK_MANDATORY_API_FOR_HW_DEVICE --- .../plugin/shared/include/base/ov_behavior_test_utils.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 3ec93be548d29c..d7bb3945893638 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -36,9 +36,13 @@ return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } -#define MARK_MANDATORY_API_FOR_HW_DEVICE() \ +static void (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; +#define MARK_MANDATORY_API_FOR_HW_DEVICE(GET_TEST_NAME) \ [](const testing::TestParamInfo& info) { \ - return sw_plugin_in_target_device(ov::test::utils::target_device) ? "optional_" : "mandatory_"; \ + std::string name = ""; \ + if (NULL != GET_TEST_NAME) \ + name += GET_TEST_NAME(info); \ + return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } namespace ov { From d4b3a381c9bc6ac24c70f5f125235447ec30f55d Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 15:52:09 +0800 Subject: [PATCH 19/27] add function pointer for MARK_MANDATORY_API_FOR_HW_DEVICE --- .../api_conformance_runner/src/ov_plugin/core_integration.cpp | 2 +- .../api_conformance_runner/src/ov_plugin/properties.cpp | 4 ++-- .../plugin/shared/include/base/ov_behavior_test_utils.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 04b9065672b0b2..278aeecb32d591 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -26,5 +26,5 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_API_FOR_HW_DEVICE()); + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp index 27c65e0b0d1619..41b00e4a4a2187 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp @@ -108,7 +108,7 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckMetricsPropsTests_ModelDependceProps, INSTANTIATE_TEST_SUITE_P(ov_plugin, OVGetMetricPropsTest, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_API_FOR_HW_DEVICE()); + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); INSTANTIATE_TEST_SUITE_P( ov_plugin, OVGetMetricPropsOptionalTest, @@ -117,7 +117,7 @@ INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(ov_plugin, OVGetAvailableDevicesPropsTest, ::testing::Values(ov::test::utils::target_device), - MARK_MANDATORY_API_FOR_HW_DEVICE()); + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); // // OV Class GetConfig diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index d7bb3945893638..25fa273e7812cd 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -36,7 +36,7 @@ return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } -static void (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; +static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; #define MARK_MANDATORY_API_FOR_HW_DEVICE(GET_TEST_NAME) \ [](const testing::TestParamInfo& info) { \ std::string name = ""; \ From ad7a975dfdb5a872edb8e12f1da583c7e26033bc Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 16:12:20 +0800 Subject: [PATCH 20/27] move pointer --- .../api_conformance_runner/src/ov_plugin/core_integration.cpp | 1 + .../api_conformance_runner/src/ov_plugin/properties.cpp | 1 + .../plugin/shared/include/base/ov_behavior_test_utils.hpp | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 278aeecb32d591..1b57af9f3adfe0 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -23,6 +23,7 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, // OV Class Query network +static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassQueryModelTest, ::testing::Values(ov::test::utils::target_device), diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp index 41b00e4a4a2187..07e2952a5df831 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp @@ -105,6 +105,7 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckMetricsPropsTests_ModelDependceProps, // OV Class GetMetric // +static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; INSTANTIATE_TEST_SUITE_P(ov_plugin, OVGetMetricPropsTest, ::testing::Values(ov::test::utils::target_device), diff --git a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp index 25fa273e7812cd..a4f3b57d65bd5d 100644 --- a/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp +++ b/src/tests/functional/plugin/shared/include/base/ov_behavior_test_utils.hpp @@ -36,7 +36,6 @@ return (sw_plugin_in_target_device(ov::test::utils::target_device) ? "" : "mandatory_") + name; \ } -static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; #define MARK_MANDATORY_API_FOR_HW_DEVICE(GET_TEST_NAME) \ [](const testing::TestParamInfo& info) { \ std::string name = ""; \ From d0eb4cad1746c075c3e14a69a7769eab83b93e54 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 17:15:36 +0800 Subject: [PATCH 21/27] fix hetero error --- .../behavior/ov_plugin/properties_tests.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp index 5b691e8ec83328..06fc26ccf16448 100644 --- a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp +++ b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp @@ -6,6 +6,7 @@ #include "behavior/compiled_model/properties.hpp" #include "openvino/runtime/properties.hpp" +#include "base/ov_behavior_test_utils.hpp" namespace ov { namespace test { @@ -32,9 +33,11 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, ::testing::ValuesIn(hetero_properties)), OVPropertiesTests::getTestCaseName); +static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; INSTANTIATE_TEST_SUITE_P(smoke_HeteroOVGetMetricPropsTest, OVGetMetricPropsTest, - ::testing::Values(ov::test::utils::DEVICE_HETERO)); + ::testing::Values(ov::test::utils::DEVICE_HETERO), + MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); INSTANTIATE_TEST_SUITE_P( smoke_HeteroOVCheckGetSupportedROMetricsPropsTests, From 7e40e6a1b5cfb790d2c332bc0a110ecd4c20acd6 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 11 Sep 2024 17:26:27 +0800 Subject: [PATCH 22/27] fix code style --- .../behavior/ov_plugin/properties_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp index 06fc26ccf16448..260faf92370774 100644 --- a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp +++ b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp @@ -4,9 +4,9 @@ #include "behavior/ov_plugin/properties_tests.hpp" +#include "base/ov_behavior_test_utils.hpp" #include "behavior/compiled_model/properties.hpp" #include "openvino/runtime/properties.hpp" -#include "base/ov_behavior_test_utils.hpp" namespace ov { namespace test { From ec2b2e72037ecedcf670ef871cd676435370496c Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Fri, 13 Sep 2024 10:17:30 +0800 Subject: [PATCH 23/27] skip GetMetricAndPrintNoThrow_AVAILABLE_DEVICES for hetero --- src/plugins/hetero/tests/functional/skip_tests_config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/hetero/tests/functional/skip_tests_config.cpp b/src/plugins/hetero/tests/functional/skip_tests_config.cpp index 28dd6da43e385b..eabe59bd5cc80e 100644 --- a/src/plugins/hetero/tests/functional/skip_tests_config.cpp +++ b/src/plugins/hetero/tests/functional/skip_tests_config.cpp @@ -14,6 +14,6 @@ std::vector disabledTestPatterns() { R"(.*smoke_(Multi|Auto|Hetero)_BehaviorTests.*OVPropertiesTests.*SetCorrectProperties.*)", R"(.*smoke_(Multi|Auto|Hetero)_BehaviorTests.*OVPropertiesTests.*canSetPropertyAndCheckGetProperty.*)", R"(.*OVInferRequestCheckTensorPrecision.*get(Input|Output|Inputs|Outputs)From.*FunctionWith(Single|Several).*type=(u4|u1|i4|boolean).*)", - }; + R"(.*OVGetMetricPropsTest.*OVGetMetricPropsTest.*GetMetricAndPrintNoThrow_AVAILABLE_DEVICES.*)"}; return retVector; } From ca0d4627fc838dcfe945deddd0bd0c5354de79b5 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Fri, 13 Sep 2024 10:26:10 +0800 Subject: [PATCH 24/27] revert --- .../behavior/ov_plugin/properties_tests.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp index 260faf92370774..0afe1b0ffca340 100644 --- a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp +++ b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp @@ -4,7 +4,6 @@ #include "behavior/ov_plugin/properties_tests.hpp" -#include "base/ov_behavior_test_utils.hpp" #include "behavior/compiled_model/properties.hpp" #include "openvino/runtime/properties.hpp" @@ -36,8 +35,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; INSTANTIATE_TEST_SUITE_P(smoke_HeteroOVGetMetricPropsTest, OVGetMetricPropsTest, - ::testing::Values(ov::test::utils::DEVICE_HETERO), - MARK_MANDATORY_API_FOR_HW_DEVICE(NULL_getTestCaseName)); + ::testing::Values(ov::test::utils::DEVICE_HETERO)); INSTANTIATE_TEST_SUITE_P( smoke_HeteroOVCheckGetSupportedROMetricsPropsTests, From 5c7ae6db333d34370d6313a8bcb8a042dd9338ce Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Fri, 13 Sep 2024 10:26:42 +0800 Subject: [PATCH 25/27] remove pointer --- .../behavior/ov_plugin/properties_tests.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp index 0afe1b0ffca340..5b691e8ec83328 100644 --- a/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp +++ b/src/plugins/hetero/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp @@ -32,7 +32,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, ::testing::ValuesIn(hetero_properties)), OVPropertiesTests::getTestCaseName); -static std::string (*NULL_getTestCaseName)(const testing::TestParamInfo& info) = NULL; INSTANTIATE_TEST_SUITE_P(smoke_HeteroOVGetMetricPropsTest, OVGetMetricPropsTest, ::testing::Values(ov::test::utils::DEVICE_HETERO)); From f02dfa42a6f807b5c2d8eeb51575458f17af0577 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Tue, 24 Sep 2024 16:24:35 +0800 Subject: [PATCH 26/27] revert OVClassModelTestP --- .../api_conformance_runner/src/ov_plugin/core_integration.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 1b57af9f3adfe0..7c79f084b55893 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -17,6 +17,10 @@ namespace { // OV Class Common tests with // +INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, + OVClassModelTestP, + ::testing::Values(ov::test::utils::target_device)); + INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelOptionalTestP, ::testing::Values(ov::test::utils::target_device)); From 38f652409ed587c96584238865addd72d33c01b9 Mon Sep 17 00:00:00 2001 From: panhaiqi Date: Wed, 25 Sep 2024 17:12:50 +0800 Subject: [PATCH 27/27] fix code style --- .../src/ov_plugin/core_integration.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp index 7c79f084b55893..7f0f0d43ecfae0 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/core_integration.cpp @@ -17,10 +17,8 @@ namespace { // OV Class Common tests with // -INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, - OVClassModelTestP, - ::testing::Values(ov::test::utils::target_device)); - +INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVClassModelTestP, ::testing::Values(ov::test::utils::target_device)); + INSTANTIATE_TEST_SUITE_P(ov_plugin, OVClassModelOptionalTestP, ::testing::Values(ov::test::utils::target_device));