[skip-tests] Make cub pass with MSVC

NVIDIA · Sep 22, 2023 · 7749a7d · 7749a7d
1 parent f81b2e2
commit 7749a7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/cub/cub/agent/agent_three_way_partition.cuh b/cub/cub/agent/agent_three_way_partition.cuh
@@ -95,16 +95,17 @@ struct accumulator_pack_base_t<OffsetT, typename cuda::std::enable_if<sizeof(Off
 template <class OffsetT>
 struct accumulator_pack_t : accumulator_pack_base_t<OffsetT>
 {
-  using typename accumulator_pack_base_t<OffsetT>::pack_t;
+  using base = accumulator_pack_base_t<OffsetT>;
+  using typename base::pack_t;
 
   __device__ static void subtract(pack_t &packed, OffsetT val)
   {
-    packed = pack(first(packed) - val, second(packed) - val);
+    packed =  base::pack( base::first(packed) - val,  base::second(packed) - val);
   }
 
   __device__ static OffsetT sum(pack_t &packed)
   {
-    return first(packed) + second(packed);
+    return  base::first(packed) +  base::second(packed);
   }
 
   __device__ static pack_t zero()
@@ -131,7 +132,7 @@ struct AgentThreeWayPartitionPolicy
   constexpr static CacheLoadModifier LOAD_MODIFIER   = _LOAD_MODIFIER;
   constexpr static BlockScanAlgorithm SCAN_ALGORITHM = _SCAN_ALGORITHM;
 
-  struct detail 
+  struct detail
   {
     using delay_constructor_t = DelayConstructorT;
   };

diff --git a/cub/test/catch2_test_debug.cu b/cub/test/catch2_test_debug.cu
@@ -32,6 +32,7 @@ TEST_CASE("CubDebug resets last error", "[debug][utils]")
   cub::EmptyKernel<int><<<0, 0>>>();
   cudaError error = cudaPeekAtLastError();
 
+  REQUIRE( error != cudaSuccess );
   REQUIRE( CubDebug(cudaSuccess) != cudaSuccess );
   REQUIRE( CubDebug(cudaSuccess) == cudaSuccess );
 }
diff --git a/cub/test/catch2_test_device_scan_iterators.cu b/cub/test/catch2_test_device_scan_iterators.cu
@@ -302,8 +302,8 @@ CUB_TEST("Device scan works complex accumulator types", "[scan][device]")
 
   custom_accumulator_t init{};
 
-  thrust::device_vector<custom_input_t> d_input(num_items, custom_input_t{1});
-  thrust::device_vector<custom_output_t> d_output{num_items, custom_output_t{nullptr, 0}};
+  thrust::device_vector<custom_input_t> d_input(static_cast<size_t>(num_items), custom_input_t{1});
+  thrust::device_vector<custom_output_t> d_output{static_cast<size_t>(num_items), custom_output_t{nullptr, 0}};
   thrust::device_vector<int> d_ok_count(1);
 
   auto index_it = thrust::make_counting_iterator(0);