Replace deprecated with_operators with rebind_operators

Author: PointKernel

include/cuco/detail/static_map/static_map_ref.inl

@@ -288,27 +288,6 @@ static_map_ref<Key, T, Scope, KeyEqual, ProbingScheme, StorageRef, Operators...>
   return impl_.erased_key_sentinel();
 }
 
-template <typename Key,
-          typename T,
-          cuda::thread_scope Scope,
-          typename KeyEqual,
-          typename ProbingScheme,
-          typename StorageRef,
-          typename... Operators>
-template <typename... NewOperators>
-__host__ __device__ constexpr auto
-static_map_ref<Key, T, Scope, KeyEqual, ProbingScheme, StorageRef, Operators...>::with_operators(
-  NewOperators...) const noexcept
-{
-  return static_map_ref<Key, T, Scope, KeyEqual, ProbingScheme, StorageRef, NewOperators...>{
-    cuco::empty_key<Key>{this->empty_key_sentinel()},
-    cuco::empty_value<T>{this->empty_value_sentinel()},
-    this->key_eq(),
-    this->probing_scheme(),
-    {},
-    this->storage_ref()};
-}
-
 template <typename Key,
           typename T,
           cuda::thread_scope Scope,

include/cuco/detail/static_multimap/static_multimap_ref.inl

@@ -287,32 +287,6 @@ static_multimap_ref<Key, T, Scope, KeyEqual, ProbingScheme, StorageRef, Operator
   return impl_.erased_key_sentinel();
 }
 
-template <typename Key,
-          typename T,
-          cuda::thread_scope Scope,
-          typename KeyEqual,
-          typename ProbingScheme,
-          typename StorageRef,
-          typename... Operators>
-template <typename... NewOperators>
-__host__ __device__ auto constexpr static_multimap_ref<
-  Key,
-  T,
-  Scope,
-  KeyEqual,
-  ProbingScheme,
-  StorageRef,
-  Operators...>::with_operators(NewOperators...) const noexcept
-{
-  return static_multimap_ref<Key, T, Scope, KeyEqual, ProbingScheme, StorageRef, NewOperators...>{
-    cuco::empty_key<Key>{this->empty_key_sentinel()},
-    cuco::empty_value<T>{this->empty_value_sentinel()},
-    this->key_eq(),
-    this->probing_scheme(),
-    {},
-    impl_.storage_ref()};
-}
-
 template <typename Key,
           typename T,
           cuda::thread_scope Scope,

include/cuco/detail/static_multiset/static_multiset_ref.inl

@@ -244,25 +244,6 @@ static_multiset_ref<Key, Scope, KeyEqual, ProbingScheme, StorageRef, Operators..
   return this->impl_.end();
 }
 
-template <typename Key,
-          cuda::thread_scope Scope,
-          typename KeyEqual,
-          typename ProbingScheme,
-          typename StorageRef,
-          typename... Operators>
-template <typename... NewOperators>
-__host__ __device__ constexpr auto
-static_multiset_ref<Key, Scope, KeyEqual, ProbingScheme, StorageRef, Operators...>::with_operators(
-  NewOperators...) const noexcept
-{
-  return static_multiset_ref<Key, Scope, KeyEqual, ProbingScheme, StorageRef, NewOperators...>{
-    cuco::empty_key<Key>{this->empty_key_sentinel()},
-    this->key_eq(),
-    this->probing_scheme(),
-    {},
-    this->storage_ref()};
-}
-
 template <typename Key,
           cuda::thread_scope Scope,
           typename KeyEqual,

include/cuco/detail/static_set/static_set_ref.inl

@@ -241,25 +241,6 @@ static_set_ref<Key, Scope, KeyEqual, ProbingScheme, StorageRef, Operators...>::e
   return impl_.erased_key_sentinel();
 }
 
-template <typename Key,
-          cuda::thread_scope Scope,
-          typename KeyEqual,
-          typename ProbingScheme,
-          typename StorageRef,
-          typename... Operators>
-template <typename... NewOperators>
-__host__ __device__ constexpr auto
-static_set_ref<Key, Scope, KeyEqual, ProbingScheme, StorageRef, Operators...>::with_operators(
-  NewOperators...) const noexcept
-{
-  return static_set_ref<Key, Scope, KeyEqual, ProbingScheme, StorageRef, NewOperators...>{
-    cuco::empty_key<Key>{this->empty_key_sentinel()},
-    this->key_eq(),
-    this->probing_scheme(),
-    {},
-    this->storage_ref()};
-}
-
 template <typename Key,
           cuda::thread_scope Scope,
           typename KeyEqual,

include/cuco/static_map_ref.cuh

@@ -226,22 +226,6 @@ class static_map_ref
    */
   [[nodiscard]] __host__ __device__ constexpr auto probing_scheme() const noexcept;
 
-  /**
-   * @brief Creates a reference with new operators from the current object
-   *
-   * @warning Using two or more reference objects to the same container but with
-   * a different operator set at the same time results in undefined behavior.
-   *
-   * @tparam NewOperators List of `cuco::op::*_tag` types
-   *
-   * @param ops List of operators, e.g., `cuco::insert`
-   *
-   * @return `*this` with `NewOperators...`
-   */
-  template <typename... NewOperators>
-  [[nodiscard]] __host__ __device__ constexpr auto with_operators(
-    NewOperators... ops) const noexcept;
-
   /**
    * @brief Creates a copy of the current non-owning reference using the given operators
    *

include/cuco/static_multimap_ref.cuh

@@ -225,22 +225,6 @@ class static_multimap_ref
    */
   [[nodiscard]] __host__ __device__ constexpr auto probing_scheme() const noexcept;
 
