Remove empty key sentinel

NVIDIA · Oct 4, 2023 · dc71ba0 · dc71ba0
1 parent 5917786
commit dc71ba0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 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
@@ -21,7 +21,6 @@
 #include <cuco/extent.cuh>
 #include <cuco/pair.cuh>
 #include <cuco/probing_scheme.cuh>
-#include <cuco/sentinel.cuh>
 
 #include <thrust/distance.h>
 #include <thrust/pair.h>
@@ -120,20 +119,18 @@ class open_addressing_ref_impl {
   /**
    * @brief Constructs open_addressing_ref_impl.
    *
-   * @param empty_key_sentinel The reserved key value for empty slots
    * @param empty_slot_sentinel Sentinel indicating an empty slot
    * @param predicate Key equality binary callable
    * @param probing_scheme Probing scheme
    * @param storage_ref Non-owning ref of slot storage
    */
   __host__ __device__ explicit constexpr open_addressing_ref_impl(
-    cuco::empty_key<key_type> empty_key_sentinel,
     value_type empty_slot_sentinel,
     key_equal const& predicate,
     probing_scheme_type const& probing_scheme,
     storage_ref_type storage_ref) noexcept
     : empty_slot_sentinel_{empty_slot_sentinel},
-      predicate_{empty_key_sentinel, predicate},
+      predicate_{this->extract_key(empty_slot_sentinel), predicate},
       probing_scheme_{probing_scheme},
       storage_ref_{storage_ref}
   {

diff --git a/include/cuco/detail/static_map/static_map_ref.inl b/include/cuco/detail/static_map/static_map_ref.inl
@@ -44,8 +44,7 @@ __host__ __device__ constexpr static_map_ref<
                                 KeyEqual const& predicate,
                                 ProbingScheme const& probing_scheme,
                                 StorageRef storage_ref) noexcept
-  : impl_{empty_key_sentinel,
-          cuco::pair{empty_key_sentinel, empty_value_sentinel},
+  : impl_{cuco::pair{empty_key_sentinel, empty_value_sentinel},
           predicate,
           probing_scheme,
           storage_ref},

diff --git a/include/cuco/detail/static_set/static_set_ref.inl b/include/cuco/detail/static_set/static_set_ref.inl
@@ -41,7 +41,7 @@ __host__ __device__ constexpr static_set_ref<
                                 KeyEqual const& predicate,
                                 ProbingScheme const& probing_scheme,
                                 StorageRef storage_ref) noexcept
-  : impl_{empty_key_sentinel, empty_key_sentinel, predicate, probing_scheme, storage_ref}
+  : impl_{empty_key_sentinel, predicate, probing_scheme, storage_ref}
 {
 }