[API CONFORMANCE] Modify API conformance suite for SW plugins (#23557)

### Details: - *Move some properties from mandatory to optional for sw plugins* - *...* ### Tickets: - *[133459](https://jira.devtools.intel.com/browse/CVS-133459)*
openvinotoolkit · Mar 22, 2024 · 791feb4 · 791feb4
1 parent a47e3f6
commit 791feb4
Show file tree

Hide file tree

Showing 8 changed files with 136 additions and 70 deletions.
diff --git a/...intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/...intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp
@@ -133,6 +133,11 @@ const std::vector<ov::AnyMap> configsDevicePropertiesDouble = {
      ov::device::properties(ov::AnyMap{{"CPU", ov::AnyMap{ov::num_streams(5)}}})}};
 
 
+
+
+
+
+
 // OV Class load and check network with ov::device::properties
 INSTANTIATE_TEST_SUITE_P(smoke_CPU_OVClassCompileModelAndCheckSecondaryPropertiesTest,
                          OVClassCompileModelAndCheckSecondaryPropertiesTest,

diff --git a/..._executable_network/exec_network_base.cpp → ...c/ov_compiled_model/exec_network_base.cpp b/..._executable_network/exec_network_base.cpp → ...c/ov_compiled_model/exec_network_base.cpp
diff --git a/.../src/ov_executable_network/get_metric.cpp → ...nner/src/ov_compiled_model/get_metric.cpp b/.../src/ov_executable_network/get_metric.cpp → ...nner/src/ov_compiled_model/get_metric.cpp
diff --git a/...nner/src/compiled_model/import_export.cpp → ...r/src/ov_compiled_model/import_export.cpp b/...nner/src/compiled_model/import_export.cpp → ...r/src/ov_compiled_model/import_export.cpp
diff --git a/.../src/ov_executable_network/properties.cpp → ...nner/src/ov_compiled_model/properties.cpp b/.../src/ov_executable_network/properties.cpp → ...nner/src/ov_compiled_model/properties.cpp
diff --git a/...tional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp b/...tional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp
@@ -24,7 +24,7 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVPropertiesIncorrectTests,
 
 const std::vector<ov::AnyMap> default_properties = {
         {},
-        {ov::enable_profiling(true)},
+        {ov::enable_profiling(false)},
 };
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVPropertiesTests,
@@ -36,37 +36,43 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVPropertiesTests,
 INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckGetSupportedROMetricsPropsTests,
         ::testing::Combine(
                         ::testing::Values(ov::test::utils::target_device),
-                        ::testing::ValuesIn(OVCheckGetSupportedROMetricsPropsTests::getROMandatoryProperties())),
+                        ::testing::ValuesIn(OVCheckGetSupportedROMetricsPropsTests::getROMandatoryProperties(
+                                sw_plugin_in_target_device(ov::test::utils::target_device)))),
         OVCheckGetSupportedROMetricsPropsTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckGetSupportedROMetricsPropsTests,
         ::testing::Combine(
                         ::testing::Values(ov::test::utils::target_device),
-                        ::testing::ValuesIn(OVCheckGetSupportedROMetricsPropsTests::getROOptionalProperties())),
+                        ::testing::ValuesIn(OVCheckGetSupportedROMetricsPropsTests::getROOptionalProperties(
+                                sw_plugin_in_target_device(ov::test::utils::target_device)))),
         OVCheckGetSupportedROMetricsPropsTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckSetSupportedRWMetricsPropsTests,
         ::testing::Combine(
                         ::testing::Values(ov::test::utils::target_device),
-                        ::testing::ValuesIn(OVCheckSetSupportedRWMetricsPropsTests::getRWMandatoryPropertiesValues())),
+                        ::testing::ValuesIn(OVCheckSetSupportedRWMetricsPropsTests::getRWMandatoryPropertiesValues(
+                                {}, sw_plugin_in_target_device(ov::test::utils::target_device)))),
         OVCheckSetSupportedRWMetricsPropsTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckSetSupportedRWMetricsPropsTests,
         ::testing::Combine(
                         ::testing::Values(ov::test::utils::target_device),
-                        ::testing::ValuesIn(OVCheckSetSupportedRWMetricsPropsTests::getRWOptionalPropertiesValues())),
+                        ::testing::ValuesIn(OVCheckSetSupportedRWMetricsPropsTests::getRWOptionalPropertiesValues(
+                                {}, sw_plugin_in_target_device(ov::test::utils::target_device)))),
         OVCheckSetSupportedRWMetricsPropsTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckSetIncorrectRWMetricsPropsTests,
         ::testing::Combine(
                         ::testing::Values(ov::test::utils::target_device),
-                        ::testing::ValuesIn(OVCheckSetIncorrectRWMetricsPropsTests::getWrongRWMandatoryPropertiesValues())),
+                        ::testing::ValuesIn(OVCheckSetIncorrectRWMetricsPropsTests::getWrongRWMandatoryPropertiesValues(
+                                {}, sw_plugin_in_target_device(ov::test::utils::target_device)))),
         OVCheckSetIncorrectRWMetricsPropsTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckSetIncorrectRWMetricsPropsTests,
         ::testing::Combine(
                         ::testing::Values(ov::test::utils::target_device),
-                        ::testing::ValuesIn(OVCheckSetIncorrectRWMetricsPropsTests::getWrongRWOptionalPropertiesValues())),
+                        ::testing::ValuesIn(OVCheckSetIncorrectRWMetricsPropsTests::getWrongRWOptionalPropertiesValues(
+                                {}, sw_plugin_in_target_device(ov::test::utils::target_device)))),
         OVCheckSetIncorrectRWMetricsPropsTests::getTestCaseName);
 
 INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckChangePropComplieModleGetPropTests_DEVICE_ID,

diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_plugin/properties_tests.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_plugin/properties_tests.hpp
@@ -67,14 +67,14 @@ class OVPropertiesTestsWithCompileModelProps : public testing::WithParamInterfac
 
     AnyMap compileModelProperties;
 
-    static std::vector<ov::AnyMap> getROMandatoryProperties();
-    static std::vector<ov::AnyMap> getROOptionalProperties();
+    static std::vector<ov::AnyMap> getROMandatoryProperties(bool is_sw_device = false);
+    static std::vector<ov::AnyMap> getROOptionalProperties(bool is_sw_device = false);
     static std::vector<ov::AnyMap> configureProperties(std::vector<std::string> props);
 
-    static std::vector<ov::AnyMap> getRWMandatoryPropertiesValues(std::vector<std::string> props = {});
-    static std::vector<ov::AnyMap> getWrongRWMandatoryPropertiesValues(std::vector<std::string> props = {});
-    static std::vector<ov::AnyMap> getRWOptionalPropertiesValues(std::vector<std::string> props = {});
-    static std::vector<ov::AnyMap> getWrongRWOptionalPropertiesValues(std::vector<std::string> props = {});
+    static std::vector<ov::AnyMap> getRWMandatoryPropertiesValues(const std::vector<std::string>& props = {}, bool is_sw_device = false);
+    static std::vector<ov::AnyMap> getWrongRWMandatoryPropertiesValues(const std::vector<std::string>& props = {}, bool is_sw_device = false);
+    static std::vector<ov::AnyMap> getRWOptionalPropertiesValues(const std::vector<std::string>& props = {}, bool is_sw_device = false);
+    static std::vector<ov::AnyMap> getWrongRWOptionalPropertiesValues(const std::vector<std::string>& props = {}, bool is_sw_device = false);
 
     static std::vector<ov::AnyMap> getModelDependcePropertiesValues();
 };
@@ -105,7 +105,6 @@ using OVClassCompileModelWithCondidateDeviceListContainedMetaPluginTest = OVClas
 using OVClassCompileModelReturnDefaultHintTest = OVClassSetDevicePriorityConfigPropsTest;
 using OVClassCompileModelDoNotReturnDefaultHintTest = OVClassSetDevicePriorityConfigPropsTest;
 using OVClassCompileModelAndCheckSecondaryPropertiesTest = OVClassSetDevicePriorityConfigPropsTest;
-
 using OVGetConfigTest = OVClassBaseTestP;
 using OVSpecificDeviceSetConfigTest = OVClassBaseTestP;
 using OVSpecificDeviceGetConfigTest = OVClassBaseTestP;