Skip to content

Commit

Permalink
DO NOT MERGE: Testing cccl branch/v2.3.0 with msvc fix backported - b…
Browse files Browse the repository at this point in the history
…ut not cmake
  • Loading branch information
ptheywood committed Feb 29, 2024
1 parent 6389e2a commit b3323d4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions cmake/dependencies/CCCL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ cmake_policy(SET CMP0079 NEW)

# Set the minimum supported CCCL version, and the version to fetch
# 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).
set(MIN_REQUIRED_CCCL_VERSION 2.2.0)
set(CCCL_DOWNLOAD_TAG v2.2.0)
set(MIN_REQUIRED_CCCL_VERSION 2.3.0)
set(CCCL_DOWNLOAD_TAG branch/2.3.x) # @todo - this should be changed to v2.3.0 when possible

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

# Quietly find CCCL, to check if the version included with CUDA (if CCCL) is sufficiently new.
# Using CCCL avoids complex cub/thrust version workarounds previously required.
# 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.
# If/when we change the minimum CCCL to 2.3.0 we should be able to remove the `components libcudacxx`.
# 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`.
find_package(CCCL ${MIN_REQUIRED_CCCL_VERSION} QUIET COMPONENTS libcudacxx CONFIG HINTS ${CUDAToolkit_INCLUDE_DIRS} ${CUDAToolkit_LIBRARY_DIR}/cmake)

# If CCCL was found, find it again but loudly (with all components)
Expand All @@ -32,7 +32,7 @@ else()
cccl
GIT_REPOSITORY https://github.com/NVIDIA/CCCL.git
GIT_TAG ${CCCL_DOWNLOAD_TAG}
GIT_SHALLOW 1
GIT_SHALLOW 0 # @todo - set this back to 1.
GIT_PROGRESS ON
# UPDATE_DISCONNECTED ON
)
Expand Down

0 comments on commit b3323d4

Please sign in to comment.