nikola/llama_cpp
1
0
Fork 0
Code Issues Pull Requests Actions 25 Packages Projects Releases Wiki Activity

Revert "ggml-cuda: use CMAKE_CUDA_ARCHITECTURES if set when GGML_NATIVE=ON (#18413)" (#18426)

Browse Source
This commit is contained in:
Aman Gupta
2025-12-28 20:53:36 +08:00
committed by GitHub
parent 60f17f56da
commit 07a0c4ba92
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ggml/src/ggml-cuda/CMakeLists.txt
+2 -2
View File
@@ -37,13 +37,14 @@ if (CUDAToolkit_FOUND)
endif() endif()
endif() endif()
endif() endif()
message(STATUS "Using CUDA architectures: ${CMAKE_CUDA_ARCHITECTURES}")
enable_language(CUDA) enable_language(CUDA)
# Replace any 12x-real architectures with 12x{a}-real. FP4 ptx instructions are not available in just 12x # Replace any 12x-real architectures with 12x{a}-real. FP4 ptx instructions are not available in just 12x
if (GGML_NATIVE) if (GGML_NATIVE)
set(PROCESSED_ARCHITECTURES "") 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}) set(ARCH_LIST ${CMAKE_CUDA_ARCHITECTURES_NATIVE})
else() else()
set(ARCH_LIST ${CMAKE_CUDA_ARCHITECTURES}) set(ARCH_LIST ${CMAKE_CUDA_ARCHITECTURES})
@@ -65,7 +66,6 @@ if (CUDAToolkit_FOUND)
endif() endif()
endforeach() endforeach()
endif() endif()
message(STATUS "Using CUDA architectures: ${CMAKE_CUDA_ARCHITECTURES}")
file(GLOB GGML_HEADERS_CUDA "*.cuh") file(GLOB GGML_HEADERS_CUDA "*.cuh")
list(APPEND GGML_HEADERS_CUDA "../../include/ggml-cuda.h") list(APPEND GGML_HEADERS_CUDA "../../include/ggml-cuda.h")