From: Aman Gupta Date: Sun, 28 Dec 2025 12:53:36 +0000 (+0800) Subject: Revert "ggml-cuda: use CMAKE_CUDA_ARCHITECTURES if set when GGML_NATIVE=ON (#18413... X-Git-Tag: upstream/1.8.3~74 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=b8d209f55c7a63dcc10f9325463c71538b084650;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp Revert "ggml-cuda: use CMAKE_CUDA_ARCHITECTURES if set when GGML_NATIVE=ON (#18413)" (llama/18426) --- diff --git a/ggml/src/ggml-cuda/CMakeLists.txt b/ggml/src/ggml-cuda/CMakeLists.txt index f4912175..3b438c30 100644 --- a/ggml/src/ggml-cuda/CMakeLists.txt +++ b/ggml/src/ggml-cuda/CMakeLists.txt @@ -37,13 +37,14 @@ if (CUDAToolkit_FOUND) endif() endif() endif() + message(STATUS "Using CUDA architectures: ${CMAKE_CUDA_ARCHITECTURES}") enable_language(CUDA) # Replace any 12x-real architectures with 12x{a}-real. FP4 ptx instructions are not available in just 12x if (GGML_NATIVE) set(PROCESSED_ARCHITECTURES "") - if (NOT DEFINED CMAKE_CUDA_ARCHITECTURES AND CMAKE_CUDA_ARCHITECTURES_NATIVE) + if (CMAKE_CUDA_ARCHITECTURES_NATIVE) set(ARCH_LIST ${CMAKE_CUDA_ARCHITECTURES_NATIVE}) else() set(ARCH_LIST ${CMAKE_CUDA_ARCHITECTURES}) @@ -65,7 +66,6 @@ if (CUDAToolkit_FOUND) endif() endforeach() endif() - message(STATUS "Using CUDA architectures: ${CMAKE_CUDA_ARCHITECTURES}") file(GLOB GGML_HEADERS_CUDA "*.cuh") list(APPEND GGML_HEADERS_CUDA "../../include/ggml-cuda.h")