Skip to content

Commit 67d19ec

Browse files
sleeepyjacksleeepyjack
committed
Move to experimental namespace
1 parent 245592e commit 67d19ec

File tree

11 files changed

+31
-27
lines changed

11 files changed

+31
-27
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ We plan to add many GPU-accelerated, concurrent data structures to `cuCollection
263263

264264
### roaring_bitmap
265265

266-
`cuco::roaring_bitmap` implements a Roaring bitmap following the [Roaring bitmap format specification](https://github.com/RoaringBitmap/RoaringFormatSpec).
266+
`cuco::experimental::roaring_bitmap` implements a Roaring bitmap following the [Roaring bitmap format specification](https://github.com/RoaringBitmap/RoaringFormatSpec).
267267

268268
#### Examples:
269-
- [Host-bulk APIs](https://github.com/NVIDIA/cuCollections/blob/dev/examples/roaring_bitmap/host_bulk_example.cu) (see [live example in godbolt](https://godbolt.org/clientstate/eJy9WAtv27YW_ivnqsAgN7aVpI9szmNz43Qz1msPtrtiaAqBkmibsCxqJBXHC_Lf7yGpZ6KsXbc7B4gt8vA7D37n8FB3jqRSMp5IZ_DxzmGRMzjqOjFJVhlZUWfghFlEnK4jeSZC_ew9v07gOVzydC_Yaq3ADTtwfHj8Cia_jkfjIVxOZ79MZ8PFeDrpa1Ej_o6FNJE0giyJqAC1pjBMSYhf-UwXfqVC2wHH_UNwtcC1k89dO51Tg7LnGWzJHhKuIJMUYZiEJYsp0NuQpgpYAiHfpjEjSUhhx9TaqMpxjDnwWw7CA0VQnuCKFJ-WdUkgqjRdf9ZKpQPP2-12fWLM7nOx8mIrLL1348uryfyqh6aXy94nMQYWBP09YwIdD_ZAUrQsJAHaG5MdcAFkJSjOKa4t3wmmWLLqguRLtSOCGpyISSVYkKlG8Ao70f-6AIaPJBi44RzG82sH3gzn43nX4HwYL36avl_Ah-FsNpwsxldzmM5wsyajsd4qfHoLw8lv8PN4MuoCxdChKnqbCu0Fmsp0WGlkYzintGHGkluzZEpDtmQhFASCFb-hIkG3IKViyyzV0MjI4MRsyxRRZuyRc0aVd51cJ89YEsZZROEszELuCU4EIvoBU1uS9sNsffFIJlMsZmrvKUGYkv11ml48RIqIJ1XkhfgvosuLJydZoton1T6lvlXQEFBrkUnlRfQGHfFvaKi46K_bRGK-QkLE7ZNZwjB2ksR1iLqcZr7cS0W3jeVL5AMlzTHGWwY1b5JVY8hqMnq855bIP5gEWyOAH2Txxqe3BKlAMex2OhCMLmFEt7iJGAxFcSul3vo8pZq7heTUKMjNmPNNlhpgGP4yllWxGCc2s3NNsMN84QTTZMfhxXEPgcCCGSIh6Sm8flkbBjflQpk8Q2JuierAUvCttsbgf5xZk94Y6bdGZI7M_eTqPJeY6Cukfxb0sZZ4DdniqVrTwQxPuWQYtX1JaywQ4QaY9V-7WziLfqK8ygTyXc-FXAiMOI7JLEaawoRsabzvapcxkMoILXkc851OIbPhA6OiBx-ts7rI8UyJLJH9gCVm0rVR6nyNQ14Q88B7dXRyQqLvPG1ERBTxWpV1Hpvy79nxyIhi03OmvX5Z2WHp8Q_a8fql16quU5L4BzykKCzqPM7Pgnzrt2SDOZLq4ge90eX7y6k_mn6YvJsOR_5sOpyNJz_6i6v5YjRcDM-nE31IBFhhqSoTxdRGzP40xqzDsoHlKEH-wM90v8DfmMUB57Flo4t2DwY245F2mKrf5Nnia1b5KVFrNP4OcYFkqGtFE6qz2d_QvYRz-PjJ7UDvAmxxGgwa1e2sUAkGADT3jRJ9gGCHgBVTK0cLmPQl2ujfFEu6UJvNsNa-OPbVRacAAvA8uMTShR7-nlFMMmNPceBUdLhDXt4XnKgypYD4xwg4uxqO_nvV30bP9FBPjxVqjAt5QNqcMqafFtLaBbdFDDYY7cNT_DqDo0P90b8Pzs1DLS5g4PppJtd-QHCHN50S-76hBIENaIV2hh2b_X1wsPkzzBfI5M_intRwv_0y3DZMWxifIFhbPF0DGtAVS9xO16qgSeR2CvB7oLFukr6ejK9f_gUytlYEQ8X_BxOxBFVcfKTalr7P0dK493laajFLy1uzvVkc293G5--K56_Y8c_pGjZ1HR3-DV0PRA5vj3O0SrZV5FVD5EmLmU1a9sBQphP3WEP8ibmHt9_mC-AA2N_MDLOlX5oZdxVHsAsPfSIlFcrVHbRWg-dJRBPlLwkKlzW-iz1c_hu2aJA-lsrihfEprMivbXUP7u4L_fpLP-hvTIopqjKZop9tbuZtrBl1Hx5V3VyIy8EAqU7E3urCVHf_o6X6mNscQdHlwkuzIqRCwNkZuvCWoJi5e2k5HNDDD_XoMbMOIxHntue-mKCYofvSjR-psvdRyf6g5VFq0PQIcsSAVY27_W0mH_nYqcIzxA4w1FXHdMtb7LWx9jTPwDJ6BUuq64Pp3VOWJDRqIU2wV3huB9lySYVbWlNTPqPYexuvcGN5rl3PmTjjHkWuoDhFBV4WlR8Sqc7CNRHPL9zCFkF2fsqNjJl3rbq-rmO4Q0jRhuIcOoy5pG7Nkrz05jeK0vG8ty8jYOnbvHdUHUpz_ItNPK1tsu2M6keASzB5JfbGcaTTAY8b_XIB6cWS2h51SkrkTVWjyWrxlIDdL81Sid_21p3fFuqb3SwJuu27qIyw1cBwTEda87am6g3eT3r5_aTmEVnh2vwGYq3X8g-v3laFfLLedCsrium6l8U9SUdPK7KaxZMB1OtMT4sL_ErmvIyDHudL95HSuh25YVgLap2ArnNM7e_uLf_yHG-owQmT6brt2RKNavrlZ2wZ4QXYNPBF3657dn80npXVrN54g6aUHzGBdreuOi3dlFkY6vcvzc-5benbe6IS_ABLWvu1rSjMBfo3XwX4V9HswdREa7-yOQVFbMVGy23FzjUM8lptqxeGicTpmpiR3IQHRbu2oYXE93AIAzjCyWf6IKyUlcdD-82tdb_yqxmywLARKwfDMmDePjZueddO1QLkn2vnC65-nYcLHx1KuXfWnyRiS6Sq03X0u1CsiaJ6t-skN2F4dPwqO8JpaxZOOj2EOw8PDo5OoEdEuD6XW__kEHo9bJkV_lO6EYh6MdkG5m1wzIIaZhiGMQ7e2Be4OKCZtnHuu8U81uPGPFYr5_6T-fsfn-2NIg==))
269+
- [Host-bulk APIs](https://github.com/NVIDIA/cuCollections/blob/dev/examples/roaring_bitmap/host_bulk_example.cu) (see [live example in godbolt](https://godbolt.org/clientstate/eJy9WA1v2zYT_iv3qsAgN7aVpB_ZnI_NjdPNWF97sN0VQ1MIlETbhGVRI6k4XpD__h5JfSbK2nV75wCxRR7vnjs-dzzqzpFUSsYT6Qw-3jkscgZHXScmySojK-oMnDCLiNN1JM9EqJ-959cJPIdLnu4FW60VuGEHjg-PX8Hk1_FoPITL6eyX6Wy4GE8nfS1qxN-xkCaSRpAlERWg1hSGKQnxK5_pwq9UaBxw3D8EVwtcO_nctdM5NVr2PIMt2UPCFWSSohomYcliCvQ2pKkClkDIt2nMSBJS2DG1NqZyPQYO_JYr4YEiKE9wRYpPy7okEFVC15-1UunA83a7XZ8Y2H0uVl5shaX3bnx5NZlf9RB6uex9EmNgQdDfMybQ8WAPJEVkIQkQb0x2wAWQlaA4p7hGvhNMsWTVBcmXakcENXoiJpVgQaYawStwov91AQwfSTBwwzmM59cOvBnOx_Ou0fNhvPhp-n4BH4az2XCyGF_NYTrDzZqMxnqr8OktDCe_wc_jyagLFEOHpuhtKrQXCJXpsNLIxnBOaQPGkltYMqUhW7IQCgLBit9QkaBbkFKxZZZqCDIyemK2ZYooM_bIOWPKu06uk2csCeMsonAWZiH3BCcCNfoBU1uS9sNsffFIJlMsZmrvKUGYkv11ml481BQRT6rIC_FfRJcXT06yRLVPqn1KfWugIaDWIpPKi-gNOuLf0FBx0V-3icR8hYSI2yezhGHsJInrKupymvlyLxXdNpYvkQ-UNMcYbxnUvElWjSFrydjxnlsi_2ASbI0K_CCLNz69JUgFimG304FgdAkjusVNxGAoilsp9dbnKdXcLSSn1oLcjDnfZKlRDMNfxrIqFuPEZnZuCXaYL5xgmuw4vDjuoSKwygyRkPQUXr-sDYObcqFMniExt0R1YCn4VqMx-j_OLKQ3RvqtEZkjcz-5Os8lJvoK6Z8FfawlXkO2eKrWdDDDUy4ZRm1f0hoLRLgBZv3X7hbOop8orzKBfNdzIRcCI45jMouRpjAhWxrvu9plDKQyQksex3ynU8hs-MCY6MFH66wucjxTIktkP2CJmXRtlDpf45AXxDzwXh2dnJDoO0-DiIgiXquxzmMo_x6ORyCKTc-Z9vplhcPS4x_E8fql12quU5L4BzykKCzqPM7Pgnzrt2SDOZLq4ge90eX7y6k_mn6YvJsOR_5sOpyNJz_6i6v5YjRcDM-nE31IBFhhqSoTxdRGzP40xqzDsoHlKEH-wM90v8DfmMUB57Flo4u4BwOb8Ug7TNVv8mzxNav8lKg1gr9DvUAytLWiCdXZ7G_oXsI5fPzkdqB3AbY4DQaN6nZWmASjADT3jRF9gGCHgBVTG0cETPoSMfo3xZIu1GYzrLUvjn110SkUAXgeXGLpQg9_zygmmcFTHDgVHe6Ql_cFJ6pMKVT8YwScXQ1H_73qb6NneqinxwozxoU8IG1OGeinhbR2wW0Rgw1G-_AUv87g6FB_9O-Dc_NQiwsYdf00k2s_ILjDm06p-75hBBUbpZW2M-zY7O-Dg82f6XyBTP6s3pOa3m-_TG-bTlsYnyBYWzxdozSgK5a4na41QZPI7RTK74HGukn6ejK-fvkXyNhaEQwV_x9MxBJUcfGRaVv6PkdL497naanFLC1vzfZmcWx3G5-_K56_Ysc_Z2vYtHV0-DdsPRA5vD3OtVWyrSKvGiJPImY2adkDoEwn7rFW8SdwD2-_zRfAAbC_mRlmS780M-4qjmAXHvpESiqUqztobQbPk4gmyl8SFC5rfBd7uPw3bBGQPpbK4oXxKVDk17a6B3f3hX39pR_0NybFFE2ZTNHPNjfzNtaMug-Pqm4uxOVggFQnYm9tYaq7_9FSfcxtjkrR5cJLsyKkQsDZGbrwlqCYuXtpORzQww_t6DGzDiMR59hzX0xQzNB96caPVNn7qGR_0PIoNdr0CHLEKKsad_vbTD7ysVOFZ4gdYKirjumWt9hrY-1pnoFl9AqWVNcH07unLElo1EKaYK_w3A6y5ZIKt0RTMz6j2Hsbr3BjeW5dz5k44x5FrqA4RQVeFpUfEqnOwjURzy_cAosgOz_lRsbMu9ZcX9cx3CGkaMNwrjqMuaRuDUleevMbRel43tuXEbD0xWpPBdsif0mMCBq3kKpfaY67doe_FPZpbeNtt1Q_FlyCCS2xX44jnSJ4BOkXDkg5ltT2rVPSJG-0Go1Xi_cE7B5q5kr8tjfx_AZRJ0CzTOhW8KICYSuE4Z2OvuZyzdQbvLP08jtLzSOywrX5rcSi1_IPr-PWhHyyBnUrFMV03cvi7qSjpw1Zy-LJAOp1ps_FBX4lc17GQY_zpfvIaB1HDgzrQ6070LWPqf3dveVknvcNMzhhsl-3QluitZoe-hlbRngpNk190cvrPt4fjWdlhas346Ap5UdMIO7WVaelmzILQ_1Opvk5t21-e59UKj_AMtd-lSuKdaH9m69S-Fe12cOqqa39GucUFLFVHJHbKp5bGOT121Y0DBOJ0zUxIzmEB4W8tqGFxPdwCAM4wsln-nCsjJVHRvttrnW_8usassCwESsHwzJg3kg2bn7XTtUW5J9r5wuug52HCx8dVLl31p8kYkukqtN19PtRrJOiet_rJDdheHT8KjvCaQsLJ50eqjsPDw6OTqBHRLg-l1v_5BB6PSysCv8p3RxEvZhsA_OGOGZBTWcYhjEO3tiXujigmbZx7rvFPNboxjxWK-f-

‎benchmarks/roaring_bitmap/contains_bench.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void roaring_bitmap_contains(nvbench::state& state, nvbench::type_list<T>)
5151
file.read(reinterpret_cast<char*>(thrust::raw_pointer_cast(buffer.data())), file_size);
5252
file.close();
5353

54-
cuco::roaring_bitmap<T> roaring_bitmap(thrust::raw_pointer_cast(buffer.data()));
54+
cuco::experimental::roaring_bitmap<T> roaring_bitmap(thrust::raw_pointer_cast(buffer.data()));
5555

5656
thrust::device_vector<T> items(num_items);
5757

‎examples/roaring_bitmap/host_bulk_example.cu‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ bool check(std::string const& bitmap_file_path)
106106
file.close();
107107

108108
// Create roaring bitmap from the file
109-
cuco::roaring_bitmap<KeyType> roaring_bitmap(thrust::raw_pointer_cast(buffer.data()));
109+
cuco::experimental::roaring_bitmap<KeyType> roaring_bitmap(
110+
thrust::raw_pointer_cast(buffer.data()));
110111

111112
// Generate query keys (all should be contained in the bitmap)
112113
auto keys = generate_keys();

‎include/cuco/detail/roaring_bitmap/roaring_bitmap.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <cuda/std/cstddef>
2020
#include <cuda/stream_ref>
2121

22-
namespace cuco {
22+
namespace cuco::experimental {
2323

2424
template <class T, class Allocator>
2525
roaring_bitmap<T, Allocator>::roaring_bitmap(cuda::std::byte const* bitmap,
@@ -85,4 +85,4 @@ typename roaring_bitmap<T, Allocator>::ref_type roaring_bitmap<T, Allocator>::re
8585
{
8686
return ref_type{storage_.ref()};
8787
}
88-
} // namespace cuco
88+
} // namespace cuco::experimental

‎include/cuco/detail/roaring_bitmap/roaring_bitmap_impl.cuh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <cuda/stream_ref>
3030
#include <thrust/iterator/constant_iterator.h>
3131

32-
namespace cuco::detail {
32+
namespace cuco::experimental::detail {
3333

3434
// primary template
3535
template <class T>
@@ -372,4 +372,4 @@ class roaring_bitmap_impl<cuda::std::uint64_t> {
372372
storage_ref_type storage_ref_;
373373
};
374374

375-
} // namespace cuco::detail
375+
} // namespace cuco::experimental::detail

‎include/cuco/detail/roaring_bitmap/roaring_bitmap_ref.inl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <cuda/std/type_traits>
2323
#include <cuda/stream_ref>
2424

25-
namespace cuco {
25+
namespace cuco::experimental {
2626

2727
template <class T>
2828
__host__ __device__ roaring_bitmap_ref<T>::roaring_bitmap_ref(storage_ref_type const& storage_ref)
@@ -87,4 +87,4 @@ __host__ __device__ cuda::std::size_t roaring_bitmap_ref<T>::size_bytes() const
8787
return impl_.size_bytes();
8888
}
8989

90-
} // namespace cuco
90+
} // namespace cuco::experimental

‎include/cuco/detail/roaring_bitmap/roaring_bitmap_storage.cuh‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <utility>
3131
#include <vector>
3232

33-
namespace cuco::detail {
33+
namespace cuco::experimental::detail {
3434

3535
template <class T>
3636
struct roaring_bitmap_storage_ref {
@@ -140,8 +140,8 @@ class roaring_bitmap_storage<cuda::std::uint32_t, Allocator> {
140140
: allocator_{alloc},
141141
metadata_{bitmap},
142142
data_{allocator_.allocate(metadata_.size_bytes),
143-
detail::custom_deleter<cuda::std::size_t, allocator_type>{metadata_.size_bytes,
144-
allocator_}},
143+
cuco::detail::custom_deleter<cuda::std::size_t, allocator_type>{metadata_.size_bytes,
144+
allocator_}},
145145
ref_{data_.get(), metadata_}
146146
{
147147
CUCO_CUDA_TRY(cudaMemcpyAsync(
@@ -153,7 +153,8 @@ class roaring_bitmap_storage<cuda::std::uint32_t, Allocator> {
153153
private:
154154
allocator_type allocator_;
155155
typename ref_type::metadata_type metadata_;
156-
std::unique_ptr<cuda::std::byte, custom_deleter<cuda::std::size_t, allocator_type>> data_;
156+
std::unique_ptr<cuda::std::byte, cuco::detail::custom_deleter<cuda::std::size_t, allocator_type>>
157+
data_;
157158
ref_type ref_;
158159
};
159160

@@ -186,10 +187,10 @@ class roaring_bitmap_storage<cuda::std::uint64_t, Allocator> {
186187
return typename ref_type::metadata_type{bitmap, bucket_metadata};
187188
}(bucket_metadata_)},
188189
data_{allocator_.allocate(metadata_.size_bytes),
189-
detail::custom_deleter<cuda::std::size_t, allocator_type>{metadata_.size_bytes,
190-
allocator_}},
190+
cuco::detail::custom_deleter<cuda::std::size_t, allocator_type>{metadata_.size_bytes,
191+
allocator_}},
191192
buckets_{bucket_allocator_.allocate(metadata_.num_buckets),
192-
detail::custom_deleter<cuda::std::size_t, bucket_allocator_type>{
193+
cuco::detail::custom_deleter<cuda::std::size_t, bucket_allocator_type>{
193194
metadata_.num_buckets, bucket_allocator_}},
194195
ref_{data_.get(), metadata_, buckets_.get()}
195196
{
@@ -217,11 +218,12 @@ class roaring_bitmap_storage<cuda::std::uint64_t, Allocator> {
217218
std::vector<typename ref_type::metadata_type::bucket_metadata> bucket_metadata_;
218219
std::vector<cuda::std::pair<cuda::std::uint32_t, bucket_ref_type>> buckets_h_;
219220
typename ref_type::metadata_type metadata_;
220-
std::unique_ptr<cuda::std::byte, custom_deleter<cuda::std::size_t, allocator_type>> data_;
221+
std::unique_ptr<cuda::std::byte, cuco::detail::custom_deleter<cuda::std::size_t, allocator_type>>
222+
data_;
221223
std::unique_ptr<cuda::std::pair<cuda::std::uint32_t, bucket_ref_type>,
222-
custom_deleter<cuda::std::size_t, bucket_allocator_type>>
224+
cuco::detail::custom_deleter<cuda::std::size_t, bucket_allocator_type>>
223225
buckets_;
224226
ref_type ref_;
225227
};
226228

227-
} // namespace cuco::detail
229+
} // namespace cuco::experimental::detail

‎include/cuco/detail/roaring_bitmap/util.cuh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <nv/target>
2727
#include <vector>
2828

29-
namespace cuco::detail {
29+
namespace cuco::experimental::detail {
3030

3131
template <class T>
3232
__host__ __device__ __forceinline__ T aligned_load(cuda::std::byte const* ptr)
@@ -237,4 +237,4 @@ struct roaring_bitmap_metadata<cuda::std::uint64_t> {
237237
valid = true;
238238
}
239239
};
240-
} // namespace cuco::detail
240+
} // namespace cuco::experimental::detail

‎include/cuco/roaring_bitmap.cuh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <cuda/std/cstddef>
2424
#include <cuda/stream_ref>
2525

26-
namespace cuco {
26+
namespace cuco::experimental {
2727

2828
/**
2929
* @brief GPU-accelerated container that owns a serialized Roaring bitmap.
@@ -157,6 +157,6 @@ class roaring_bitmap {
157157
storage_type storage_; ///< Storage type
158158
};
159159

160-
} // namespace cuco
160+
} // namespace cuco::experimental
161161

162162
#include <cuco/detail/roaring_bitmap/roaring_bitmap.inl>

‎include/cuco/roaring_bitmap_ref.cuh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <cuda/std/cstddef>
2222
#include <cuda/stream_ref>
2323

24-
namespace cuco {
24+
namespace cuco::experimental {
2525

2626
/**
2727
* @brief Non-owning reference to a Roaring bitmap stored in its serialized format.
@@ -145,6 +145,6 @@ class roaring_bitmap_ref {
145145
impl_type impl_;
146146
};
147147

148-
} // namespace cuco
148+
} // namespace cuco::experimental
149149

150150
#include <cuco/detail/roaring_bitmap/roaring_bitmap_ref.inl>

0 commit comments

Comments
 (0)