extern/whisper.cpp
1
0
Fork 1
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-05-20 08:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmake: remove caching from vulkan coopmat checks (llama/12719)

Browse Source
This commit is contained in:
bandoti 2025-04-02 14:56:26 -03:00 committed by Georgi Gerganov
parent 2105b110d3
commit 6e532c7187
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ggml/src/ggml-vulkan/CMakeLists.txt
View File

@ -23,49 +23,35 @@ if (Vulkan_FOUND)
../../include/ggml-vulkan.h ../../include/ggml-vulkan.h
) )
if(NOT DEFINED GGML_VULKAN_COOPMAT_GLSLC_SUPPORT) # Compile a test shader to determine whether GL_KHR_cooperative_matrix is supported.
# Compile a test shader to determine whether GL_KHR_cooperative_matrix is supported. # If it's not, there will be an error to stderr.
# If it's not, there will be an error to stderr. # If it's supported, set a define to indicate that we should compile those shaders
# If it's supported, set a define to indicate that we should compile those shaders execute_process(COMMAND ${Vulkan_GLSLC_EXECUTABLE} -o - -fshader-stage=compute --target-env=vulkan1.3 "${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders/test_coopmat_support.comp"
execute_process(COMMAND ${Vulkan_GLSLC_EXECUTABLE} -o - -fshader-stage=compute --target-env=vulkan1.3 "${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders/test_coopmat_support.comp" OUTPUT_VARIABLE glslc_output
OUTPUT_VARIABLE glslc_output ERROR_VARIABLE glslc_error)
ERROR_VARIABLE glslc_error)
if (${glslc_error} MATCHES ".*extension not supported: GL_KHR_cooperative_matrix.*") if (${glslc_error} MATCHES ".*extension not supported: GL_KHR_cooperative_matrix.*")
message(STATUS "GL_KHR_cooperative_matrix not supported by glslc") message(STATUS "GL_KHR_cooperative_matrix not supported by glslc")
set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT OFF CACHE INTERNAL "Whether coopmat is supported by glslc") set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT OFF)
else()
message(STATUS "GL_KHR_cooperative_matrix supported by glslc")
set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT ON CACHE INTERNAL "Whether coopmat is supported by glslc")
endif()
else() else()
message(STATUS "GL_KHR_cooperative_matrix support already defined: ${GGML_VULKAN_COOPMAT_GLSLC_SUPPORT}") message(STATUS "GL_KHR_cooperative_matrix supported by glslc")
endif() set(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT ON)
if(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
add_compile_definitions(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT) add_compile_definitions(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
endif() endif()
if(NOT DEFINED GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT) # Compile a test shader to determine whether GL_NV_cooperative_matrix2 is supported.
# Compile a test shader to determine whether GL_NV_cooperative_matrix2 is supported. # If it's not, there will be an error to stderr.
# If it's not, there will be an error to stderr. # If it's supported, set a define to indicate that we should compile those shaders
# If it's supported, set a define to indicate that we should compile those shaders execute_process(COMMAND ${Vulkan_GLSLC_EXECUTABLE} -o - -fshader-stage=compute --target-env=vulkan1.3 "${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders/test_coopmat2_support.comp"
execute_process(COMMAND ${Vulkan_GLSLC_EXECUTABLE} -o - -fshader-stage=compute --target-env=vulkan1.3 "${CMAKE_CURRENT_SOURCE_DIR}/vulkan-shaders/test_coopmat2_support.comp" OUTPUT_VARIABLE glslc_output
OUTPUT_VARIABLE glslc_output ERROR_VARIABLE glslc_error)
ERROR_VARIABLE glslc_error)
if (${glslc_error} MATCHES ".*extension not supported: GL_NV_cooperative_matrix2.*") if (${glslc_error} MATCHES ".*extension not supported: GL_NV_cooperative_matrix2.*")
message(STATUS "GL_NV_cooperative_matrix2 not supported by glslc") message(STATUS "GL_NV_cooperative_matrix2 not supported by glslc")
set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT OFF CACHE INTERNAL "Whether coopmat2 is supported by glslc") set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT OFF)
else()
message(STATUS "GL_NV_cooperative_matrix2 supported by glslc")
set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT ON CACHE INTERNAL "Whether coopmat2 is supported by glslc")
endif()
else() else()
message(STATUS "GL_NV_cooperative_matrix2 support already defined: ${GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT}") message(STATUS "GL_NV_cooperative_matrix2 supported by glslc")
endif() set(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT ON)
if(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
add_compile_definitions(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT) add_compile_definitions(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
endif() endif()