Merge remote-tracking branch 'origin/improve-retrieve' into improve-r…

…etrieve
NVIDIA · Nov 20, 2024 · bc601e1 · bc601e1
2 parents 9133ee8 + 5dc50ec
commit bc601e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/cuco/detail/open_addressing/open_addressing_ref_impl.cuh b/include/cuco/detail/open_addressing/open_addressing_ref_impl.cuh
@@ -1241,15 +1241,15 @@ class open_addressing_ref_impl {
               }
               output_idx = probing_tile.shfl(output_idx, 0);
 
-              int32_t matche_offset = 0;
+              int32_t matches_offset = 0;
 #pragma unroll buffer_size
               for (int32_t i = 0; i < bucket_size; ++i) {
                 if (equals[i]) {
                   auto const lane_offset = detail::count_least_significant_bits(exists[i], lane_id);
-                  buffers[flushing_tile_id][output_idx + matche_offset + lane_offset] = {
+                  buffers[flushing_tile_id][output_idx + matches_offset + lane_offset] = {
                     probe_key, bucket_slots[i]};
                 }
-                matche_offset += num_matches[i];
+                matches_offset += num_matches[i];
               }
             }
             // Special handling for outer cases where no match is found

diff --git a/include/cuco/detail/static_set/static_set_ref.inl b/include/cuco/detail/static_set/static_set_ref.inl
@@ -809,7 +809,7 @@ class operator_impl<op::retrieve_tag,
                            InputProbeIt input_probe_end,
                            OutputProbeIt output_probe,
                            OutputMatchIt output_match,
-                           AtomicCounter& atomic_counter) const
+                           AtomicCounter* atomic_counter) const
   {
     auto const& ref_ = static_cast<ref_type const&>(*this);
     ref_.impl_.retrieve<BlockSize>(