Skip to content

Commit 4ea6196

Browse files
committed
Switch to CCCL v2.3.0 tagged commit - this does not include the fixes we need. Waiting for 2.3.2 or 2.4.0
1 parent b3323d4 commit 4ea6196

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Diff for: cmake/dependencies/CCCL.cmake

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ cmake_policy(SET CMP0079 NEW)
1010
# Set the minimum supported CCCL version, and the version to fetch
1111
# using find_package(version) means it's up to CCCL's cmake to determine if newer versions are compatible, but this will likely need changing for CUDA 13, when CCCL is planned to have a major version bump (and drop CUDA 11 support).
1212
set(MIN_REQUIRED_CCCL_VERSION 2.3.0)
13-
set(CCCL_DOWNLOAD_TAG branch/2.3.x) # @todo - this should be changed to v2.3.0 when possible
13+
set(CCCL_DOWNLOAD_TAG v2.3.0)
1414

1515
# Use the FindCUDATooklit package (CMake > 3.17) to get the CUDA version and CUDA include directories for cub/thrust location hints
1616
find_package(CUDAToolkit REQUIRED)
1717

1818
# Quietly find CCCL, to check if the version included with CUDA (if CCCL) is sufficiently new.
1919
# Using CCCL avoids complex cub/thrust version workarounds previously required.
2020
# However we cannot find thrust due to a missing guard in CCCL's cmake config file, and cannot find cub without finding libcudacxx, so just find libcudacxx quietly.
21-
# The fix for this was merged in upstream, but unclear if for the 2.3.x or 2.4.x release we should be able to remove the `components libcudacxx`.
21+
# The fix for this was merged into branch/2.3.x, but was not included in the v2.3.0 tagged commit.
22+
# @todo - wait for and test 2.3.2/2.4.0.
2223
find_package(CCCL ${MIN_REQUIRED_CCCL_VERSION} QUIET COMPONENTS libcudacxx CONFIG HINTS ${CUDAToolkit_INCLUDE_DIRS} ${CUDAToolkit_LIBRARY_DIR}/cmake)
2324

2425
# If CCCL was found, find it again but loudly (with all components)

0 commit comments

Comments
 (0)