Merge pull request #336 from senior-zero/fix-main/github/msvc

Fix MSVC / CUB tests build
NVIDIA · Aug 15, 2023 · 812ba98 · 812ba98
2 parents 067064e + 3023c5b
commit 812ba98
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/cub/test/c2h/generators.cu b/cub/test/c2h/generators.cu
@@ -379,7 +379,7 @@ void init_key_segments(const thrust::device_vector<OffsetT> &segment_offsets,
                        KeyT *d_out,
                        std::size_t element_size)
 {
-  OffsetT total_segments   = segment_offsets.size() - 1;
+  OffsetT total_segments   = static_cast<OffsetT>(segment_offsets.size() - 1);
   const OffsetT *d_offsets = thrust::raw_pointer_cast(segment_offsets.data());
 
   thrust::counting_iterator<int> iota(0);

diff --git a/cub/test/catch2_test_device_reduce.cuh b/cub/test/catch2_test_device_reduce.cuh
@@ -272,7 +272,9 @@ inline void compute_host_reference(InputItT h_in,
   {
     auto seg_begin      = h_in + h_offsets[segment];
     auto seg_end        = seg_begin + h_sizes_begin[segment];
-    h_data_out[segment] = std::accumulate(seg_begin, seg_end, init, reduction_op);
+    // TODO Should this be using cub accumulator t?
+    h_data_out[segment] = static_cast<cub::detail::value_t<ResultOutItT>>(
+      std::accumulate(seg_begin, seg_end, init, reduction_op));
   }
 }
 

diff --git a/cub/test/catch2_test_device_reduce_by_key.cu b/cub/test/catch2_test_device_reduce_by_key.cu
@@ -106,7 +106,7 @@ CUB_TEST("Device reduce-by-key works", "[by_key][reduce][device]", full_type_lis
                                        std::get<1>(seg_size_range));
 
   // Get array of keys from segment offsets
-  const offset_t num_segments = segment_offsets.size() - 1;
+  const offset_t num_segments = static_cast<offset_t>(segment_offsets.size() - 1);
   thrust::device_vector<key_t> segment_keys(num_items);
   c2h::init_key_segments(segment_offsets, segment_keys);
   auto d_keys_it = thrust::raw_pointer_cast(segment_keys.data());

diff --git a/cub/test/catch2_test_device_reduce_by_key_iterators.cu b/cub/test/catch2_test_device_reduce_by_key_iterators.cu
@@ -86,7 +86,7 @@ CUB_TEST("Device reduce-by-key works with iterators",
                                        std::get<1>(seg_size_range));
 
   // Get array of keys from segment offsets
-  const offset_t num_segments = segment_offsets.size() - 1;
+  const offset_t num_segments = static_cast<offset_t>(segment_offsets.size() - 1);
   thrust::device_vector<key_t> segment_keys(num_items);
   c2h::init_key_segments(segment_offsets, segment_keys);
   auto d_keys_it = segment_keys.cbegin();

diff --git a/cub/test/catch2_test_device_segmented_reduce.cu b/cub/test/catch2_test_device_segmented_reduce.cu
@@ -112,7 +112,7 @@ CUB_TEST("Device reduce works with all device interfaces",
                                        num_items,
                                        std::get<0>(seg_size_range),
                                        std::get<1>(seg_size_range));
-  const offset_t num_segments = segment_offsets.size() - 1;
+  const offset_t num_segments = static_cast<offset_t>(segment_offsets.size() - 1);
   auto d_offsets_it           = thrust::raw_pointer_cast(segment_offsets.data());
 
   // Generate input data

diff --git a/cub/test/catch2_test_device_segmented_reduce_iterators.cu b/cub/test/catch2_test_device_segmented_reduce_iterators.cu
@@ -85,7 +85,7 @@ CUB_TEST("Device segmented reduce works with fancy input iterators",
                                        num_items,
                                        std::get<0>(seg_size_range),
                                        std::get<1>(seg_size_range));
-  const offset_t num_segments = segment_offsets.size() - 1;
+  const offset_t num_segments = static_cast<offset_t>(segment_offsets.size() - 1);
   auto d_offsets_it           = thrust::raw_pointer_cast(segment_offsets.data());
 
   // Prepare input data