diff --git a/src/plugins/template/src/plugin.cpp b/src/plugins/template/src/plugin.cpp index b1166c4cea1..918bfbfb9b0 100644 --- a/src/plugins/template/src/plugin.cpp +++ b/src/plugins/template/src/plugin.cpp @@ -223,7 +223,9 @@ ov::Any ov::template_plugin::Plugin::get_property(const std::string& name, const ov::device::full_name, ov::device::architecture, ov::device::capabilities, - ov::range_for_async_infer_requests}; + ov::device::type, + ov::range_for_async_infer_requests, + ov::execution_devices}; return ro_properties; }; const auto& default_rw_properties = []() { @@ -259,8 +261,10 @@ ov::Any ov::template_plugin::Plugin::get_property(const std::string& name, const return decltype(ov::device::full_name)::value_type(device_name); } else if (ov::device::architecture == name) { // TODO: return device architecture for device specified by DEVICE_ID config - std::string arch = "TEMPLATE"; + std::string arch = get_device_name(); return decltype(ov::device::architecture)::value_type(arch); + } else if (ov::device::type == name) { + return decltype(ov::device::type)::value_type(ov::device::Type::INTEGRATED); } else if (ov::internal::caching_properties == name) { std::vector caching_properties = {ov::device::architecture}; return decltype(ov::internal::caching_properties)::value_type(caching_properties); @@ -268,6 +272,9 @@ ov::Any ov::template_plugin::Plugin::get_property(const std::string& name, const // TODO: fill actual list of supported capabilities: e.g. Template device supports only FP32 and EXPORT_IMPORT std::vector capabilities = {ov::device::capability::FP32, ov::device::capability::EXPORT_IMPORT}; return decltype(ov::device::capabilities)::value_type(capabilities); + } else if (ov::execution_devices == name) { + std::string dev = get_device_name(); + return decltype(ov::execution_devices)::value_type{dev}; } else if (ov::range_for_async_infer_requests == name) { // TODO: fill with actual values using uint = unsigned int; diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp index ea0d0c25ad8..3448f8d3551 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp @@ -15,7 +15,7 @@ using namespace ov::test::conformance; // INSTANTIATE_TEST_SUITE_P( - ov_compiled_model, OVClassCompiledModelGetPropertyTest, + ov_compiled_model_mandatory, OVClassCompiledModelGetPropertyTest, ::testing::ValuesIn(return_all_possible_device_combination())); // 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 b5cbff685b6..349016b3fd0 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 @@ -208,9 +208,7 @@ TEST_P(OVSetPropComplieModleGetPropTests, SetPropertyAndComplieModelWithPropsWor std::vector OVPropertiesTestsWithCompileModelProps::getROMandatoryProperties() { std::vector res; - res.push_back({{ov::PropertyName(ov::model_name.name(), ov::model_name.mutability), nullptr}}); - res.push_back({{ov::PropertyName(ov::device::full_name.name(), ov::model_name.mutability), nullptr}}); - res.push_back({{ov::PropertyName(ov::optimal_number_of_infer_requests.name(), ov::optimal_number_of_infer_requests.mutability), nullptr}}); + res.push_back({{ov::PropertyName(ov::device::full_name.name(), ov::device::full_name.mutability), nullptr}}); res.push_back({{ov::PropertyName(ov::device::architecture.name(), ov::device::architecture.mutability), nullptr}}); res.push_back({{ov::PropertyName(ov::device::type.name(), ov::device::type.mutability), nullptr}}); res.push_back({{ov::PropertyName(ov::execution_devices.name(), ov::execution_devices.mutability), nullptr}}); @@ -286,11 +284,6 @@ std::vector OVPropertiesTestsWithCompileModelProps::getRWMandatoryPr } } - if (props.empty() || std::find(props.begin(), props.end(), ov::enable_mmap.name()) != props.end()) { - res.push_back({ov::enable_mmap(true)}); - res.push_back({ov::enable_mmap(false)}); - } - if (props.empty() || std::find(props.begin(), props.end(), ov::streams::num.name()) != props.end()) { res.push_back({ov::streams::num(3)}); } @@ -332,6 +325,11 @@ std::vector OVPropertiesTestsWithCompileModelProps::getRWOptionalPro } } + if (props.empty() || std::find(props.begin(), props.end(), ov::enable_mmap.name()) != props.end()) { + res.push_back({ov::enable_mmap(true)}); + res.push_back({ov::enable_mmap(false)}); + } + return res; }