IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[apiConformance] Move sw plugin to run with Template only (#20084)

Browse Source 
* [apiConformance] Move sw plugin to run over TEMPLATE

* Fix set_property

* update

* add configs for sw plugins
This commit is contained in:
Sofya Balandina 2023-10-30 13:45:46 +00:00 committed by GitHub
parent 439b7e57c7
commit 061d6b5b62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 93 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp
View File

@ -1,111 +0,0 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#pragma once
#include "conformance.hpp"
#include "common_test_utils/test_constants.hpp"
namespace ov {
namespace test {
namespace conformance {
inline const std::string get_plugin_lib_name_by_device(const std::string& deviceName) {
const std::map<std::string, std::string> devices{
{ "AUTO", "openvino_auto_plugin" },
{ "HETERO", "openvino_hetero_plugin" },
{ "BATCH", "openvino_auto_batch_plugin" },
{ "MULTI", "openvino_auto_plugin" },
{ "NPU", "openvino_intel_npu_plugin" },
{ "CPU", "openvino_intel_cpu_plugin" },
{ "GNA", "openvino_intel_gna_plugin" },
{ "GPU", "openvino_intel_gpu_plugin" },
{ "TEMPLATE", "openvino_template_plugin" },
{ "NVIDIA", "openvino_nvidia_gpu_plugin" },
};
if (devices.find(deviceName) == devices.end()) {
if (std::string(targetPluginName) != "") {
return targetPluginName;
}
throw std::runtime_error("Incorrect device name");
}
return devices.at(deviceName);
}
inline const std::pair<std::string, std::string> generate_default_multi_config() {
return {MULTI_CONFIG_KEY(DEVICE_PRIORITIES), ov::test::conformance::targetDevice};
}
inline const std::pair<std::string, std::string> generate_default_hetero_config() {
return { "TARGET_FALLBACK" , ov::test::conformance::targetDevice };
}
inline const std::pair<std::string, std::string> generate_default_batch_config() {
// auto-batching with batch 1 (no real batching in fact, but full machinery is in action)
return { CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , ov::test::conformance::targetDevice };
}
inline const std::vector<std::map<std::string, std::string>> generate_configs(const std::string& target_plugin,
const std::vector<std::map<std::string, std::string>>& config = {}) {
std::pair<std::string, std::string> default_config;
if (target_plugin == std::string(ov::test::utils::DEVICE_MULTI) || target_plugin == std::string(ov::test::utils::DEVICE_AUTO)) {
default_config = generate_default_multi_config();
} else if (target_plugin == std::string(ov::test::utils::DEVICE_HETERO)) {
default_config = generate_default_hetero_config();
} else if (target_plugin == std::string(ov::test::utils::DEVICE_BATCH)) {
default_config = generate_default_batch_config();
} else {
throw std::runtime_error("Incorrect target device: " + target_plugin);
}
std::vector<std::map<std::string, std::string>> resultConfig;
if (config.empty()) {
return {{default_config}};
}
for (auto configItem : config) {
configItem.insert(default_config);
resultConfig.push_back(configItem);
}
return resultConfig;
}
inline const std::string generate_complex_device_name(const std::string& deviceName) {
return deviceName + ":" + ov::test::conformance::targetDevice;
}
inline const std::vector<std::string> return_all_possible_device_combination(bool enable_complex_name = true) {
std::vector<std::string> res{ov::test::conformance::targetDevice};
std::vector<std::string> devices{ov::test::utils::DEVICE_HETERO, ov::test::utils::DEVICE_AUTO,
ov::test::utils::DEVICE_BATCH, ov::test::utils::DEVICE_MULTI};
for (const auto& device : devices) {
res.emplace_back(enable_complex_name ? generate_complex_device_name(device) : device);
}
return res;
}
inline std::vector<std::pair<std::string, std::string>> generate_pairs_plugin_name_by_device() {
std::vector<std::pair<std::string, std::string>> res;
for (const auto& device : return_all_possible_device_combination()) {
std::string real_device = device.substr(0, device.find(':'));
res.push_back(std::make_pair(get_plugin_lib_name_by_device(real_device),
real_device));
}
return res;
}
inline std::map<std::string, std::string> AnyMap2StringMap(const AnyMap& config) {
if (config.empty())
return {};
std::map<std::string, std::string> result;
for (const auto& configItem : config) {
result.insert({configItem.first, configItem.second.as<std::string>()});
}
return result;
}
const std::map<std::string, std::string> ie_config = AnyMap2StringMap(ov::test::conformance::pluginConfig);
} // namespace conformance
} // namespace test
} // namespace ov

53
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/ov_api_conformance_helpers.hpp
View File

@ -4,36 +4,53 @@
#pragma once
#include "api_conformance_helpers.hpp"
#include "conformance.hpp"
#include "common_test_utils/test_constants.hpp"
namespace ov {
namespace test {
namespace conformance {
inline const std::vector<ov::AnyMap> generate_ov_configs(const std::string& target_plugin,
const std::vector<ov::AnyMap>& config = {}) {
std::pair<std::string, ov::Any> default_config;
if (target_plugin == std::string(ov::test::utils::DEVICE_MULTI) ||
target_plugin == std::string(ov::test::utils::DEVICE_AUTO) ||
target_plugin == std::string(ov::test::utils::DEVICE_HETERO)) {
default_config = ov::device::priorities(ov::test::conformance::targetDevice);
} else if (target_plugin == std::string(ov::test::utils::DEVICE_BATCH)) {
default_config = { CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(ov::test::conformance::targetDevice)};
} else {
throw std::runtime_error("Incorrect target device: " + target_plugin);
}
inline const std::vector<ov::AnyMap> generate_ov_configs(const std::vector<ov::AnyMap>& config = {}) {
std::vector<ov::AnyMap> resultConfig;
if (config.empty()) {
return {{default_config}};
}
for (auto configItem : config) {
configItem.insert(default_config);
configItem.insert(ov::test::conformance::pluginConfig.begin(), ov::test::conformance::pluginConfig.end());
resultConfig.push_back(configItem);
}
return resultConfig;
}
inline const std::string get_plugin_lib_name_by_device(const std::string& deviceName) {
const std::map<std::string, std::string> devices{
{ "AUTO", "openvino_auto_plugin" },
{ "HETERO", "openvino_hetero_plugin" },
{ "BATCH", "openvino_auto_batch_plugin" },
{ "MULTI", "openvino_auto_plugin" },
{ "NPU", "openvino_intel_npu_plugin" },
{ "CPU", "openvino_intel_cpu_plugin" },
{ "GNA", "openvino_intel_gna_plugin" },
{ "GPU", "openvino_intel_gpu_plugin" },
{ "TEMPLATE", "openvino_template_plugin" },
{ "NVIDIA", "openvino_nvidia_gpu_plugin" },
};
if (devices.find(deviceName) == devices.end()) {
if (std::string(targetPluginName) != "") {
return targetPluginName;
}
throw std::runtime_error("Incorrect device name");
}
return devices.at(deviceName);
}
inline std::vector<std::pair<std::string, std::string>> generate_ov_pairs_plugin_name_by_device() {
std::vector<std::pair<std::string, std::string>> res;
std::string device(ov::test::conformance::targetDevice);
std::string real_device = device.substr(0, device.find(':'));
res.push_back(std::make_pair(get_plugin_lib_name_by_device(real_device),
real_device));
return res;
}
} // namespace conformance
} // namespace test
} // namespace ov

4
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp
View File

@ -32,12 +32,12 @@ INSTANTIATE_TEST_SUITE_P(ov_compiled_model,
OVCompiledGraphImportExportTest,
::testing::Combine(
::testing::ValuesIn(ovExecGraphInfoElemTypes),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVCompiledGraphImportExportTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassCompiledModelImportExportTestP,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
} // namespace

4
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_network_base.cpp
View File

@ -13,13 +13,13 @@ using namespace ov::test::conformance;
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_mandatory, OVCompiledModelBaseTest,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVCompiledModelBaseTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_compiled_model, OVCompiledModelBaseTestOptional,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVCompiledModelBaseTestOptional::getTestCaseName);
} // namespace

8
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp
View File

@ -16,7 +16,7 @@ using namespace ov::test::conformance;
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model_mandatory, OVClassCompiledModelGetPropertyTest,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
//
// Executable Network GetConfig / SetConfig
@ -24,15 +24,15 @@ INSTANTIATE_TEST_SUITE_P(
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model_mandatory, OVClassCompiledModelGetIncorrectPropertyTest,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model_mandatory, OVClassCompiledModelGetConfigTest,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassCompiledModelSetIncorrectConfigTest,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
} // namespace

34
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/properties.cpp
View File

@ -15,55 +15,35 @@ const std::vector<ov::AnyMap> inproperties = {
{ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")},
};
const std::vector<ov::AnyMap> auto_batch_inproperties = {};
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_mandatory, OVClassCompiledModelPropertiesIncorrectTests,
::testing::Combine(
::testing::ValuesIn(ov::test::conformance::return_all_possible_device_combination()),
::testing::ValuesIn(inproperties)),
::testing::Values(targetDevice),
::testing::ValuesIn(generate_ov_configs(inproperties))),
OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_AutoBatch, OVClassCompiledModelPropertiesIncorrectTests,
::testing::Combine(
::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(generate_ov_configs(ov::test::utils::DEVICE_BATCH, auto_batch_inproperties))),
OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);
const std::vector<ov::AnyMap> default_properties = {
{ov::enable_profiling(false)}
};
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_mandatory, OVClassCompiledModelPropertiesDefaultTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::ValuesIn(default_properties)),
OVClassCompiledModelPropertiesDefaultTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_mandatory, OVCompiledModelPropertiesDefaultSupportedTests,
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
OVCompiledModelPropertiesDefaultSupportedTests::getTestCaseName);
const std::vector<ov::AnyMap> auto_batch_properties = {
{{CONFIG_KEY(AUTO_BATCH_TIMEOUT) , "1"}},
{{ov::auto_batch_timeout(10)}},
};
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_mandatory, OVClassCompiledModelPropertiesTests,
::testing::Combine(
::testing::ValuesIn(ov::test::conformance::return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::ValuesIn(default_properties)),
OVClassCompiledModelPropertiesTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_AutoBatch, OVClassCompiledModelPropertiesTests,
::testing::Combine(
::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(ov::test::conformance::generate_ov_configs(ov::test::utils::DEVICE_BATCH, auto_batch_properties))),
OVClassCompiledModelPropertiesTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassCompiledModelEmptyPropertiesTests,
::testing::ValuesIn(ov::test::conformance::return_all_possible_device_combination()));
::testing::Values(targetDevice));
// IE Class Load network
@ -78,7 +58,7 @@ const std::vector<ov::AnyMap> multiModelPriorityConfigs = {
INSTANTIATE_TEST_SUITE_P(ov_compiled_model_mandatory,
OVClassCompiledModelGetPropertyTest_MODEL_PRIORITY,
::testing::Combine(::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Combine(::testing::Values(targetDevice),
::testing::ValuesIn(multiModelPriorityConfigs)));
} // namespace

2
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/callback.cpp
View File

@ -14,7 +14,7 @@ using namespace ov::test::conformance;
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestCallbackTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestCallbackTests::getTestCaseName);

