More occurences

Author: miscco

c2h/include/c2h/generators.h

@@ -97,7 +97,7 @@ void gen(seed_t seed,
 {
   detail::gen_custom_type_state(
     seed,
-    reinterpret_cast<char*>(THRUST_NS_QUALIFIER::raw_pointer_cast(data.data())),
+    reinterpret_cast<char*>(cuda::std::to_address(data.data())),
     min,
     max,
     data.size(),
@@ -110,13 +110,13 @@ void gen(seed_t seed,
          T min = ::cuda::std::numeric_limits<T>::lowest(),
          T max = ::cuda::std::numeric_limits<T>::max())
 {
-  detail::gen_values_between(seed, {THRUST_NS_QUALIFIER::raw_pointer_cast(data.data()), data.size()}, min, max);
+  detail::gen_values_between(seed, {cuda::std::to_address(data.data()), data.size()}, min, max);
 }
 
 template <typename T>
 void gen(modulo_t mod, device_vector<T>& data)
 {
-  detail::gen_values_cyclic(mod, ::cuda::std::span<T>{THRUST_NS_QUALIFIER::raw_pointer_cast(data.data()), data.size()});
+  detail::gen_values_cyclic(mod, ::cuda::std::span<T>{cuda::std::to_address(data.data()), data.size()});
 }
 
 /**
@@ -132,7 +132,7 @@ device_vector<T> gen_uniform_offsets(seed_t seed, T total_elements, T min_segmen
   device_vector<T> segment_offsets(total_elements + 2);
   const auto new_size = detail::gen_uniform_offsets(
     seed,
-    {THRUST_NS_QUALIFIER::raw_pointer_cast(segment_offsets.data()), segment_offsets.size()},
+    {cuda::std::to_address(segment_offsets.data()), segment_offsets.size()},
     total_elements,
     min_segment_size,
     max_segment_size);
@@ -148,19 +148,17 @@ template <typename OffsetT, typename KeyT>
 void init_key_segments(const device_vector<OffsetT>& segment_offsets, device_vector<KeyT>& keys_out)
 {
   detail::init_key_segments(
-    ::cuda::std::span<const OffsetT>{
-      THRUST_NS_QUALIFIER::raw_pointer_cast(segment_offsets.data()), segment_offsets.size()},
-    THRUST_NS_QUALIFIER::raw_pointer_cast(keys_out.data()),
+    ::cuda::std::span<const OffsetT>{cuda::std::to_address(segment_offsets.data()), segment_offsets.size()},
+    cuda::std::to_address(keys_out.data()),
     sizeof(KeyT));
 }
 
 template <typename OffsetT, template <typename> class... Ps>
 void init_key_segments(const device_vector<OffsetT>& segment_offsets, device_vector<custom_type_t<Ps...>>& keys_out)
 {
   detail::init_key_segments(
-    ::cuda::std::span<const OffsetT>{
-      THRUST_NS_QUALIFIER::raw_pointer_cast(segment_offsets.data()), segment_offsets.size()},
-    static_cast<custom_type_state_t*>(THRUST_NS_QUALIFIER::raw_pointer_cast(keys_out.data())),
+    ::cuda::std::span<const OffsetT>{cuda::std::to_address(segment_offsets.data()), segment_offsets.size()},
+    static_cast<custom_type_state_t*>(cuda::std::to_address(keys_out.data())),
     sizeof(custom_type_t<Ps...>));
 }
 } // namespace c2h

cub/cub/iterator/cache_modified_input_iterator.cuh

@@ -224,7 +224,7 @@ _CCCL_HOST_DEVICE _CCCL_FORCEINLINE auto try_make_cache_modified_iterator(Iterat
   if constexpr (::cuda::std::contiguous_iterator<Iterator>)
   {
     return CacheModifiedInputIterator<LoadModifier, it_value_t<Iterator>, it_difference_t<Iterator>>{
-      THRUST_NS_QUALIFIER::raw_pointer_cast(&*it)};
+      cuda::std::to_address(&*it)};
   }
   else
   {

cub/test/catch2_test_device_histogram.cu

@@ -678,7 +678,7 @@ C2H_TEST_LIST("DeviceHistogram::HistogramEven bin computation does not overflow"
     nullptr,
     temp_storage_bytes,
     d_samples,
-    raw_pointer_cast(d_histo_out.data()),
+    cuda::std::to_address(d_histo_out.data()),
     num_bins + 1,
     lower_level,
     upper_level,
@@ -689,10 +689,10 @@ C2H_TEST_LIST("DeviceHistogram::HistogramEven bin computation does not overflow"
 
   auto temp_storage = c2h::device_vector<char>(temp_storage_bytes);
   const auto error2 = cub::DeviceHistogram::HistogramEven(
-    raw_pointer_cast(temp_storage.data()),
+    cuda::std::to_address(temp_storage.data()),
     temp_storage_bytes,
     d_samples,
-    raw_pointer_cast(d_histo_out.data()),
+    cuda::std::to_address(d_histo_out.data()),
     num_bins + 1,
     lower_level,
     upper_level,
@@ -737,7 +737,7 @@ C2H_TEST_LIST(
     nullptr,
     temp_storage_bytes,
     d_samples,
-    raw_pointer_cast(d_histo_out.data()),
+    cuda::std::to_address(d_histo_out.data()),
     num_levels,
     lower_level,
     upper_level,
@@ -757,7 +757,7 @@ C2H_TEST_LIST(
     nullptr,
     temp_storage_bytes,
     d_samples,
-    raw_pointer_cast(d_histo_out.data()),
+    cuda::std::to_address(d_histo_out.data()),
     valid_num_levels,
     lower_level,
     static_cast<level_t>(valid_num_bins), // upper_level must accommodate all bins