From 1f8ac42c1403dda1a6480b1c401b1cee2cd55e02 Mon Sep 17 00:00:00 2001 From: Peter Heywood Date: Thu, 14 Dec 2023 12:48:43 +0000 Subject: [PATCH] DO NOT MERGE: Testing cccl branch/v2.3.0 with msvc fix backported - but not cmake --- cmake/dependencies/CCCL.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies/CCCL.cmake b/cmake/dependencies/CCCL.cmake index 848c38e97..5f7b164ee 100644 --- a/cmake/dependencies/CCCL.cmake +++ b/cmake/dependencies/CCCL.cmake @@ -18,7 +18,7 @@ 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) @@ -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 )