From: GainLee <redacted>
Date: Sun, 17 Mar 2024 17:12:22 +0000 (+0800)
Subject: ggml:fix finding transfer queue family index error (llama/6094)
X-Git-Tag: upstream/0.0.1642~832
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=e1998f7365a1e7588b3c1ed93c9ce9d991f370b8;p=pkg%2Fggml%2Fsources%2Fggml

ggml:fix finding transfer queue family index error (llama/6094)

Co-authored-by: GainLee <redacted>
---

diff --git a/src/ggml-vulkan.cpp b/src/ggml-vulkan.cpp
index 7cce616b..698b3149 100644
--- a/src/ggml-vulkan.cpp
+++ b/src/ggml-vulkan.cpp
@@ -710,6 +710,12 @@ static uint32_t ggml_vk_find_queue_family_index(std::vector<vk::QueueFamilyPrope
         }
     }
 
+    // All commands that are allowed on a queue that supports transfer operations are also allowed on a queue that supports either graphics or compute operations.
+    // Thus, if the capabilities of a queue family include VK_QUEUE_GRAPHICS_BIT or VK_QUEUE_COMPUTE_BIT, then reporting the VK_QUEUE_TRANSFER_BIT capability separately for that queue family is optional.
+    if (compute_index >= 0) {
+        return compute_index;
+    }
+
     std::cerr << "ggml_vulkan: No suitable queue family index found." << std::endl;
 
     for(auto &q_family : queue_family_props) {