2
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/cancellation.cpp
View File

@ -11,7 +11,7 @@ using namespace ov::test::conformance;
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestCancellationTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestCancellationTests::getTestCaseName);
} // namespace

4
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/infer_request_dynamic.cpp
View File

@ -60,7 +60,7 @@ INSTANTIATE_TEST_SUITE_P(ov_infer_request_1, OVInferRequestDynamicTests,
::testing::Values(std::vector<std::pair<std::vector<size_t>, std::vector<size_t>>>{
{{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(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestDynamicTests::getTestCaseName);
@ -70,7 +70,7 @@ INSTANTIATE_TEST_SUITE_P(ov_infer_request_2, OVInferRequestDynamicTests,
::testing::Values(std::vector<std::pair<std::vector<size_t>, std::vector<size_t>>>{
{{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(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestDynamicTests::getTestCaseName);
} // namespace

4
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/inference_chaining.cpp
View File

@ -12,13 +12,13 @@ using namespace ov::test::conformance;
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferenceChainingStatic,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferenceChaining::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferenceChaining,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferenceChaining::getTestCaseName);
} // namespace

10
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/io_tensor.cpp
View File

@ -14,7 +14,7 @@ using namespace ov::test::conformance;
namespace {
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestIOTensorTest,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestIOTensorTest::getTestCaseName);
@ -36,14 +36,14 @@ std::vector<ov::element::Type> ovIOTensorElemTypes = {
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestIOTensorSetPrecisionTest,
::testing::Combine(
::testing::ValuesIn(ovIOTensorElemTypes),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestIOTensorSetPrecisionTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestCheckTensorPrecision,
::testing::Combine(
::testing::ValuesIn(ovIOTensorElemTypes),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestCheckTensorPrecision::getTestCaseName);
@ -54,14 +54,14 @@ std::vector<ov::element::Type> ovIOTensorElemTypesOptional = {
INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestIOTensorSetPrecisionTest,
::testing::Combine(
::testing::ValuesIn(ovIOTensorElemTypesOptional),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestIOTensorSetPrecisionTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_infer_request, OVInferRequestCheckTensorPrecision,
::testing::Combine(
::testing::ValuesIn(ovIOTensorElemTypesOptional),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestCheckTensorPrecision::getTestCaseName);
} // namespace

2
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/multithreading.cpp
View File

@ -15,7 +15,7 @@ namespace {
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestMultithreadingTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestMultithreadingTests::getTestCaseName);

2
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/perf_counters.cpp
View File

@ -12,7 +12,7 @@ namespace {
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestPerfCountersTest,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestPerfCountersTest::getTestCaseName);

2
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_infer_request/wait.cpp
View File

@ -15,7 +15,7 @@ namespace {
INSTANTIATE_TEST_SUITE_P(ov_infer_request_mandatory, OVInferRequestWaitTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
OVInferRequestWaitTests::getTestCaseName);

12
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/caching_tests.cpp
View File

@ -42,8 +42,8 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, CompileModelCacheTestBase,
::testing::ValuesIn(CompileModelCacheTestBase::getAnyTypeOnlyFunctions()),
::testing::ValuesIn(ovElemTypesTemplate),
::testing::ValuesIn(ovBatchSizesTemplate),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(ov::AnyMap{})),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
CompileModelCacheTestBase::getTestCaseName);
// Convolution/UnaryElementwiseArithmetic/BinaryElementwiseArithmetic is not supported boolean elemnt type
@ -52,8 +52,8 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin_numeric, CompileModelCacheTestBase,
::testing::ValuesIn(CompileModelCacheTestBase::getNumericTypeOnlyFunctions()),
::testing::ValuesIn(ovElemAnyNumericTypesTemplate),
::testing::ValuesIn(ovBatchSizesTemplate),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(ov::AnyMap{})),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
CompileModelCacheTestBase::getTestCaseName);
// LSTMcell supported floating-point element type
@ -62,8 +62,8 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin_floating_point, CompileModelCacheTestBase,
::testing::ValuesIn(CompileModelCacheTestBase::getFloatingPointOnlyFunctions()),
::testing::ValuesIn(ovElemAnyFloatingPointTypesTemplate),
::testing::ValuesIn(ovBatchSizesTemplate),
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(ov::AnyMap{})),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
CompileModelCacheTestBase::getTestCaseName);
} // namespace

6
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/core_integration.cpp
View File

@ -18,15 +18,15 @@ namespace {
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory,
OVClassModelTestP,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(ov_plugin,
OVClassModelOptionalTestP,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
// IE Class Query network
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory,
OVClassQueryModelTest,
::testing::ValuesIn(return_all_possible_device_combination(false)));
::testing::Values(targetDevice));
} // namespace

4
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/life_time.cpp
View File

@ -11,10 +11,10 @@ using namespace ov::test::conformance;
namespace {
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVHoldersTest,
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
OVHoldersTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVHoldersTestOnImportedNetwork,
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
OVHoldersTestOnImportedNetwork::getTestCaseName);
} // namespace

50
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_plugin/properties.cpp
View File

@ -16,18 +16,10 @@ const std::vector<ov::AnyMap> inproperties = {
{ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")},
};
const std::vector<ov::AnyMap> auto_batch_inproperties = {};
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVPropertiesIncorrectTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::ValuesIn(inproperties)),
OVPropertiesIncorrectTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin_AutoBatch, OVPropertiesIncorrectTests,
::testing::Combine(
::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(auto_batch_inproperties)),
::testing::Values(targetDevice),
::testing::ValuesIn(generate_ov_configs(inproperties))),
OVPropertiesIncorrectTests::getTestCaseName);
const std::vector<ov::AnyMap> default_properties = {
@ -35,63 +27,51 @@ const std::vector<ov::AnyMap> default_properties = {
{ov::enable_profiling(true)},
};
const std::vector<ov::AnyMap> auto_batch_properties = {
{},
{{CONFIG_KEY(AUTO_BATCH_TIMEOUT) , "1"}},
{{ov::auto_batch_timeout(10)}},
};
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVPropertiesTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination(false)),
::testing::Values(targetDevice),
::testing::ValuesIn(default_properties)),
OVPropertiesTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin_AutoBatch, OVPropertiesTests,
::testing::Combine(
::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(ov::test::conformance::generate_ov_configs(ov::test::utils::DEVICE_BATCH, auto_batch_properties))),
OVPropertiesTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckGetSupportedROMetricsPropsTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::ValuesIn(OVCheckGetSupportedROMetricsPropsTests::getROMandatoryProperties())),
OVCheckGetSupportedROMetricsPropsTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckGetSupportedROMetricsPropsTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::ValuesIn(OVCheckGetSupportedROMetricsPropsTests::getROOptionalProperties())),
OVCheckGetSupportedROMetricsPropsTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckSetSupportedRWMetricsPropsTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::ValuesIn(OVCheckSetSupportedRWMetricsPropsTests::getRWMandatoryPropertiesValues())),
OVCheckSetSupportedRWMetricsPropsTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckSetSupportedRWMetricsPropsTests,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::ValuesIn(OVCheckSetSupportedRWMetricsPropsTests::getRWOptionalPropertiesValues())),
OVCheckSetSupportedRWMetricsPropsTests::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckChangePropComplieModleGetPropTests_DEVICE_ID,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(ov::AnyMap({}))),
OVCheckChangePropComplieModleGetPropTests_DEVICE_ID::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin_mandatory, OVCheckChangePropComplieModleGetPropTests_InferencePrecision,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::Values(ov::AnyMap({}))),
OVCheckChangePropComplieModleGetPropTests_InferencePrecision::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckMetricsPropsTests_ModelDependceProps,
::testing::Combine(
::testing::ValuesIn(return_all_possible_device_combination()),
::testing::Values(targetDevice),
::testing::ValuesIn(OVCheckMetricsPropsTests_ModelDependceProps::getModelDependcePropertiesValues())),
OVCheckMetricsPropsTests_ModelDependceProps::getTestCaseName);
@ -101,15 +81,15 @@ INSTANTIATE_TEST_SUITE_P(ov_plugin, OVCheckMetricsPropsTests_ModelDependceProps,
INSTANTIATE_TEST_SUITE_P(
ov_plugin_mandatory, OVGetMetricPropsTest,
::testing::ValuesIn(return_all_possible_device_combination(false)));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_plugin, OVGetMetricPropsOptionalTest,
::testing::ValuesIn(return_all_possible_device_combination(false)));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_plugin_mandatory, OVGetAvailableDevicesPropsTest,
::testing::ValuesIn(return_all_possible_device_combination(false)));
::testing::Values(targetDevice));
//
// IE Class GetConfig
@ -117,9 +97,9 @@ INSTANTIATE_TEST_SUITE_P(
INSTANTIATE_TEST_SUITE_P(
ov_plugin, OVPropertiesDefaultSupportedTests,
::testing::ValuesIn(return_all_possible_device_combination(false)));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_plugin_remove_mandatory, OVBasicPropertiesTestsP,
::testing::ValuesIn(generate_pairs_plugin_name_by_device()));
::testing::ValuesIn(generate_ov_pairs_plugin_name_by_device()));
} // namespace

1
src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/config/batch_config.txt Normal file
View File

@ -0,0 +1 @@
AUTO_BATCH_DEVICE_CONFIG TEMPLATE

1
src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/config/hetero_config.txt Normal file
View File

@ -0,0 +1 @@
TARGET_FALLBACK TEMPLATE

1
src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/config/multi_config.txt Normal file
View File

@ -0,0 +1 @@
MULTI_DEVICE_PRIORITIES TEMPLATE