From: Sandro Hanea <redacted>
Date: Mon, 31 Mar 2025 10:44:36 +0000 (+0200)
Subject: cmake: improve Vulkan cooperative matrix support checks (whisper/2966)
X-Git-Tag: upstream/0.0.1898~14
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=6a60da6a25bfa02c9735cec102d3d77d5fb5fb31;p=pkg%2Fggml%2Fsources%2Fggml

cmake: improve Vulkan cooperative matrix support checks (whisper/2966)

Co-authored-by: Sandro Hanea <redacted>
---

diff --git a/src/ggml-vulkan/CMakeLists.txt b/src/ggml-vulkan/CMakeLists.txt
index 8ef28e2d..251e0f2d 100644
--- a/src/ggml-vulkan/CMakeLists.txt
+++ b/src/ggml-vulkan/CMakeLists.txt
@@ -36,9 +36,14 @@ if (Vulkan_FOUND)
             set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT OFF CACHE INTERNAL "Whether coopmat is supported by glslc")
         else()
             message(STATUS "GL_KHR_cooperative_matrix supported by glslc")
-            add_compile_definitions(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
             set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT ON CACHE INTERNAL "Whether coopmat is supported by glslc")
         endif()
+    else()
+        message(STATUS "GL_KHR_cooperative_matrix support already defined: ${GGML_VULKAN_COOPMAT_GLSLC_SUPPORT}")
+    endif()
+
+    if(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
+        add_compile_definitions(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
     endif()
 
     if(NOT DEFINED GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
@@ -54,9 +59,15 @@ if (Vulkan_FOUND)
             set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT OFF CACHE INTERNAL "Whether coopmat2 is supported by glslc")
         else()
             message(STATUS "GL_NV_cooperative_matrix2 supported by glslc")
-            add_compile_definitions(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
+            
             set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT ON CACHE INTERNAL "Whether coopmat2 is supported by glslc")
         endif()
+    else()
+        message(STATUS "GL_NV_cooperative_matrix2 support already defined: ${GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT}")
+    endif()
+
+    if(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
+        add_compile_definitions(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
     endif()
 
     target_link_libraries(ggml-vulkan PRIVATE Vulkan::Vulkan)