Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Mar 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebc82d6
[API CONFORMANCE] Move some propeties from mandatory to optional for …
iefode Mar 19, 2024
6624a39
Merge branch 'master' into api_conformance_update
iefode Mar 19, 2024
c3ce7fd
Apply review comments
iefode Mar 20, 2024
927bc32
Move cpu specific test from dhared lib
iefode Mar 21, 2024
99e7de7
Revert move tests
iefode Mar 21, 2024
baab421
Merge branch 'master' into api_conformance_update
iefode Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
0 ..._executable_network/exec_network_base.cpp → ...c/ov_compiled_model/exec_network_base.cpp
View file
Open in desktop
File renamed without changes.
0 .../src/ov_executable_network/get_metric.cpp → ...nner/src/ov_compiled_model/get_metric.cpp
View file
Open in desktop
File renamed without changes.
0 ...nner/src/compiled_model/import_export.cpp → ...r/src/ov_compiled_model/import_export.cpp
View file
Open in desktop
File renamed without changes.
0 .../src/ov_executable_network/properties.cpp → ...nner/src/ov_compiled_model/properties.cpp
View file
Open in desktop
File renamed without changes.
20 changes: 13 additions & 7 deletions ...tional/plugin/conformance/test_runner/api_conformance_runner/src/ov_plugin/properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
13 changes: 6 additions & 7 deletions src/tests/functional/plugin/shared/include/behavior/ov_plugin/properties_tests.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down Expand Up @@ -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;
Expand Down
Loading
Loading