Skip to content

vulkan: deduplicate Microsoft Direct3D12 devices #16689

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 4 commits into from
Oct 26, 2025
Merged

vulkan: deduplicate Microsoft Direct3D12 devices #16689

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d172a7
fix: deduplicate and deprioritize Microsoft Direct3D12 vulkan devices…
giladgd Oct 19, 2025
0b7454c
style: indent
giladgd Oct 20, 2025
72b1b99
fix: decrease priority
giladgd Oct 20, 2025
99052e2
fix: switch to `||`
giladgd Oct 25, 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
8 changes: 7 additions & 1 deletion ggml/src/ggml-vulkan/ggml-vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4733,7 +4733,12 @@ static void ggml_vk_instance_init() {
vk::PhysicalDeviceIDProperties old_id;
old_props.pNext = &old_id;
devices[k].getProperties2(&old_props);
return std::equal(std::begin(old_id.deviceUUID), std::end(old_id.deviceUUID), std::begin(new_id.deviceUUID));

bool equals = std::equal(std::begin(old_id.deviceUUID), std::end(old_id.deviceUUID), std::begin(new_id.deviceUUID));
equals |= old_id.deviceLUIDValid && new_id.deviceLUIDValid &&
Copy link
Collaborator

@0cc4m 0cc4m Oct 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

|= is a bitwise or, please use a logical or.

Copy link
Contributor Author

@giladgd giladgd Oct 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

std::equal(std::begin(old_id.deviceLUID), std::end(old_id.deviceLUID), std::begin(new_id.deviceLUID));

return equals;
}
);
if (old_device == vk_instance.device_indices.end()) {
Expand Down Expand Up @@ -4771,6 +4776,7 @@ static void ggml_vk_instance_init() {
#endif
break;
}
driver_priorities[vk::DriverId::eMesaDozen] = 100;

if (driver_priorities.count(old_driver.driverID)) {
old_priority = driver_priorities[old_driver.driverID];
Expand Down
Loading