From 559d058dd24d7adb930b2d34b01b94bb9d7cc9fd Mon Sep 17 00:00:00 2001 From: Oliver Simons Date: Mon, 1 Dec 2025 17:54:06 +0100 Subject: [PATCH] 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 --- ggml/src/ggml-cuda/CMakeLists.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ggml/src/ggml-cuda/CMakeLists.txt b/ggml/src/ggml-cuda/CMakeLists.txt index fa771cdd11..9c2cbd3449 100644 --- a/ggml/src/ggml-cuda/CMakeLists.txt +++ b/ggml/src/ggml-cuda/CMakeLists.txt @@ -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")