Skip to content

Fix the LUID check #647

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

Merged
merged 2 commits into from
Apr 10, 2025
Merged

Fix the LUID check #647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54727f6
Fix the LUID check
preetha-intel Apr 9, 2025
d8af3ae
Address review comments
preetha-intel Apr 10, 2025
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
22 changes: 16 additions & 6 deletions onnxruntime/core/providers/openvino/openvino_provider_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ std::string ParseDeviceType(std::shared_ptr<OVCore> ov_core, const ProviderOptio
if (supported_device_modes.contains(device_mode)) {
const auto& devices = selected_device.substr(delimit + 1);
devices_to_check = split(devices, ',');
ORT_ENFORCE(devices_to_check.size() > 0, "Modes should have devices listed based on priority");
ORT_ENFORCE(devices_to_check.size() > 0, "Mode AUTO/HETERO/MULTI should have devices listed based on priority");
} else {
ORT_THROW("[ERROR] [OpenVINO] Invalid device_type is selected. Supported modes are AUTO/HETERO/MULTI");
}
Expand Down Expand Up @@ -153,16 +153,24 @@ std::string ParseDeviceType(std::shared_ptr<OVCore> ov_core, const ProviderOptio
std::string ov_luid_devices;
for (auto luid_str : luid_list) {
if (ov_luid_map.contains(luid_str)) {
if (!ov_luid_devices.empty()) ov_luid_devices = ov_luid_devices + ",";
ov_luid_devices = ov_luid_devices + ov_luid_map.at(luid_str);
std::string ov_dev = ov_luid_map.at(luid_str);
std::string ov_dev_strip = split(ov_dev, '.')[0];
if (std::find(std::begin(devices_to_check), std::end(devices_to_check), ov_dev) != std::end(devices_to_check) ||
std::find(std::begin(devices_to_check), std::end(devices_to_check), ov_dev_strip) != std::end(devices_to_check)) {
if (!ov_luid_devices.empty()) ov_luid_devices = ov_luid_devices + ",";
ov_luid_devices = ov_luid_devices + ov_dev;
} else {
ORT_THROW(" LUID : ", ov_dev, " does not match with device_type : ", selected_device);
}
} else {
ORT_THROW("Invalid device_luid is set");
ORT_THROW(provider_options.at("device_luid"), " does not exist for the selected device_type : ", selected_device);
}
}
if (!device_mode.empty()) {
selected_device = device_mode + ":" + ov_luid_devices;
for (auto dev_str : devices_to_check) {
auto default_dev = split(dev_str, '.')[0];

if (ov_luid_devices.find(default_dev) == std::string::npos)
selected_device = selected_device + "," + dev_str;
}
Expand All @@ -171,13 +179,15 @@ std::string ParseDeviceType(std::shared_ptr<OVCore> ov_core, const ProviderOptio
}
}
// If invalid device is chosen error is thrown
if (!all_devices_found)
if (!all_devices_found) {
ORT_THROW(
"[ERROR] [OpenVINO] You have selected wrong configuration value for the key 'device_type'. "
"Select from 'CPU', 'GPU', 'NPU', 'GPU.x' where x = 0,1,2 and so on or from"
" HETERO/MULTI/AUTO/BATCH options available. \n");
else
} else {
LOGS_DEFAULT(INFO) << "[OpenVINO-EP] Choosing Device: " << selected_device;
return selected_device;
}
}

void ParseProviderOptions([[maybe_unused]] ProviderInfo& result, [[maybe_unused]] const ProviderOptions& config_options) {}
Expand Down
Loading