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

Merge ac30fb0ff9 into 43de73cbd6

This commit is contained in:
Wang, Yang 2024-06-12 02:16:41 +00:00 committed by GitHub
parent 43de73cbd6 ac30fb0ff9
commit fbe8f1bf40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/auto/src/auto_schedule.cpp
View File

@ -138,7 +138,8 @@ void AutoSchedule::init() {
if (is_actual_cpu || !m_context->m_startup_fallback) {
m_compile_context[CPU].m_is_enabled = false;
} else {
const auto cpu_iter = deviceChecker().check_and_return_if_device_in_list("CPU", m_context->m_device_priorities);
const auto cpu_iter =
deviceChecker().check_and_return_if_device_in_list("CPU", m_context->m_device_priorities);
// if have CPU Device, enable m_compile_context[CPU]
if (cpu_iter != m_context->m_device_priorities.end()) {
m_compile_context[CPU].m_is_enabled = true;
@ -170,6 +171,11 @@ void AutoSchedule::init() {
m_compile_context[CPU].m_device_info = *cpu_iter;
m_compile_context[CPU].m_device_info.config[ov::hint::performance_mode.name()] =
ov::hint::PerformanceMode::LATENCY;
if (m_compile_context[ACTUALDEVICE].m_device_info.config.count(ov::cache_dir.name()) &&
(m_context->m_startup_fallback || m_context->m_runtime_fallback)) {
m_compile_context[CPU].m_device_info.config[ov::cache_dir.name()] = "";
LOG_INFO_TAG("Clear cache dir setting for CPU accelerator");
}
m_compile_context[CPU].m_worker_name = "CPU_HELP";
LOG_INFO_TAG("will load CPU for accelerator");
}

55
src/plugins/auto/tests/unit/startup_fallback_property_test.cpp
View File

@ -29,6 +29,20 @@ MATCHER_P(MapContains, subMap, "Check if all the elements of the subMap are cont
class AutoStartupFallback : public tests::AutoTest, public ::testing::TestWithParam<ConfigParams> {
public:
static std::string getTestCaseNameCacheTest(testing::TestParamInfo<ConfigParams> obj) {
bool startup_fallback;
ov::AnyMap config;
std::tie(startup_fallback, config) = obj.param;
std::ostringstream result;
result << "_expected_disabling_cache_" << startup_fallback;
result << "_compiled_config_";
for (auto& item : config) {
result << item.first << "_" << item.second.as<std::string>() << "_";
}
auto name = result.str();
name.pop_back();
return name;
}
void SetUp() override {
plugin->set_device_name("AUTO");
ON_CALL(*core,
@ -36,7 +50,8 @@ public:
::testing::Matcher<const std::string&>(_),
_))
.WillByDefault(Return(mockExeNetwork));
metaDevices = {{ov::test::utils::DEVICE_CPU, {}, -1}, {ov::test::utils::DEVICE_GPU, {}, -1}};
metaDevices = {{ov::test::utils::DEVICE_CPU, {ov::cache_dir("test_dir")}, -1},
{ov::test::utils::DEVICE_GPU, {ov::cache_dir("test_dir")}, -1}};
ON_CALL(*plugin, parse_meta_devices(_, _)).WillByDefault(Return(metaDevices));
ON_CALL(*plugin, get_valid_device)
.WillByDefault([](const std::vector<DeviceInformation>& metaDevices, const std::string& netPrecision) {
@ -74,3 +89,41 @@ const std::vector<ConfigParams> testConfigs = {ConfigParams{true, {{"ENABLE_STAR
ConfigParams{false, {{"ENABLE_STARTUP_FALLBACK", "NO"}}}};
INSTANTIATE_TEST_SUITE_P(smoke_Auto_StartupFallback, AutoStartupFallback, ::testing::ValuesIn(testConfigs));
using AutoLoadExeNetworkCacheDirSettingTest = AutoStartupFallback;
TEST_P(AutoLoadExeNetworkCacheDirSettingTest, canDisableCacheDirSettingForCPUPlugin) {
// get Parameter
bool is_disable_cache_dir;
ov::AnyMap config;
std::tie(is_disable_cache_dir, config) = this->GetParam();
EXPECT_CALL(*core,
compile_model(::testing::Matcher<const std::shared_ptr<const ov::Model>&>(_),
::testing::Matcher<const std::string&>(StrEq(ov::test::utils::DEVICE_GPU)),
_))
.Times(1);
if (is_disable_cache_dir) {
std::map<std::string, std::string> test_map = {{ov::cache_dir.name(), ""}};
EXPECT_CALL(*core,
compile_model(::testing::Matcher<const std::shared_ptr<const ov::Model>&>(_),
::testing::Matcher<const std::string&>(StrEq(ov::test::utils::DEVICE_CPU)),
::testing::Matcher<const ov::AnyMap&>(MapContains(test_map))))
.Times(1);
}
ASSERT_NO_THROW(plugin->compile_model(model, config));
}
const std::vector<ConfigParams> testCacheConfigs = {
ConfigParams{true, {ov::intel_auto::enable_startup_fallback(true)}},
ConfigParams{true, {ov::intel_auto::enable_runtime_fallback(true)}},
ConfigParams{true, {ov::intel_auto::enable_startup_fallback(true), ov::intel_auto::enable_runtime_fallback(false)}},
ConfigParams{false, {ov::intel_auto::enable_startup_fallback(false), ov::intel_auto::enable_runtime_fallback(true)}},
ConfigParams{true, {ov::intel_auto::enable_startup_fallback(true), ov::intel_auto::enable_runtime_fallback(true)}},
ConfigParams{false,
{ov::intel_auto::enable_startup_fallback(false), ov::intel_auto::enable_runtime_fallback(false)}}};
INSTANTIATE_TEST_SUITE_P(smoke_Auto_disableCachingForCPUPlugin,
AutoLoadExeNetworkCacheDirSettingTest,
::testing::ValuesIn(testCacheConfigs),
AutoLoadExeNetworkCacheDirSettingTest::getTestCaseNameCacheTest);