Skip to content

Commit 9121ac1

Browse files
misccomiscco
committed
Do not use open ::cub qualifier
1 parent 70455d0 commit 9121ac1

File tree

14 files changed

+25
-25
lines changed

14 files changed

+25
-25
lines changed

‎libcudacxx/include/cuda/__container/buffer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ _CCCL_HOST_API void __fill_n(cuda::stream_ref __stream, _Tp* __first, ::cuda::st
703703
{
704704
# if _CCCL_CUDA_COMPILATION()
705705
::cuda::__ensure_current_context __guard(__stream);
706-
::cub::DeviceTransform::Fill(__first, __count, __value, __stream.get());
706+
CUB_NS_QUALIFIER::DeviceTransform::Fill(__first, __count, __value, __stream.get());
707707
# else // ^^^ _CCCL_CUDA_COMPILATION() ^^^ / vvv !_CCCL_CUDA_COMPILATION() vvv
708708
static_assert(sizeof(_Tp) <= 4,
709709
"CUDA compiler is required to initialize an async_buffer with elements larger than 4 bytes");

‎libcudacxx/include/cuda/std/__pstl/cuda/adjacent_difference.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ struct __pstl_dispatch<__pstl_algorithm::__adjacent_difference, __execution_back
7373
// Determine temporary device storage requirements for device_merge
7474
size_t __num_bytes = 0;
7575
_CCCL_TRY_CUDA_API(
76-
::cub::DeviceAdjacentDifference::SubtractLeftCopy,
76+
CUB_NS_QUALIFIER::DeviceAdjacentDifference::SubtractLeftCopy,
7777
"__pstl_cuda_merge: determination of device storage for cub::DeviceAdjacentDifference::SubtractLeftCopy failed",
7878
static_cast<void*>(nullptr),
7979
__num_bytes,
@@ -92,7 +92,7 @@ struct __pstl_dispatch<__pstl_algorithm::__adjacent_difference, __execution_back
9292

9393
// Run the kernel, the standard requires that the input and output range do not overlap
9494
_CCCL_TRY_CUDA_API(
95-
::cub::DeviceAdjacentDifference::SubtractLeftCopy,
95+
CUB_NS_QUALIFIER::DeviceAdjacentDifference::SubtractLeftCopy,
9696
"__pstl_cuda_merge: kernel launch of cub::DeviceAdjacentDifference::SubtractLeftCopy failed",
9797
__storage.__get_temp_storage(),
9898
__num_bytes,

‎libcudacxx/include/cuda/std/__pstl/cuda/copy_if.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ struct __pstl_dispatch<__pstl_algorithm::__copy_if, __execution_backend::__cuda>
8181
void* __temp_storage = nullptr;
8282
size_t __num_bytes = 0;
8383
_CCCL_TRY_CUDA_API(
84-
::cub::DeviceSelect::If,
84+
CUB_NS_QUALIFIER::DeviceSelect::If,
8585
"__pstl_cuda_select_if: determination of device storage for cub::DeviceSelect::If failed",
8686
__temp_storage,
8787
__num_bytes,
@@ -97,7 +97,7 @@ struct __pstl_dispatch<__pstl_algorithm::__copy_if, __execution_backend::__cuda>
9797

9898
// Run the kernel
9999
_CCCL_TRY_CUDA_API(
100-
::cub::DeviceSelect::If,
100+
CUB_NS_QUALIFIER::DeviceSelect::If,
101101
"__pstl_cuda_select_if: kernel launch of cub::DeviceSelect::If failed",
102102
__storage.__get_temp_storage(),
103103
__num_bytes,

‎libcudacxx/include/cuda/std/__pstl/cuda/copy_n.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ struct __pstl_dispatch<__pstl_algorithm::__copy_n, __execution_backend::__cuda>
7373
auto __stream = ::cuda::__call_or(::cuda::get_stream, ::cuda::stream_ref{cudaStreamPerThread}, __policy);
7474

7575
_CCCL_TRY_CUDA_API(
76-
::cub::DeviceTransform::TransformIf,
76+
CUB_NS_QUALIFIER::DeviceTransform::TransformIf,
7777
"__pstl_cuda_copy_n: kernel launch of device_transform failed",
7878
tuple<_InputIterator>{::cuda::std::move(__first)},
7979
__result,

‎libcudacxx/include/cuda/std/__pstl/cuda/exclusive_scan.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct __pstl_dispatch<__pstl_algorithm::__exclusive_scan, __execution_backend::
7676
// Determine temporary device storage requirements for reduce
7777
size_t __num_bytes = 0;
7878
_CCCL_TRY_CUDA_API(
79-
::cub::DeviceScan::ExclusiveScan,
79+
CUB_NS_QUALIFIER::DeviceScan::ExclusiveScan,
8080
"__pstl_cuda_exclusive_scan: determination of device storage for cub::DeviceScan::ExclusiveScan failed",
8181
static_cast<void*>(nullptr),
8282
__num_bytes,
@@ -96,7 +96,7 @@ struct __pstl_dispatch<__pstl_algorithm::__exclusive_scan, __execution_backend::
9696

9797
// Run the scan
9898
_CCCL_TRY_CUDA_API(
99-
::cub::DeviceScan::ExclusiveScan,
99+
CUB_NS_QUALIFIER::DeviceScan::ExclusiveScan,
100100
"__pstl_cuda_exclusive_scan: kernel launch of cub::DeviceScan::ExclusiveScan failed",
101101
__storage.__get_temp_storage(),
102102
__num_bytes,

‎libcudacxx/include/cuda/std/__pstl/cuda/find_if.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ struct __pstl_dispatch<__pstl_algorithm::__find_if, __execution_backend::__cuda>
7878
void* __temp_storage = nullptr;
7979
size_t __num_bytes = 0;
8080
_CCCL_TRY_CUDA_API(
81-
::cub::DeviceFind::FindIf,
81+
CUB_NS_QUALIFIER::DeviceFind::FindIf,
8282
"__pstl_cuda_find_if: determining temporary storage failed",
8383
__temp_storage,
8484
__num_bytes,
@@ -96,7 +96,7 @@ struct __pstl_dispatch<__pstl_algorithm::__find_if, __execution_backend::__cuda>
9696

9797
// Run the find operation
9898
_CCCL_TRY_CUDA_API(
99-
::cub::DeviceFind::FindIf,
99+
CUB_NS_QUALIFIER::DeviceFind::FindIf,
100100
"__pstl_cuda_find_if: cub::DeviceFind failed",
101101
__storage.__get_temp_storage(),
102102
__num_bytes,

‎libcudacxx/include/cuda/std/__pstl/cuda/for_each_n.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ struct __pstl_dispatch<__pstl_algorithm::__for_each_n, __execution_backend::__cu
7171
auto __stream = ::cuda::__call_or(::cuda::get_stream, ::cuda::stream_ref{cudaStreamPerThread}, __policy);
7272

7373
_CCCL_TRY_CUDA_API(
74-
::cub::DeviceFor::ForEachN,
74+
CUB_NS_QUALIFIER::DeviceFor::ForEachN,
7575
"__pstl_dispatch: kernel launch failed",
7676
__first,
7777
__count,

‎libcudacxx/include/cuda/std/__pstl/cuda/generate_n.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ struct __pstl_dispatch<__pstl_algorithm::__generate_n, __execution_backend::__cu
7171

7272
// We pass the policy as an environment to device_transform
7373
_CCCL_TRY_CUDA_API(
74-
::cub::DeviceTransform::Generate,
74+
CUB_NS_QUALIFIER::DeviceTransform::Generate,
7575
"__pstl_cuda_generate: call to cub device_transform::Generate failed",
7676
::cuda::std::move(__result),
7777
__count,

‎libcudacxx/include/cuda/std/__pstl/cuda/inclusive_scan.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct __pstl_dispatch<__pstl_algorithm::__inclusive_scan, __execution_backend::
7676
// Determine temporary device storage requirements for reduce
7777
size_t __num_bytes = 0;
7878
_CCCL_TRY_CUDA_API(
79-
::cub::DeviceScan::InclusiveScanInit,
79+
CUB_NS_QUALIFIER::DeviceScan::InclusiveScanInit,
8080
"__pstl_cuda_inclusive_scan: determination of device storage for cub::DeviceScan::InclusiveScanInit failed",
8181
static_cast<void*>(nullptr),
8282
__num_bytes,
@@ -96,7 +96,7 @@ struct __pstl_dispatch<__pstl_algorithm::__inclusive_scan, __execution_backend::
9696

9797
// Run the scan
9898
_CCCL_TRY_CUDA_API(
99-
::cub::DeviceScan::InclusiveScanInit,
99+
CUB_NS_QUALIFIER::DeviceScan::InclusiveScanInit,
100100
"__pstl_cuda_exclusive_scan: kernel launch of cub::DeviceScan::InclusiveScanInit failed",
101101
__storage.__get_temp_storage(),
102102
__num_bytes,
@@ -125,7 +125,7 @@ struct __pstl_dispatch<__pstl_algorithm::__inclusive_scan, __execution_backend::
125125
// Determine temporary device storage requirements for reduce
126126
size_t __num_bytes = 0;
127127
_CCCL_TRY_CUDA_API(
128-
::cub::DeviceScan::InclusiveScan,
128+
CUB_NS_QUALIFIER::DeviceScan::InclusiveScan,
129129
"__pstl_cuda_inclusive_scan: determination of device storage for cub::DeviceScan::InclusiveScan failed",
130130
static_cast<void*>(nullptr),
131131
__num_bytes,
@@ -144,7 +144,7 @@ struct __pstl_dispatch<__pstl_algorithm::__inclusive_scan, __execution_backend::
144144

145145
// Run the scan
146146
_CCCL_TRY_CUDA_API(
147-
::cub::DeviceScan::InclusiveScan,
147+
CUB_NS_QUALIFIER::DeviceScan::InclusiveScan,
148148
"__pstl_cuda_exclusive_scan: kernel launch of cub::DeviceScan::InclusiveScan failed",
149149
__storage.__get_temp_storage(),
150150
__num_bytes,

‎libcudacxx/include/cuda/std/__pstl/cuda/merge.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ struct __pstl_dispatch<__pstl_algorithm::__merge, __execution_backend::__cuda>
8080
// Determine temporary device storage requirements for device_merge
8181
size_t __num_bytes = 0;
8282
_CCCL_TRY_CUDA_API(
83-
::cub::DeviceMerge::MergeKeys,
83+
CUB_NS_QUALIFIER::DeviceMerge::MergeKeys,
8484
"__pstl_cuda_merge: determination of device storage for cub::DeviceMerge::MergeKeys failed",
8585
static_cast<void*>(nullptr),
8686
__num_bytes,
@@ -100,7 +100,7 @@ struct __pstl_dispatch<__pstl_algorithm::__merge, __execution_backend::__cuda>
100100

101101
// Run the kernel
102102
_CCCL_TRY_CUDA_API(
103-
::cub::DeviceMerge::MergeKeys,
103+
CUB_NS_QUALIFIER::DeviceMerge::MergeKeys,
104104
"__pstl_cuda_merge: kernel launch of cub::DeviceMerge::MergeKeys failed",
105105
__storage.__get_temp_storage(),
106106
__num_bytes,

0 commit comments

Comments
 (0)