happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CUDA: Move cccl fetch to after cuda has been enabled in CMakeLists.txt 

This will allow cccl to set build flags for the CUDA compiler, required
e.g. for MSVC compat, see also
https://github.com/NVIDIA/cccl/pull/6791
This commit is contained in:
Oliver Simons 2025-12-01 17:54:06 +01:00
parent 3e9a258c14
commit 559d058dd2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ggml/src/ggml-cuda/CMakeLists.txt
View File

@ -2,20 +2,6 @@ cmake_minimum_required(VERSION 3.18) # for CMAKE_CUDA_ARCHITECTURES
find_package(CUDAToolkit)
# Remove once CCCL 3.2 has been released and bundled with CUDA Toolkit
if (GGML_CUDA_CUB_3DOT2)
include(FetchContent)
FetchContent_Declare(
CCCL
GIT_REPOSITORY https://github.com/nvidia/cccl.git
GIT_TAG v3.2.0-rc0
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(CCCL)
endif()
if (CUDAToolkit_FOUND)
message(STATUS "CUDA Toolkit found")
@ -54,6 +40,20 @@ if (CUDAToolkit_FOUND)
enable_language(CUDA)
# Remove once CCCL 3.2 has been released and bundled with CUDA Toolkit
if (GGML_CUDA_CUB_3DOT2)
include(FetchContent)
FetchContent_Declare(
CCCL
GIT_REPOSITORY https://github.com/nvidia/cccl.git
GIT_TAG v3.2.0-rc0
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(CCCL)
endif()
file(GLOB GGML_HEADERS_CUDA "*.cuh")
list(APPEND GGML_HEADERS_CUDA "../../include/ggml-cuda.h")