Minor fixes to avoid compile errors after rebase

NVIDIA · Aug 16, 2023 · 8a4ea8a · 8a4ea8a
1 parent 978c195
commit 8a4ea8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/include/cuco/detail/trie/bit_vector/bit_vector.cuh b/include/cuco/detail/trie/bit_vector/bit_vector.cuh
@@ -86,7 +86,7 @@ union rank_union {
 template <class Extent             = cuco::experimental::extent<std::size_t>,
           cuda::thread_scope Scope = cuda::thread_scope_device,
           class Allocator          = cuco::cuda_allocator<std::byte>,
-          class Storage            = cuco::experimental::aow_storage<1>>
+          class Storage            = cuco::experimental::storage<1>>
 class bit_vector {
  public:
   bit_vector();
@@ -129,8 +129,8 @@ class bit_vector {
   static constexpr auto thread_scope = Scope;  ///< CUDA thread scope
 
   using extent_type =
-    decltype(make_valid_extent<cg_size, window_size>(std::declval<Extent>()));  ///< Extent type
-  using allocator_type = Allocator;                                             ///< Allocator type
+    decltype(make_window_extent<cg_size, window_size>(std::declval<Extent>()));  ///< Extent type
+  using allocator_type = Allocator;                                              ///< Allocator type
   using storage_type =
     detail::storage<Storage, size_type, extent_type, allocator_type>;  ///< Storage type
 

diff --git a/include/cuco/detail/trie/bit_vector/bit_vector.inl b/include/cuco/detail/trie/bit_vector/bit_vector.inl
@@ -148,8 +148,8 @@ void bit_vector<Extent, Scope, Allocator, Storage>::copy_host_array_to_aow(
   storage_type** aow, std::vector<T>& host_array)
 {
   uint64_t num_elements = host_array.size();
-  *aow = new storage_type(make_valid_extent<cg_size, window_size>(extent<size_t>{num_elements + 1}),
-                          allocator_);
+  *aow                  = new storage_type(
+    make_window_extent<cg_size, window_size>(extent<size_t>{num_elements + 1}), allocator_);
 
   if (num_elements > 0) {
     thrust::device_vector<T> device_array = host_array;

diff --git a/include/cuco/trie.cuh b/include/cuco/trie.cuh
@@ -82,11 +82,11 @@ class trie {
   uint64_t n_keys() const { return n_keys_; }
 
   using value_type     = uint64_t;  ///< bit_vector value type
-  using extent_type    = decltype(make_valid_extent<1, 1>(
+  using extent_type    = decltype(make_window_extent<1, 1>(
     std::declval<cuco::experimental::extent<std::size_t>>()));  ///< Extent type
   using allocator_type = cuco::cuda_allocator<std::byte>;          ///< Allocator type
 
-  using storage_type = detail::storage<cuco::experimental::aow_storage<1>,
+  using storage_type = detail::storage<cuco::experimental::storage<1>,
                                        value_type,
                                        extent_type,
                                        allocator_type>;  ///< bit_vector storage type