-  /**
-   * @brief Creates a reference with new operators from the current object
-   *
-   * @warning Using two or more reference objects to the same container but with
-   * a different operator set at the same time results in undefined behavior.
-   *
-   * @tparam NewOperators List of `cuco::op::*_tag` types
-   *
-   * @param ops List of operators, e.g., `cuco::insert`
-   *
-   * @return `*this` with `NewOperators...`
-   */
-  template <typename... NewOperators>
-  [[nodiscard]] __host__ __device__ constexpr auto with_operators(
-    NewOperators... ops) const noexcept;
-
   /**
    * @brief Creates a copy of the current non-owning reference using the given operators
    *

include/cuco/static_multiset_ref.cuh

@@ -205,22 +205,6 @@ class static_multiset_ref
    */
   [[nodiscard]] __host__ __device__ constexpr auto probing_scheme() const noexcept;
 
-  /**
-   * @brief Creates a reference with new operators from the current object
-   *
-   * @warning Using two or more reference objects to the same container but with
-   * a different operator set at the same time results in undefined behavior.
-   *
-   * @tparam NewOperators List of `cuco::op::*_tag` types
-   *
-   * @param ops List of operators, e.g., `cuco::insert`
-   *
-   * @return `*this` with `NewOperators...`
-   */
-  template <typename... NewOperators>
-  [[nodiscard]] __host__ __device__ constexpr auto with_operators(
-    NewOperators... ops) const noexcept;
-
   /**
    * @brief Creates a copy of the current non-owning reference using the given operators
    *

include/cuco/static_set_ref.cuh

@@ -203,22 +203,6 @@ class static_set_ref
    */
   [[nodiscard]] __host__ __device__ constexpr auto probing_scheme() const noexcept;
 
-  /**
-   * @brief Creates a reference with new operators from the current object
-   *
-   * @warning Using two or more reference objects to the same container but with
-   * a different operator set at the same time results in undefined behavior.
-   *
-   * @tparam NewOperators List of `cuco::op::*_tag` types
-   *
-   * @param ops List of operators, e.g., `cuco::insert`
-   *
-   * @return `*this` with `NewOperators...`
-   */
-  template <typename... NewOperators>
-  [[nodiscard]] __host__ __device__ constexpr auto with_operators(
-    NewOperators... ops) const noexcept;
-
   /**
    * @brief Creates a copy of the current non-owning reference using the given operators
    *

tests/static_map/shared_memory_test.cu

@@ -46,7 +46,7 @@ __global__ void shared_memory_test_kernel(Ref* maps,
 
   auto g          = cuco::test::cg::this_thread_block();
   auto insert_ref = maps[map_id].make_copy(g, sm_buffer, cuco::thread_scope_block);
-  auto find_ref   = insert_ref.with_operators(cuco::op::find);
+  auto find_ref   = insert_ref.rebind_operators(cuco::op::find);
 
   for (int i = g.thread_rank(); i < number_of_elements; i += g.size()) {
     auto found_pair_it = find_ref.find(insterted_keys[offset + i]);
@@ -196,11 +196,11 @@ __global__ void shared_memory_hash_table_kernel(bool* key_found)
   auto const rank  = block.thread_rank();
 
   // insert {thread_rank, thread_rank} for each thread in thread-block
-  auto insert_ref = raw_ref.with_operators(cuco::op::insert);
+  auto insert_ref = raw_ref.rebind_operators(cuco::op::insert);
   insert_ref.insert(slot_type{rank, rank});
   block.sync();
 
-  auto find_ref             = insert_ref.with_operators(cuco::op::find);
+  auto find_ref             = insert_ref.rebind_operators(cuco::op::find);
   auto const retrieved_pair = find_ref.find(rank);
   block.sync();
 

tests/static_set/shared_memory_test.cu

@@ -45,7 +45,7 @@ __global__ void shared_memory_test_kernel(Ref* sets,
 
   auto g          = cuco::test::cg::this_thread_block();
   auto insert_ref = sets[set_id].make_copy(g, sm_buffer, cuco::thread_scope_block);
-  auto find_ref   = insert_ref.with_operators(cuco::op::find);
+  auto find_ref   = insert_ref.rebind_operators(cuco::op::find);
 
   for (int i = g.thread_rank(); i < number_of_elements; i += g.size()) {
     auto found_it = find_ref.find(insterted_keys[offset + i]);
@@ -176,11 +176,11 @@ __global__ void shared_memory_hash_set_kernel(bool* key_found)
   auto const rank  = block.thread_rank();
 
   // insert {thread_rank, thread_rank} for each thread in thread-block
-  auto insert_ref = raw_ref.with_operators(cuco::op::insert);
+  auto insert_ref = raw_ref.rebind_operators(cuco::op::insert);
   insert_ref.insert(rank);
   block.sync();
 
-  auto find_ref           = insert_ref.with_operators(cuco::op::find);
+  auto find_ref           = insert_ref.rebind_operators(cuco::op::find);
   auto const retrieved_it = find_ref.find(rank);
   block.sync();