Fixes

NVIDIA · Jan 24, 2025 · 4aa9143 · 4aa9143
1 parent 293cb5c
commit 4aa9143
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/cub/cub/device/device_run_length_encode.cuh b/cub/cub/device/device_run_length_encode.cuh
@@ -210,6 +210,7 @@ struct DeviceRunLengthEncode
 
     using policy_t = detail::rle::encode::policy_hub<accum_t, key_t>;
 
+    _CCCL_SUPPRESS_DEPRECATED_PUSH
     return DispatchReduceByKey<
       InputIteratorT,
       UniqueOutputIteratorT,
@@ -231,6 +232,7 @@ struct DeviceRunLengthEncode
                           reduction_op(),
                           num_items,
                           stream);
+    _CCCL_SUPPRESS_DEPRECATED_POP
   }
 
   //! @rst

diff --git a/cub/test/catch2_test_util_type.cu b/cub/test/catch2_test_util_type.cu
@@ -25,20 +25,20 @@
  *
  ******************************************************************************/
 
+#include <cub/iterator/counting_input_iterator.cuh>
+#include <cub/iterator/discard_output_iterator.cuh>
 #include <cub/util_type.cuh>
 
-#include <thrust/iterator/counting_iterator.h>
-#include <thrust/iterator/discard_iterator.h>
-
 #include <cuda/std/type_traits>
 
 #include <c2h/catch2_test_helper.h>
 
 C2H_TEST("Tests non_void_value_t", "[util][type]")
 {
+  _CCCL_SUPPRESS_DEPRECATED_PUSH
   using fallback_t        = float;
-  using void_fancy_it     = thrust::discard_iterator<std::size_t>;
-  using non_void_fancy_it = thrust::counting_iterator<int>;
+  using void_fancy_it     = cub::DiscardOutputIterator<std::size_t>;
+  using non_void_fancy_it = cub::CountingInputIterator<int>;
 
   // falls back for const void*
   STATIC_REQUIRE(::cuda::std::is_same<fallback_t, //
@@ -61,6 +61,7 @@ C2H_TEST("Tests non_void_value_t", "[util][type]")
   // works for a fancy iterator that has int as value type
   STATIC_REQUIRE(::cuda::std::is_same<int, //
                                       cub::detail::non_void_value_t<non_void_fancy_it, fallback_t>>::value);
+  _CCCL_SUPPRESS_DEPRECATED_POP
 }
 
 CUB_DEFINE_DETECT_NESTED_TYPE(cat_detect, cat);