Update insert_if to return #insertions

NVIDIA · Aug 7, 2024 · 6408091 · 6408091
1 parent 9dd4d50
commit 6408091
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/include/cuco/detail/static_multimap/static_multimap.inl b/include/cuco/detail/static_multimap/static_multimap.inl
@@ -183,11 +183,11 @@ template <class Key,
           class Allocator,
           class Storage>
 template <typename InputIt, typename StencilIt, typename Predicate>
-void static_multimap<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::insert_if(
+static_multimap<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::size_type
+static_multimap<Key, T, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::insert_if(
   InputIt first, InputIt last, StencilIt stencil, Predicate pred, cuda::stream_ref stream)
 {
-  this->insert_if_async(first, last, stencil, pred, stream);
-  stream.wait();
+  return impl_->insert_if(first, last, stencil, pred, ref(op::insert), stream);
 }
 
 template <class Key,

diff --git a/include/cuco/detail/static_multiset/static_multiset.inl b/include/cuco/detail/static_multiset/static_multiset.inl
@@ -152,11 +152,11 @@ template <class Key,
           class Allocator,
           class Storage>
 template <typename InputIt, typename StencilIt, typename Predicate>
-void static_multiset<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::insert_if(
+static_multiset<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::size_type
+static_multiset<Key, Extent, Scope, KeyEqual, ProbingScheme, Allocator, Storage>::insert_if(
   InputIt first, InputIt last, StencilIt stencil, Predicate pred, cuda::stream_ref stream)
 {
-  this->insert_if_async(first, last, stencil, pred, stream);
-  stream.wait();
+  return impl_->insert_if(first, last, stencil, pred, ref(op::insert), stream);
 }
 
 template <class Key,

diff --git a/include/cuco/static_multimap.cuh b/include/cuco/static_multimap.cuh
@@ -335,9 +335,11 @@ class static_multimap {
    * @param pred Predicate to test on every element in the range `[stencil, stencil +
    * std::distance(first, last))`
    * @param stream CUDA stream used for the operation
+   *
+   * @return Number of successful insertions
    */
   template <typename InputIt, typename StencilIt, typename Predicate>
-  void insert_if(
+  size_type insert_if(
     InputIt first, InputIt last, StencilIt stencil, Predicate pred, cuda::stream_ref stream = {});
 
   /**

diff --git a/include/cuco/static_multiset.cuh b/include/cuco/static_multiset.cuh
@@ -299,9 +299,11 @@ class static_multiset {
    * @param pred Predicate to test on every element in the range `[stencil, stencil +
    * std::distance(first, last))`
    * @param stream CUDA stream used for the operation
+   *
+   * @return Number of successful insertions
    */
   template <typename InputIt, typename StencilIt, typename Predicate>
-  void insert_if(
+  size_type insert_if(
     InputIt first, InputIt last, StencilIt stencil, Predicate pred, cuda::stream_ref stream = {});
 
   /**