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][AUTO] Fail to get PERF_COUNT from compiled_model #23123

Merged
merged 21 commits into from
Mar 18, 2024
Merged

[API][AUTO] Fail to get PERF_COUNT from compiled_model #23123

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
25990a3
add ov::enable_profiling
Feb 28, 2024
5ae982c
fix conflict
Feb 28, 2024
c102511
Revert "fix conflict"
Feb 28, 2024
a9fc360
Revert "add ov::enable_profiling"
Feb 28, 2024
a352ed6
Merge branch 'master' into haiqi/fix_perf_count
Feb 28, 2024
120d0f9
add ov::enable_profiling in rw
Feb 28, 2024
ca9e696
Merge branch 'master' into haiqi/fix_perf_count
Feb 29, 2024
1bf2d6f
return m_need_perf_counters
Mar 4, 2024
fb47f89
Merge branch 'master' into haiqi/fix_perf_count
Mar 5, 2024
1713c61
add enable_profiling in cumulative
Mar 5, 2024
69535ac
add test case
Mar 6, 2024
534ec85
Revert "add test case"
Mar 11, 2024
ea7d7c6
add test case
Mar 11, 2024
7fa7279
fix code style
Mar 11, 2024
d010757
fix code style
Mar 11, 2024
0c8fc4b
add test case for smoke_MultiCompileModelBehaviorTests and smoke_Auto…
Mar 13, 2024
97b77a0
add default value
Mar 14, 2024
34ef288
fix code style
Mar 14, 2024
ab3be7c
fix test failure
Mar 15, 2024
20ca86a
add default test for multi
Mar 15, 2024
28dfaa8
remove priority
Mar 15, 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: 4 additions & 1 deletion src/plugins/auto/src/auto_compiled_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ ov::Any AutoCompiledModel::get_property(const std::string& name) const {
ov::device::priorities,
ov::device::properties,
ov::hint::model_priority,
ov::loaded_from_cache};
ov::loaded_from_cache,
ov::enable_profiling};
return ro_properties;
};
const auto& default_rw_properties = []() {
Expand All @@ -63,6 +64,8 @@ ov::Any AutoCompiledModel::get_property(const std::string& name) const {
supported_properties.insert(supported_properties.end(), ro_properties.begin(), ro_properties.end());
supported_properties.insert(supported_properties.end(), rw_properties.begin(), rw_properties.end());
return decltype(ov::supported_properties)::value_type(supported_properties);
} else if (name == ov::enable_profiling) {
return m_context->m_need_perf_counters;
} else if (name == ov::hint::performance_mode) {
return m_context->m_performance_hint;
} else if (name == ov::device::priorities) {
Expand Down
5 changes: 4 additions & 1 deletion src/plugins/auto/src/cumulative_compiled_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ ov::Any AutoCumuCompiledModel::get_property(const std::string& name) const {
ov::device::properties,
ov::hint::model_priority,
ov::loaded_from_cache,
ov::intel_auto::schedule_policy};
ov::intel_auto::schedule_policy,
ov::enable_profiling};
peterchen-intel marked this conversation as resolved.
Show resolved Hide resolved
return ro_properties;
};
const auto& default_rw_properties = []() {
Expand All @@ -63,6 +64,8 @@ ov::Any AutoCumuCompiledModel::get_property(const std::string& name) const {
supported_properties.insert(supported_properties.end(), ro_properties.begin(), ro_properties.end());
supported_properties.insert(supported_properties.end(), rw_properties.begin(), rw_properties.end());
return decltype(ov::supported_properties)::value_type(supported_properties);
} else if (name == ov::enable_profiling) {
return m_context->m_need_perf_counters;
} else if (name == ov::hint::performance_mode) {
return m_context->m_performance_hint;
} else if (name == ov::intel_auto::schedule_policy) {
Expand Down
17 changes: 17 additions & 0 deletions ...uto/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "behavior/compiled_model/properties.hpp"

#include "openvino/runtime/auto/properties.hpp"
#include "openvino/runtime/properties.hpp"
#include "openvino/runtime/system_conf.hpp"

Expand Down Expand Up @@ -138,4 +139,20 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassCompiledModelGetPropertyTest,
OVClassCompiledModelGetPropertyTest_MODEL_PRIORITY,
::testing::Combine(::testing::Values("AUTO:TEMPLATE"),
::testing::ValuesIn(multiModelPriorityConfigs)));

const std::vector<ov::AnyMap> default_properties = {
{ov::enable_profiling(false)},
{ov::log::level("LOG_NONE")},
{ov::hint::model_priority(ov::hint::Priority::MEDIUM)},
{ov::hint::execution_mode(ov::hint::ExecutionMode::PERFORMANCE)},
{ov::intel_auto::device_bind_buffer(false)},
{ov::intel_auto::enable_startup_fallback(true)},
{ov::intel_auto::schedule_policy(ov::intel_auto::SchedulePolicy::DEVICE_PRIORITY)},
{ov::device::priorities("")}};

INSTANTIATE_TEST_SUITE_P(smoke_Auto_Default_test,
OVClassCompiledModelPropertiesDefaultTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_TEMPLATE),
::testing::ValuesIn(default_properties)),
OVClassCompiledModelPropertiesDefaultTests::getTestCaseName);
} // namespace
11 changes: 8 additions & 3 deletions ...gins/auto/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 @@ -24,7 +24,8 @@ const std::vector<ov::AnyMap> multi_Auto_properties = {
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::intel_auto::device_bind_buffer("NO")},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::intel_auto::enable_startup_fallback("YES")},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::intel_auto::enable_startup_fallback("NO")},
};
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::enable_profiling(true)},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::enable_profiling(false)}};

INSTANTIATE_TEST_SUITE_P(smoke_AutoMultiBehaviorTests,
OVPropertiesTests,
Expand All @@ -41,7 +42,9 @@ const std::vector<ov::AnyMap> multi_setcore_properties = {
const std::vector<ov::AnyMap> multi_compileModel_properties = {
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE),
ov::hint::performance_mode(ov::hint::PerformanceMode::THROUGHPUT),
ov::hint::model_priority(ov::hint::Priority::MEDIUM)}};
ov::hint::model_priority(ov::hint::Priority::MEDIUM)},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::enable_profiling(true)},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::enable_profiling(false)}};

INSTANTIATE_TEST_SUITE_P(smoke_MultiCompileModelBehaviorTests,
OVSetPropComplieModleGetPropTests,
Expand Down Expand Up @@ -70,7 +73,9 @@ const std::vector<ov::AnyMap> auto_compileModel_properties = {
ov::hint::model_priority(ov::hint::Priority::MEDIUM)},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE),
ov::hint::performance_mode(ov::hint::PerformanceMode::THROUGHPUT),
ov::hint::model_priority(ov::hint::Priority::MEDIUM)}};
ov::hint::model_priority(ov::hint::Priority::MEDIUM)},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::enable_profiling(true)},
{ov::device::priorities(ov::test::utils::DEVICE_TEMPLATE), ov::enable_profiling(false)}};

INSTANTIATE_TEST_SUITE_P(smoke_AutoCompileModelBehaviorTests,
OVSetPropComplieModleGetPropTests,
Expand Down
Loading