Skip to content

Commit 2a8de62

Browse files
committed
Merge branch 'bloom-filter-release' of github.com:sleeepyjack/cuCollections into bloom-filter-release
2 parents b4c4aa5 + c2dc7ab commit 2a8de62

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

include/cuco/bucket_storage.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ class bucket_storage {
252252
struct aligned_deleter {
253253
value_type* raw_ptr_;
254254
std::size_t size_;
255-
allocator_type& allocator_;
255+
allocator_type allocator_;
256256
cuda::stream_ref stream_;
257257

258-
void operator()(value_type*) const { allocator_.deallocate(raw_ptr_, size_, stream_); }
258+
void operator()(value_type*) { allocator_.deallocate(raw_ptr_, size_, stream_); }
259259
};
260260

261261
extent_type extent_; ///< Storage extent

include/cuco/detail/storage/storage_base.cuh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ struct custom_deleter {
3939
* @param allocator Allocator used for deallocating device storage
4040
* @param stream Stream to use for deallocation
4141
*/
42-
explicit constexpr custom_deleter(SizeType size, Allocator& allocator, cuda::stream_ref stream)
42+
explicit constexpr custom_deleter(SizeType size,
43+
Allocator const& allocator,
44+
cuda::stream_ref stream)
4345
: size_{size}, allocator_{allocator}, stream_{stream}
4446
{
4547
}
@@ -52,7 +54,7 @@ struct custom_deleter {
5254
void operator()(pointer ptr) { allocator_.deallocate(ptr, size_, stream_); }
5355

5456
SizeType size_; ///< Number of values to delete
55-
Allocator& allocator_; ///< Allocator used deallocating values
57+
Allocator allocator_; ///< Allocator used deallocating values
5658
cuda::stream_ref stream_; ///< Stream used for deallocation
5759
};
5860

include/cuco/detail/utility/cuda.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ constexpr auto max_occupancy_grid_size(std::int32_t block_size,
7575
return max_active_blocks_per_multiprocessor * num_multiprocessors;
7676
}
7777

78-
inline auto l2_cache_size() {
78+
inline auto l2_cache_size()
79+
{
7980
int device = 0;
8081
CUCO_CUDA_TRY(cudaGetDevice(&device));
8182

0 commit comments

Comments
 (0)