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

Force dynamic network on CPU only if it is in candidate list (#12583)

Browse Source 
* change gpunum to 3

* check if CPU is in candidate list before checking dynamic network

Co-authored-by: Chen Peter <peter.chen@intel.com>
This commit is contained in:
guozhong wang 2022-08-22 17:14:58 +08:00 committed by GitHub
parent a0622a328f
commit 931b343511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/auto/plugin.cpp
View File

@ -863,8 +863,6 @@ std::vector<DeviceInformation> MultiDeviceInferencePlugin::FilterDeviceByNetwork
InferenceEngine::CNNNetwork network) {
if (metaDevices.empty()) {
IE_THROW(NotFound) << "No available device to filter " << GetName() << " plugin";
} else if (metaDevices.size() == 1) {
return metaDevices;
}
std::vector<DeviceInformation> filterDevice;
@ -879,17 +877,20 @@ std::vector<DeviceInformation> MultiDeviceInferencePlugin::FilterDeviceByNetwork
}
return false;
};
if (model->is_dynamic() || isStateful()) {
for (auto& iter : metaDevices) {
if (iter.deviceName.find("CPU") != std::string::npos) {
filterDevice.push_back(iter);
break;
}
}
if (filterDevice.size() == 0)
IE_THROW(NotFound) << "No available device for dynamic shape network !";
// Check if CPU is in candidate list
auto cpuiter = std::find_if(metaDevices.begin(), metaDevices.end(), [](const DeviceInformation& deviceInfo) {
return deviceInfo.deviceName.find("CPU") != std::string::npos;
});
// If CPU is in candidate list, load dynamic network to CPU first
if ((model->is_dynamic() || isStateful()) && cpuiter != metaDevices.end()) {
filterDevice.push_back(*cpuiter);
return filterDevice;
}
// If CPU is not in candidate list, continue to run selection logic regardless of whether the input network is a
// dynamic network or not
return metaDevices;
}
std::string MultiDeviceInferencePlugin::GetLogTag() const noexcept {