happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vulkan: deduplicate Microsoft Direct3D12 devices (#16689) 

* fix: deduplicate and deprioritize Microsoft Direct3D12 vulkan devices from the `vulkan-dozen` driver

* style: indent

* fix: decrease priority

* fix: switch to `||`
This commit is contained in:
Gilad S. 2025-10-26 06:37:38 +02:00 committed by GitHub
parent 5d195f17bc
commit 3cfa9c3f12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ggml/src/ggml-vulkan/ggml-vulkan.cpp
View File

@ -4733,7 +4733,14 @@ static void ggml_vk_instance_init() {
vk::PhysicalDeviceIDProperties old_id; vk::PhysicalDeviceIDProperties old_id;
old_props.pNext = &old_id; old_props.pNext = &old_id;
devices[k].getProperties2(&old_props); 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 = equals || (
old_id.deviceLUIDValid && new_id.deviceLUIDValid &&
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()) { if (old_device == vk_instance.device_indices.end()) {
@ -4771,6 +4778,7 @@ static void ggml_vk_instance_init() {
#endif #endif
break; break;
} }
driver_priorities[vk::DriverId::eMesaDozen] = 100;
if (driver_priorities.count(old_driver.driverID)) { if (driver_priorities.count(old_driver.driverID)) {
old_priority = driver_priorities[old_driver.driverID]; old_priority = driver_priorities[old_driver.driverID];