From b7f7d11e162bfa0a24ec88f5110be10cf812859c Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Thu, 4 Aug 2022 14:12:25 -0700 Subject: [PATCH 1/3] remove deprecated support for the THRUST_DEVICE_BACKEND macro --- thrust/detail/config/device_system.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/thrust/detail/config/device_system.h b/thrust/detail/config/device_system.h index c4106d3fb..29418c903 100644 --- a/thrust/detail/config/device_system.h +++ b/thrust/detail/config/device_system.h @@ -26,25 +26,8 @@ #define THRUST_DEVICE_SYSTEM THRUST_DEVICE_SYSTEM_CUDA #endif // THRUST_DEVICE_SYSTEM -// XXX make the use of THRUST_DEVICE_BACKEND an error in Thrust 1.7 -// XXX eliminate the following in Thrust 1.7 - -#define THRUST_DEVICE_BACKEND_CUDA THRUST_DEVICE_SYSTEM_CUDA -#define THRUST_DEVICE_BACKEND_OMP THRUST_DEVICE_SYSTEM_OMP -#define THRUST_DEVICE_BACKEND_TBB THRUST_DEVICE_SYSTEM_TBB - #ifdef THRUST_DEVICE_BACKEND -# if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC -# pragma message("----------------------------------------------------------------------------------") -# pragma message("| WARNING: THRUST_DEVICE_BACKEND is deprecated; use THRUST_DEVICE_SYSTEM instead |") -# pragma message("----------------------------------------------------------------------------------") -# else -# warning ---------------------------------------------------------------------------------- -# warning | WARNING: THRUST_DEVICE_BACKEND is deprecated; use THRUST_DEVICE_SYSTEM instead | -# warning ---------------------------------------------------------------------------------- -# endif // THRUST_HOST_COMPILER -# undef THRUST_DEVICE_SYSTEM -# define THRUST_DEVICE_SYSTEM THRUST_DEVICE_BACKEND +# error THRUST_DEVICE_BACKEND is no longer supported; use THRUST_DEVICE_SYSTEM instead. #endif // THRUST_DEVICE_BACKEND #if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA From 562ef6954fb22360c4d44370e3b9e951ed579aed Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Fri, 5 Aug 2022 14:37:52 -0700 Subject: [PATCH 2/3] remove deprecated support for THRUST_HOST_BACKEND macro --- thrust/detail/config/host_system.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/thrust/detail/config/host_system.h b/thrust/detail/config/host_system.h index 5c1387803..f216f6492 100644 --- a/thrust/detail/config/host_system.h +++ b/thrust/detail/config/host_system.h @@ -25,25 +25,8 @@ #define THRUST_HOST_SYSTEM THRUST_HOST_SYSTEM_CPP #endif // THRUST_HOST_SYSTEM -// XXX make the use of THRUST_HOST_BACKEND an error in Thrust 1.7 -// XXX eliminate the following in Thrust 1.7 - -#define THRUST_HOST_BACKEND_CPP THRUST_HOST_SYSTEM_CPP -#define THRUST_HOST_BACKEND_OMP THRUST_HOST_SYSTEM_OMP -#define THRUST_HOST_BACKEND_TBB THRUST_HOST_SYSTEM_TBB - #ifdef THRUST_HOST_BACKEND -# if THRUST_HOST_COMPILER == THRUST_HOST_COMPILER_MSVC -# pragma message("------------------------------------------------------------------------------") -# pragma message("| WARNING: THRUST_HOST_BACKEND is deprecated; use THRUST_HOST_SYSTEM instead |") -# pragma message("------------------------------------------------------------------------------") -# else -# warning ------------------------------------------------------------------------------ -# warning | WARNING: THRUST_HOST_BACKEND is deprecated; use THRUST_HOST_SYSTEM instead | -# warning ------------------------------------------------------------------------------ -# endif // THRUST_HOST_COMPILER -# undef THRUST_HOST_SYSTEM -# define THRUST_HOST_SYSTEM THRUST_HOST_BACKEND +# error THRUST_HOST_BACKEND is no longer supported; use THRUST_HOST_SYSTEM instead. #endif // THRUST_HOST_BACKEND #if THRUST_HOST_SYSTEM == THRUST_HOST_SYSTEM_CPP From df328837dd2d3dd39cd87ea2c7ed5e71d7cb1e7d Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Fri, 5 Aug 2022 14:39:28 -0700 Subject: [PATCH 3/3] fix stale reference to THRUST_DEFAULT_DEVICE_BACKEND in doc comment --- thrust/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thrust/memory.h b/thrust/memory.h index 5ce76f2e5..819ac2513 100644 --- a/thrust/memory.h +++ b/thrust/memory.h @@ -48,7 +48,7 @@ THRUST_NAMESPACE_BEGIN * type ensures type safety when dispatching standard algorithms on ranges resident in memory. * * \p pointer generalizes \p device_ptr by relaxing the backend system associated with the \p pointer. - * Instead of the backend system specified by \p THRUST_DEFAULT_DEVICE_BACKEND, \p pointer's + * Instead of the backend system specified by \p THRUST_DEVICE_SYSTEM, \p pointer's * system is given by its second template parameter, \p Tag. For the purpose of Thrust dispatch, * device_ptr and pointer are considered equivalent. *