From 406d22d8d6ee0435072cb5c3f99b13122bff333e Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Mon, 20 Jan 2025 15:48:04 +0100 Subject: [PATCH] Replace and deprecate thrust::cuda_cub::terminate (#3421) (#3425) --- thrust/thrust/system/cuda/detail/terminate.h | 12 +++--------- thrust/thrust/system/cuda/detail/util.h | 6 +++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/thrust/thrust/system/cuda/detail/terminate.h b/thrust/thrust/system/cuda/detail/terminate.h index d5989dd90b5..7f4e8dc1a74 100644 --- a/thrust/thrust/system/cuda/detail/terminate.h +++ b/thrust/thrust/system/cuda/detail/terminate.h @@ -36,7 +36,8 @@ #elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC) # pragma system_header #endif // no system header -#include + +#include #include @@ -47,18 +48,11 @@ namespace cuda { namespace detail { - -inline _CCCL_DEVICE void terminate() -{ - thrust::cuda_cub::terminate(); -} - inline _CCCL_HOST_DEVICE void terminate_with_message(const char* message) { printf("%s\n", message); - thrust::cuda_cub::terminate(); + ::cuda::std::terminate(); } - } // namespace detail } // namespace cuda } // namespace system diff --git a/thrust/thrust/system/cuda/detail/util.h b/thrust/thrust/system/cuda/detail/util.h index 49e84b8025b..4cdde4508d0 100644 --- a/thrust/thrust/system/cuda/detail/util.h +++ b/thrust/thrust/system/cuda/detail/util.h @@ -178,7 +178,7 @@ trivial_copy_device_to_device(Policy& policy, Type* dst, Type const* src, size_t return status; } -inline void _CCCL_HOST_DEVICE terminate() +CCCL_DEPRECATED_BECAUSE("Use cuda::std::terminate() instead") inline void _CCCL_HOST_DEVICE terminate() { NV_IF_TARGET(NV_IS_HOST, (std::terminate();), (asm("trap;");)); } @@ -210,7 +210,7 @@ _CCCL_HOST_DEVICE inline void throw_on_error(cudaError_t status) NV_IF_TARGET(NV_IS_HOST, (throw thrust::system_error(status, thrust::cuda_category());), - (THRUST_TEMP_DEVICE_CODE; cuda_cub::terminate();)); + (THRUST_TEMP_DEVICE_CODE; ::cuda::std::terminate();)); #undef THRUST_TEMP_DEVICE_CODE } @@ -243,7 +243,7 @@ _CCCL_HOST_DEVICE inline void throw_on_error(cudaError_t status, char const* msg NV_IF_TARGET(NV_IS_HOST, (throw thrust::system_error(status, thrust::cuda_category(), msg);), - (THRUST_TEMP_DEVICE_CODE; cuda_cub::terminate();)); + (THRUST_TEMP_DEVICE_CODE; ::cuda::std::terminate();)); #undef THRUST_TEMP_DEVICE_CODE }