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

[AUTOPLUGIN] not select if only one device (#9730)

Browse Source 
* if only one Device, not select

Signed-off-by: Hu, Yuan2 <yuan2.hu@intel.com>

* modify test case to match logic

Signed-off-by: Hu, Yuan2 <yuan2.hu@intel.com>
This commit is contained in:
Yuan Hu
2022-01-19 22:13:29 +08:00
committed by GitHub
parent d792545365
commit 403339f8f4
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,23 +455,27 @@ DeviceInformation MultiDeviceInferencePlugin::SelectDevice(const std::vector<Dev
std::list<DeviceInformation> validDevices;
auto selectSupportDev = [this, &devices, &validDevices](const std::string& networkPrecision) {
for (auto iter = devices.begin(); iter != devices.end();) {
std::vector<std::string> capability = GetCore()->GetMetric(iter->deviceName, METRIC_KEY(OPTIMIZATION_CAPABILITIES));
auto supportNetwork = std::find(capability.begin(), capability.end(), (networkPrecision));
if (supportNetwork != capability.end()) {
validDevices.push_back(std::move(*iter));
devices.erase(iter++);
continue;
if (metaDevices.size() > 1) {
auto selectSupportDev = [this, &devices, &validDevices](const std::string& networkPrecision) {
for (auto iter = devices.begin(); iter != devices.end();) {
std::vector<std::string> capability = GetCore()->GetMetric(iter->deviceName, METRIC_KEY(OPTIMIZATION_CAPABILITIES));
auto supportNetwork = std::find(capability.begin(), capability.end(), (networkPrecision));
if (supportNetwork != capability.end()) {
validDevices.push_back(std::move(*iter));
devices.erase(iter++);
continue;
}
iter++;
}
iter++;
};
selectSupportDev(networkPrecision);
// If network is FP32, continue to collect the device support FP16 but not support FP32.
if (networkPrecision == "FP32") {
const std::string f16 = "FP16";
selectSupportDev(f16);
}
};
selectSupportDev(networkPrecision);
// If network is FP32, continue to collect the device support FP16 but not support FP32.
if (networkPrecision == "FP32") {
const std::string f16 = "FP16";
selectSupportDev(f16);
} else {
validDevices.push_back(metaDevices[0]);
}
if (validDevices.empty()) {

21
src/tests/unit/auto/select_device_test.cpp
View File

@@ -106,14 +106,21 @@ public:
auto& devicesInfo = devicesMap[netPrecision];
bool find = false;
DeviceInformation expect;
for (auto& item : devicesInfo) {
auto device = std::find_if(metaDevices.begin(), metaDevices.end(),
[&item](const DeviceInformation& d)->bool{return d.uniqueName == item.uniqueName;});
if (device != metaDevices.end()) {
find = true;
expect = item;
break;
if (metaDevices.size() > 1) {
for (auto& item : devicesInfo) {
auto device = std::find_if(metaDevices.begin(), metaDevices.end(),
[&item](const DeviceInformation& d)->bool{return d.uniqueName == item.uniqueName;});
if (device != metaDevices.end()) {
find = true;
expect = item;
break;
}
}
} else if (metaDevices.size() == 1) {
expect = metaDevices[0];
find = true;
} else {
find = false;
}
testConfigs.push_back(std::make_tuple(netPrecision, metaDevices, expect, !find));
} else {