Skip to content

Commit f6dea8e

Browse files
bernhardmgruberdavebayer
authored andcommitted
Drop deprecated CUB macros (NVIDIA#3821)
1 parent 89830b3 commit f6dea8e

File tree

3 files changed

+3
-37
lines changed

3 files changed

+3
-37
lines changed

cub/cub/thread/thread_search.cuh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
#include <cub/util_namespace.cuh>
4747
#include <cub/util_type.cuh>
4848

49+
#include <cuda/std/__algorithm_>
50+
4951
#include <nv/target>
5052

5153
CUB_NAMESPACE_BEGIN

cub/cub/util_macro.cuh

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,43 +49,6 @@
4949

5050
CUB_NAMESPACE_BEGIN
5151

52-
#ifndef CUB_MAX
53-
/// Select maximum(a, b)
54-
/// Deprecated since [2.8]
55-
# define CUB_MAX(a, b) (((b) > (a)) ? (b) : (a))
56-
#endif
57-
58-
#ifndef CUB_MIN
59-
/// Select minimum(a, b)
60-
/// Deprecated since [2.8]
61-
# define CUB_MIN(a, b) (((b) < (a)) ? (b) : (a))
62-
#endif
63-
64-
#ifndef CUB_QUOTIENT_FLOOR
65-
/// Quotient of x/y rounded down to nearest integer
66-
/// Deprecated since [2.8]
67-
# define CUB_QUOTIENT_FLOOR(x, y) ((x) / (y))
68-
#endif
69-
70-
#ifndef CUB_QUOTIENT_CEILING
71-
/// Quotient of x/y rounded up to nearest integer
72-
/// Deprecated since [2.8]
73-
// FIXME(bgruber): the following computation can overflow, use cuda::ceil_div instead
74-
# define CUB_QUOTIENT_CEILING(x, y) (((x) + (y) - 1) / (y))
75-
#endif
76-
77-
#ifndef CUB_ROUND_UP_NEAREST
78-
/// x rounded up to the nearest multiple of y
79-
/// Deprecated since [2.8]
80-
# define CUB_ROUND_UP_NEAREST(x, y) (CUB_QUOTIENT_CEILING(x, y) * y)
81-
#endif
82-
83-
#ifndef CUB_ROUND_DOWN_NEAREST
84-
/// x rounded down to the nearest multiple of y
85-
/// Deprecated since [2.8]
86-
# define CUB_ROUND_DOWN_NEAREST(x, y) (((x) / (y)) * y)
87-
#endif
88-
8952
#ifndef CUB_DETAIL_KERNEL_ATTRIBUTES
9053
# define CUB_DETAIL_KERNEL_ATTRIBUTES CCCL_DETAIL_KERNEL_ATTRIBUTES
9154
#endif

cub/cub/warp/specializations/warp_scan_shfl.cuh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#include <cub/util_type.cuh>
5050

5151
#include <cuda/ptx>
52+
#include <cuda/std/__algorithm_>
5253

5354
CUB_NAMESPACE_BEGIN
5455
namespace detail

0 commit comments

Comments
 (0)