]> git.djapps.eu Git - pkg/ggml/sources/whisper.cpp/commitdiff
ggml-cuda: fix regex for arch list (llama/18371)
authorAman Gupta <redacted>
Thu, 25 Dec 2025 17:35:14 +0000 (01:35 +0800)
committerGeorgi Gerganov <redacted>
Wed, 31 Dec 2025 15:52:09 +0000 (17:52 +0200)
* ggml-cuda: fix regex for arch list

* make regex exact

ggml/src/ggml-cuda/CMakeLists.txt

index f3c3ebff7ea3cb7853456a90ed5cbab8d6fae65c..c0f8bcaa378f3975f9635cb1200f7036e8c5ca12 100644 (file)
@@ -44,8 +44,13 @@ if (CUDAToolkit_FOUND)
     # Replace any 12x-real architectures with 12x{a}-real. FP4 ptx instructions are not available in just 12x
     if (GGML_NATIVE)
         set(PROCESSED_ARCHITECTURES "")
-        foreach(ARCH ${CMAKE_CUDA_ARCHITECTURES_NATIVE})
-            if(ARCH MATCHES "^12[0-9]$")
+        if (CMAKE_CUDA_ARCHITECTURES_NATIVE)
+            set(ARCH_LIST ${CMAKE_CUDA_ARCHITECTURES_NATIVE})
+        else()
+            set(ARCH_LIST ${CMAKE_CUDA_ARCHITECTURES})
+        endif()
+        foreach(ARCH ${ARCH_LIST})
+            if (ARCH MATCHES "^12[0-9](-real|-virtual)?$")
                 string(REGEX REPLACE "^(12[0-9]).*$" "\\1" BASE_ARCH ${ARCH})
                 message(STATUS "Replacing ${ARCH} with ${BASE_ARCH}a-real")
                 list(APPEND PROCESSED_ARCHITECTURES "${BASE_ARCH}a-real")