Fix merge conflicts

NVIDIA · Jul 11, 2024 · ca1d62a · ca1d62a
1 parent 596cd56
commit ca1d62a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/include/cuco/detail/open_addressing/open_addressing_impl.cuh b/include/cuco/detail/open_addressing/open_addressing_impl.cuh
@@ -579,8 +579,8 @@ class open_addressing_impl {
                                                    OutputProbeIt output_probe,
                                                    OutputMatchIt output_match,
                                                    Ref container_ref,
-                                                   cuda_stream_ref stream) const
-  {  // TODO cuda::stream_ref
+                                                   cuda::stream_ref stream) const
+  {
     auto constexpr is_outer = false;
     return this->retrieve_impl<is_outer>(
       first, last, output_probe, output_match, container_ref, stream);
@@ -593,8 +593,8 @@ class open_addressing_impl {
                                                          OutputProbeIt output_probe,
                                                          OutputMatchIt output_match,
                                                          Ref container_ref,
-                                                         cuda_stream_ref stream) const
-  {  // TODO cuda::stream_ref
+                                                         cuda::stream_ref stream) const
+  {
     auto constexpr is_outer = true;
     return this->retrieve_impl<is_outer>(
       first, last, output_probe, output_match, container_ref, stream);
@@ -942,8 +942,8 @@ class open_addressing_impl {
                                                         OutputProbeIt output_probe,
                                                         OutputMatchIt output_match,
                                                         Ref container_ref,
-                                                        cuda_stream_ref stream) const
-  {  // TODO cuda::stream_ref
+                                                        cuda::stream_ref stream) const
+  {
     auto const n = cuco::detail::distance(first, last);
     if (n == 0) { return {output_probe, output_match}; }
 
@@ -954,14 +954,14 @@ class open_addressing_impl {
     auto constexpr block_size = cuco::detail::default_block_size();
     auto const grid_size      = cuco::detail::max_occupancy_grid_size(block_size,
                                                                  detail::retrieve<IsOuter,
-                                                                                  block_size,
-                                                                                  InputProbeIt,
-                                                                                  OutputProbeIt,
-                                                                                  OutputMatchIt,
-                                                                                  decltype(counter),
-                                                                                  Ref>);
-
-    detail::retrieve<IsOuter, block_size><<<grid_size, block_size, 0, stream>>>(
+                                                                                       block_size,
+                                                                                       InputProbeIt,
+                                                                                       OutputProbeIt,
+                                                                                       OutputMatchIt,
+                                                                                       decltype(counter),
+                                                                                       Ref>);
+
+    detail::retrieve<IsOuter, block_size><<<grid_size, block_size, 0, stream.get()>>>(
       first, n, output_probe, output_match, counter.data(), container_ref);
 
     auto const num_retrieved = counter.load_to_host(stream);

diff --git a/include/cuco/detail/static_multiset/static_multiset.inl b/include/cuco/detail/static_multiset/static_multiset.inl
@@ -292,7 +292,7 @@ static_multiset<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>
   InputProbeIt last,
   OutputProbeIt output_probe,
   OutputMatchIt output_match,
-  cuda_stream_ref stream) const  // TODO cuda::stream_ref
+  cuda::stream_ref stream) const
 {
   return this->impl_->retrieve(
     first, last, output_probe, output_match, this->ref(op::retrieve), stream);
@@ -313,7 +313,7 @@ static_multiset<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>
   InputProbeIt last,
   OutputProbeIt output_probe,
   OutputMatchIt output_match,
-  cuda_stream_ref stream) const  // TODO cuda::stream_ref
+  cuda::stream_ref stream) const
 {
   return this->impl_->retrieve_outer(
     first, last, output_probe, output_match, this->ref(op::retrieve), stream);

diff --git a/include/cuco/static_multiset.cuh b/include/cuco/static_multiset.cuh
@@ -475,21 +475,19 @@ class static_multiset {
 
   // TODO docs
   template <class InputProbeIt, class OutputProbeIt, class OutputMatchIt>
-  std::pair<OutputProbeIt, OutputMatchIt> retrieve(
-    InputProbeIt first,
-    InputProbeIt last,
-    OutputProbeIt output_probe,
-    OutputMatchIt output_match,
-    cuda_stream_ref stream = {}) const;  // TODO cuda::stream_ref
+  std::pair<OutputProbeIt, OutputMatchIt> retrieve(InputProbeIt first,
+                                                   InputProbeIt last,
+                                                   OutputProbeIt output_probe,
+                                                   OutputMatchIt output_match,
+                                                   cuda::stream_ref stream = {}) const;
 
   // TODO docs
   template <class InputProbeIt, class OutputProbeIt, class OutputMatchIt>
-  std::pair<OutputProbeIt, OutputMatchIt> retrieve_outer(
-    InputProbeIt first,
-    InputProbeIt last,
-    OutputProbeIt output_probe,
-    OutputMatchIt output_match,
-    cuda_stream_ref stream = {}) const;  // TODO cuda::stream_ref
+  std::pair<OutputProbeIt, OutputMatchIt> retrieve_outer(InputProbeIt first,
+                                                         InputProbeIt last,
+                                                         OutputProbeIt output_probe,
+                                                         OutputMatchIt output_match,
+                                                         cuda::stream_ref stream = {}) const;
 
   /**
    * @brief Counts the occurrences of keys in `[first, last)` contained in the multiset