Skip to content

Commit a2a6c91

Browse files
bernhardmgruberdavebayer
authored andcommitted
Remove legacy macros from CUB util_arch.cuh (NVIDIA#3257)
Fixes: NVIDIA#3256
1 parent 06c920e commit a2a6c91

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

cub/cub/util_arch.cuh

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ CUB_NAMESPACE_BEGIN
5454

5555
#ifndef _CCCL_DOXYGEN_INVOKED // Do not document
5656

57-
// \deprecated [Since 2.1.0]
58-
# define CUB_USE_COOPERATIVE_GROUPS
59-
6057
/// In device code, CUB_PTX_ARCH expands to the PTX version for which we are
6158
/// compiling. In host code, CUB_PTX_ARCH's value is implementation defined.
6259
# ifndef CUB_PTX_ARCH
@@ -72,33 +69,6 @@ CUB_NAMESPACE_BEGIN
7269
# endif
7370
# endif
7471

75-
// These definitions were intended for internal use only and are now obsolete.
76-
// If you relied on them, consider porting your code to use the functionality
77-
// in libcu++'s <nv/target> header.
78-
// For a temporary workaround, define CUB_PROVIDE_LEGACY_ARCH_MACROS to make
79-
// them available again. These should be considered deprecated and will be
80-
// fully removed in a future version.
81-
# ifdef CUB_PROVIDE_LEGACY_ARCH_MACROS
82-
# ifndef CUB_IS_DEVICE_CODE
83-
# if defined(_NVHPC_CUDA)
84-
# define CUB_IS_DEVICE_CODE __builtin_is_device_code()
85-
# define CUB_IS_HOST_CODE (!__builtin_is_device_code())
86-
# define CUB_INCLUDE_DEVICE_CODE 1
87-
# define CUB_INCLUDE_HOST_CODE 1
88-
# elif CUB_PTX_ARCH > 0
89-
# define CUB_IS_DEVICE_CODE 1
90-
# define CUB_IS_HOST_CODE 0
91-
# define CUB_INCLUDE_DEVICE_CODE 1
92-
# define CUB_INCLUDE_HOST_CODE 0
93-
# else
94-
# define CUB_IS_DEVICE_CODE 0
95-
# define CUB_IS_HOST_CODE 1
96-
# define CUB_INCLUDE_DEVICE_CODE 0
97-
# define CUB_INCLUDE_HOST_CODE 1
98-
# endif
99-
# endif
100-
# endif // CUB_PROVIDE_LEGACY_ARCH_MACROS
101-
10272
/// Maximum number of devices supported.
10373
# ifndef CUB_MAX_DEVICES
10474
# define CUB_MAX_DEVICES (128)

0 commit comments

Comments
 (0)