From d5cecee907e1951b3d310f73558066815c2540f5 Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Tue, 9 Sep 2025 23:47:08 +0200 Subject: [PATCH 1/2] Fix GPU ID Patch --- ...026-vulkan-get-GPU-ID-ollama-v0.11.5.patch | 33 ++++--------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/llama/patches/0026-vulkan-get-GPU-ID-ollama-v0.11.5.patch b/llama/patches/0026-vulkan-get-GPU-ID-ollama-v0.11.5.patch index f5b8f428d..c8d09ad01 100644 --- a/llama/patches/0026-vulkan-get-GPU-ID-ollama-v0.11.5.patch +++ b/llama/patches/0026-vulkan-get-GPU-ID-ollama-v0.11.5.patch @@ -1,38 +1,17 @@ -From e0ba120c913a2931010a31e0fdf160697a15b9f1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Xiaodong Ye Date: Mon, 18 Aug 2025 12:48:07 +0800 Subject: [PATCH] vulkan: get GPU ID (ollama v0.11.5) Signed-off-by: Xiaodong Ye --- - discover/gpu_info_vulkan.c | 9 +++++ - .../ggml/ggml/src/ggml-vulkan/ggml-vulkan.cpp | 35 +++++++++++++++++++ - 2 files changed, 44 insertions(+) + ggml/src/ggml-vulkan/ggml-vulkan.cpp | 35 ++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) -diff --git a/discover/gpu_info_vulkan.c b/discover/gpu_info_vulkan.c -index 6d67353d..afac97dd 100644 ---- a/discover/gpu_info_vulkan.c -+++ b/discover/gpu_info_vulkan.c -@@ -171,6 +171,15 @@ void vk_check_vram(vk_handle_t rh, int i, mem_info_t *resp) { - snprintf(&resp->gpu_id[0], GPU_ID_LEN, "%d", i); - strncpy(&resp->gpu_name[0], properties.deviceName, GPU_NAME_LEN - 1); - resp->gpu_name[GPU_NAME_LEN - 1] = '\0'; -+ const uint8_t *uuid = properties.pipelineCacheUUID; -+ snprintf(&resp->gpu_id[0], GPU_ID_LEN, -+ "GPU-%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", -+ uuid[0], uuid[1], uuid[2], uuid[3], -+ uuid[4], uuid[5], -+ uuid[6], uuid[7], -+ uuid[8], uuid[9], -+ uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] -+ ); - resp->total = (uint64_t) device_memory_total_size; - resp->free = (uint64_t) device_memory_heap_budget; - resp->major = VK_API_VERSION_MAJOR(properties.apiVersion); -diff --git a/ml/backend/ggml/ggml/src/ggml-vulkan/ggml-vulkan.cpp b/ml/backend/ggml/ggml/src/ggml-vulkan/ggml-vulkan.cpp +diff --git a/ggml/src/ggml-vulkan/ggml-vulkan.cpp b/ggml/src/ggml-vulkan/ggml-vulkan.cpp index 4070e248..1c8c15d5 100644 ---- a/ml/backend/ggml/ggml/src/ggml-vulkan/ggml-vulkan.cpp -+++ b/ml/backend/ggml/ggml/src/ggml-vulkan/ggml-vulkan.cpp +--- a/ggml/src/ggml-vulkan/ggml-vulkan.cpp ++++ b/ggml/src/ggml-vulkan/ggml-vulkan.cpp @@ -10194,6 +10194,27 @@ static void ggml_vk_get_device_description(int device, char * description, size_ snprintf(description, description_size, "%s", props.deviceName.data()); } From 08bec121eb0d4ffa400a67978b69db753b68c7f4 Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Wed, 10 Sep 2025 00:09:17 +0200 Subject: [PATCH 2/2] Remove Code not in llama.cpp --- .../src/ggml-vulkan/cmake/host-toolchain.cmake.in | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 ml/backend/ggml/ggml/src/ggml-vulkan/cmake/host-toolchain.cmake.in diff --git a/ml/backend/ggml/ggml/src/ggml-vulkan/cmake/host-toolchain.cmake.in b/ml/backend/ggml/ggml/src/ggml-vulkan/cmake/host-toolchain.cmake.in deleted file mode 100644 index 2d8a85696..000000000 --- a/ml/backend/ggml/ggml/src/ggml-vulkan/cmake/host-toolchain.cmake.in +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_BUILD_TYPE Release) -set(CMAKE_C_FLAGS -O2) -set(CMAKE_CXX_FLAGS -O2) -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) -set(CMAKE_C_COMPILER "@HOST_C_COMPILER@") -set(CMAKE_CXX_COMPILER "@HOST_CXX_COMPILER@") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY @CMAKE_RUNTIME_OUTPUT_DIRECTORY@) - -if("@CMAKE_C_COMPILER_ID@" STREQUAL "MSVC") - foreach(CONFIG IN ITEMS DEBUG RELEASE MINSIZEREL RELWITHDEBINFO) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONFIG} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - endforeach() -endif()