Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

remove deprecated support for the THRUST_DEVICE_BACKEND macro #1761

Merged
merged 3 commits into from
Aug 8, 2022
Merged

remove deprecated support for the THRUST_DEVICE_BACKEND macro #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7f7d11
remove deprecated support for the THRUST_DEVICE_BACKEND macro
ericniebler Aug 4, 2022
562ef69
remove deprecated support for THRUST_HOST_BACKEND macro
ericniebler Aug 5, 2022
df32883
fix stale reference to THRUST_DEFAULT_DEVICE_BACKEND in doc comment
ericniebler Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions thrust/detail/config/device_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 1 addition & 18 deletions thrust/detail/config/host_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion thrust/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
* <tt>device_ptr<Element></tt> and <tt>pointer<Element,device_system_tag></tt> are considered equivalent.
*
Expand Down