From 9019a6a28f2b6947d76c3b7502764a0a240f5111 Mon Sep 17 00:00:00 2001 From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:28:43 -0700 Subject: [PATCH] Backport PR #2332 and #2341 (#2368) * Update CCCL version to 2.6.1 * Do not hardcode Thrust's host system to cpp. (#2332) * Fix hardcoding __THRUST_HOST_SYSTEM_NAMESPACE to cpp (#2341) This change was erroneously introduced in 91b78d8 Fixes: #2098 --------- Co-authored-by: Allison Piper Co-authored-by: Bernhard Manfred Gruber --- cub/cub/cmake/cub-config-version.cmake | 2 +- cub/cub/version.cuh | 2 +- cudax/lib/cmake/cudax/cudax-config-version.cmake | 2 +- lib/cmake/cccl/cccl-config-version.cmake | 2 +- libcudacxx/include/cuda/std/__cccl/version.h | 2 +- libcudacxx/lib/cmake/libcudacxx/libcudacxx-config-version.cmake | 2 +- thrust/thrust/cmake/thrust-config-version.cmake | 2 +- thrust/thrust/execution_policy.h | 2 +- thrust/thrust/mr/host_memory_resource.h | 2 +- thrust/thrust/version.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cub/cub/cmake/cub-config-version.cmake b/cub/cub/cmake/cub-config-version.cmake index 2a12c4fa2b..923920ffba 100644 --- a/cub/cub/cmake/cub-config-version.cmake +++ b/cub/cub/cmake/cub-config-version.cmake @@ -3,7 +3,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake") set(CUB_VERSION_MAJOR 2) set(CUB_VERSION_MINOR 6) -set(CUB_VERSION_PATCH 0) +set(CUB_VERSION_PATCH 1) set(CUB_VERSION_TWEAK 0) set(CUB_VERSION "${CUB_VERSION_MAJOR}.${CUB_VERSION_MINOR}.${CUB_VERSION_PATCH}.${CUB_VERSION_TWEAK}") diff --git a/cub/cub/version.cuh b/cub/cub/version.cuh index e485eb3cd0..31ce920e7a 100644 --- a/cub/cub/version.cuh +++ b/cub/cub/version.cuh @@ -58,7 +58,7 @@ * CUB_VERSION / 100 % 1000 is the minor version. * CUB_VERSION / 100000 is the major version. */ -#define CUB_VERSION 200600 // macro expansion with ## requires this to be a single value +#define CUB_VERSION 200601 // macro expansion with ## requires this to be a single value /*! \def CUB_MAJOR_VERSION * \brief The preprocessor macro \p CUB_MAJOR_VERSION encodes the diff --git a/cudax/lib/cmake/cudax/cudax-config-version.cmake b/cudax/lib/cmake/cudax/cudax-config-version.cmake index 10f7c03a77..361b8e2a45 100644 --- a/cudax/lib/cmake/cudax/cudax-config-version.cmake +++ b/cudax/lib/cmake/cudax/cudax-config-version.cmake @@ -1,6 +1,6 @@ set(cudax_VERSION_MAJOR 2) set(cudax_VERSION_MINOR 6) -set(cudax_VERSION_PATCH 0) +set(cudax_VERSION_PATCH 1) set(cudax_VERSION_TWEAK 0) set(cudax_VERSION "${cudax_VERSION_MAJOR}.${cudax_VERSION_MINOR}.${cudax_VERSION_PATCH}.${cudax_VERSION_TWEAK}") diff --git a/lib/cmake/cccl/cccl-config-version.cmake b/lib/cmake/cccl/cccl-config-version.cmake index d79660c771..13105cfaa2 100644 --- a/lib/cmake/cccl/cccl-config-version.cmake +++ b/lib/cmake/cccl/cccl-config-version.cmake @@ -1,6 +1,6 @@ set(CCCL_VERSION_MAJOR 2) set(CCCL_VERSION_MINOR 6) -set(CCCL_VERSION_PATCH 0) +set(CCCL_VERSION_PATCH 1) set(CCCL_VERSION_TWEAK 0) set(CCCL_VERSION "${CCCL_VERSION_MAJOR}.${CCCL_VERSION_MINOR}.${CCCL_VERSION_PATCH}.${CCCL_VERSION_TWEAK}") diff --git a/libcudacxx/include/cuda/std/__cccl/version.h b/libcudacxx/include/cuda/std/__cccl/version.h index d8ed5b6c80..8640173227 100644 --- a/libcudacxx/include/cuda/std/__cccl/version.h +++ b/libcudacxx/include/cuda/std/__cccl/version.h @@ -14,7 +14,7 @@ #ifndef __CCCL_VERSION_H #define __CCCL_VERSION_H -#define CCCL_VERSION 2006000 +#define CCCL_VERSION 2006001 #define CCCL_MAJOR_VERSION (CCCL_VERSION / 1000000) #define CCCL_MINOR_VERSION (((CCCL_VERSION / 1000) % 1000)) #define CCCL_PATCH_VERSION (CCCL_VERSION % 1000) diff --git a/libcudacxx/lib/cmake/libcudacxx/libcudacxx-config-version.cmake b/libcudacxx/lib/cmake/libcudacxx/libcudacxx-config-version.cmake index 0c10627c01..33da47ce25 100644 --- a/libcudacxx/lib/cmake/libcudacxx/libcudacxx-config-version.cmake +++ b/libcudacxx/lib/cmake/libcudacxx/libcudacxx-config-version.cmake @@ -3,7 +3,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/libcudacxx-header-search.cmake") set(libcudacxx_VERSION_MAJOR 2) set(libcudacxx_VERSION_MINOR 6) -set(libcudacxx_VERSION_PATCH 0) +set(libcudacxx_VERSION_PATCH 1) set(libcudacxx_VERSION_TWEAK 0) set(libcudacxx_VERSION diff --git a/thrust/thrust/cmake/thrust-config-version.cmake b/thrust/thrust/cmake/thrust-config-version.cmake index 8c20d7d73b..1ccdd5dc4a 100644 --- a/thrust/thrust/cmake/thrust-config-version.cmake +++ b/thrust/thrust/cmake/thrust-config-version.cmake @@ -3,7 +3,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/thrust-header-search.cmake") set(THRUST_VERSION_MAJOR 2) set(THRUST_VERSION_MINOR 6) -set(THRUST_VERSION_PATCH 0) # Thrust: "subminor" CMake: "patch" +set(THRUST_VERSION_PATCH 1) # Thrust: "subminor" CMake: "patch" set(THRUST_VERSION_TWEAK 0) set(THRUST_VERSION "${THRUST_VERSION_MAJOR}.${THRUST_VERSION_MINOR}.${THRUST_VERSION_PATCH}.${THRUST_VERSION_TWEAK}") diff --git a/thrust/thrust/execution_policy.h b/thrust/thrust/execution_policy.h index c44ef355f2..56199aa5e9 100644 --- a/thrust/thrust/execution_policy.h +++ b/thrust/thrust/execution_policy.h @@ -55,7 +55,7 @@ THRUST_NAMESPACE_BEGIN namespace detail { -using host_t = thrust::system::cpp::detail::par_t; +using host_t = thrust::system::__THRUST_HOST_SYSTEM_NAMESPACE::detail::par_t; using device_t = thrust::system::__THRUST_DEVICE_SYSTEM_NAMESPACE::detail::par_t; diff --git a/thrust/thrust/mr/host_memory_resource.h b/thrust/thrust/mr/host_memory_resource.h index da77e3889a..82b5225f0c 100644 --- a/thrust/thrust/mr/host_memory_resource.h +++ b/thrust/thrust/mr/host_memory_resource.h @@ -33,6 +33,6 @@ THRUST_NAMESPACE_BEGIN -using host_memory_resource = thrust::system::cpp::memory_resource; +using host_memory_resource = thrust::system::__THRUST_HOST_SYSTEM_NAMESPACE::memory_resource; THRUST_NAMESPACE_END diff --git a/thrust/thrust/version.h b/thrust/thrust/version.h index 4899ede1d3..92e9707339 100644 --- a/thrust/thrust/version.h +++ b/thrust/thrust/version.h @@ -61,7 +61,7 @@ * THRUST_VERSION / 100 % 1000 is the minor version. * THRUST_VERSION / 100000 is the major version. */ -#define THRUST_VERSION 200600 // macro expansion with ## requires this to be a single value +#define THRUST_VERSION 200601 // macro expansion with ## requires this to be a single value /*! \def THRUST_MAJOR_VERSION * \brief The preprocessor macro \p THRUST_MAJOR_VERSION encodes the