Review/Deprecate CUB util.ptx for CCCL 2.x (NVIDIA#3342)

davebayer · Jan 23, 2025 · 4e5378d · 4e5378d
1 parent 9734205
commit 4e5378d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/cub/cub/agent/agent_merge.cuh b/cub/cub/agent/agent_merge.cuh
@@ -132,7 +132,7 @@ struct agent_t
     key_type keys_loc[items_per_thread];
     merge_sort::gmem_to_reg<threads_per_block, IsFullTile>(
       keys_loc, keys1_in + keys1_beg, keys2_in + keys2_beg, num_keys1, num_keys2);
-    merge_sort::reg_to_shared<threads_per_block>(&storage.keys_shared[0], keys_loc);
+    reg_to_shared<threads_per_block>(&storage.keys_shared[0], keys_loc);
     __syncthreads();
 
     // use binary search in shared memory to find merge path for each of thread.
@@ -185,7 +185,7 @@ struct agent_t
         items_loc, items1_in + keys1_beg, items2_in + keys2_beg, num_keys1, num_keys2);
       __syncthreads(); // block_store_keys above uses shared memory, so make sure all threads are done before we write
                        // to it
-      merge_sort::reg_to_shared<threads_per_block>(&storage.items_shared[0], items_loc);
+      reg_to_shared<threads_per_block>(&storage.items_shared[0], items_loc);
       __syncthreads();
 
       // gather items from shared mem

diff --git a/cub/cub/block/specializations/block_reduce_warp_reductions.cuh b/cub/cub/block/specializations/block_reduce_warp_reductions.cuh
@@ -50,6 +50,8 @@
 
 #include <cuda/ptx>
 
+CUB_NAMESPACE_BEGIN
+
 CUB_NAMESPACE_BEGIN
 namespace detail
 {

diff --git a/cub/cub/block/specializations/block_scan_warp_scans.cuh b/cub/cub/block/specializations/block_scan_warp_scans.cuh
@@ -49,6 +49,8 @@
 
 #include <cuda/ptx>
 
+CUB_NAMESPACE_BEGIN
+
 CUB_NAMESPACE_BEGIN
 namespace detail
 {

diff --git a/cub/cub/warp/specializations/warp_reduce_smem.cuh b/cub/cub/warp/specializations/warp_reduce_smem.cuh
@@ -51,6 +51,8 @@
 
 #include <cuda/ptx>
 
+CUB_NAMESPACE_BEGIN
+
 CUB_NAMESPACE_BEGIN
 namespace detail
 {

diff --git a/cub/cub/warp/specializations/warp_scan_shfl.cuh b/cub/cub/warp/specializations/warp_scan_shfl.cuh
@@ -50,6 +50,8 @@
 
 #include <cuda/ptx>
 
+CUB_NAMESPACE_BEGIN
+
 CUB_NAMESPACE_BEGIN
 namespace detail
 {

diff --git a/cub/cub/warp/specializations/warp_scan_smem.cuh b/cub/cub/warp/specializations/warp_scan_smem.cuh
@@ -51,6 +51,8 @@
 
 #include <cuda/ptx>
 
+CUB_NAMESPACE_BEGIN
+
 CUB_NAMESPACE_BEGIN
 namespace detail
 {