From 8edf6a37add572be7f52ae924f85d2f4df2327cc Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Fri, 9 Aug 2024 19:11:17 -0500 Subject: [PATCH 1/2] Bump to RAPIDS 24.10 (#575) Updates RAPIDS branches and devcontainers to 24.10. --- .devcontainer/cuda11.8-gcc11/devcontainer.json | 2 +- .devcontainer/cuda12.5-gcc12/devcontainer.json | 2 +- .devcontainer/cuda12.5-gcc13/devcontainer.json | 2 +- .devcontainer/devcontainer.json | 2 +- CMakeLists.txt | 2 +- ci/matrix.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/cuda11.8-gcc11/devcontainer.json b/.devcontainer/cuda11.8-gcc11/devcontainer.json index 332439947..606759c73 100644 --- a/.devcontainer/cuda11.8-gcc11/devcontainer.json +++ b/.devcontainer/cuda11.8-gcc11/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.08-cpp-gcc11-cuda11.8-ubuntu22.04", + "image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda11.8-ubuntu22.04", "hostRequirements": { "gpu": true }, diff --git a/.devcontainer/cuda12.5-gcc12/devcontainer.json b/.devcontainer/cuda12.5-gcc12/devcontainer.json index bf3e725af..3f562f865 100644 --- a/.devcontainer/cuda12.5-gcc12/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc12/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.08-cpp-gcc12-cuda12.5-ubuntu22.04", + "image": "rapidsai/devcontainers:24.10-cpp-gcc12-cuda12.5-ubuntu22.04", "hostRequirements": { "gpu": true }, diff --git a/.devcontainer/cuda12.5-gcc13/devcontainer.json b/.devcontainer/cuda12.5-gcc13/devcontainer.json index f1f303243..01bbe927b 100644 --- a/.devcontainer/cuda12.5-gcc13/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc13/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.08-cpp-gcc13-cuda12.5-ubuntu22.04", + "image": "rapidsai/devcontainers:24.10-cpp-gcc13-cuda12.5-ubuntu22.04", "hostRequirements": { "gpu": true }, diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f1f303243..01bbe927b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.08-cpp-gcc13-cuda12.5-ubuntu22.04", + "image": "rapidsai/devcontainers:24.10-cpp-gcc13-cuda12.5-ubuntu22.04", "hostRequirements": { "gpu": true }, diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b9e97e83..8de18db73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake) - file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.08/RAPIDS.cmake + file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.10/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake) endif() include(${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake) diff --git a/ci/matrix.yml b/ci/matrix.yml index b4dd33ca2..471a4fb0d 100644 --- a/ci/matrix.yml +++ b/ci/matrix.yml @@ -23,7 +23,7 @@ gpus: - 'v100' # The version of the devcontainer images to use from https://hub.docker.com/r/rapidsai/devcontainers -devcontainer_version: '24.08' +devcontainer_version: '24.10' # Each environment below will generate a unique build/test job # See the "compute-matrix" job in the workflow for how this is parsed and used From 99282c0b4326ada5aa8d69a9061397f651a748f7 Mon Sep 17 00:00:00 2001 From: Yunsong Wang Date: Sat, 10 Aug 2024 09:41:53 -0700 Subject: [PATCH 2/2] Fix `ProbeKey` description in the documentation (#574) --- .../open_addressing/open_addressing_ref_impl.cuh | 14 +++++++------- .../cuco/detail/static_map/static_map_ref.inl | 8 ++++---- .../static_multimap/static_multimap_ref.inl | 4 ++-- .../static_multiset/static_multiset_ref.inl | 16 ++++++++-------- .../cuco/detail/static_set/static_set_ref.inl | 8 ++++---- 5 files changed, 25 insertions(+), 25 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 index 5396f318a..0be26e482 100644 --- a/include/cuco/detail/open_addressing/open_addressing_ref_impl.cuh +++ b/include/cuco/detail/open_addressing/open_addressing_ref_impl.cuh @@ -743,7 +743,7 @@ class open_addressing_ref_impl { * @note If the probe key `key` was inserted into the container, returns true. Otherwise, returns * false. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param key The key to search for * @@ -776,7 +776,7 @@ class open_addressing_ref_impl { * @note If the probe key `key` was inserted into the container, returns true. Otherwise, returns * false. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param group The Cooperative Group used to perform group contains * @param key The key to search for @@ -884,7 +884,7 @@ class open_addressing_ref_impl { * @note Returns a un-incrementable input iterator to the element whose key is equivalent to * `key`. If no such element exists, returns `end()`. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param key The key to search for * @@ -922,7 +922,7 @@ class open_addressing_ref_impl { * @note Returns a un-incrementable input iterator to the element whose key is equivalent to * `key`. If no such element exists, returns `end()`. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param group The Cooperative Group used to perform this operation * @param key The key to search for @@ -972,7 +972,7 @@ class open_addressing_ref_impl { * @note Passes an un-incrementable input iterator to the element whose key is equivalent to * `key` to the callback. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * @tparam CallbackOp Unary callback functor or device lambda * * @param key The key to search for @@ -1018,7 +1018,7 @@ class open_addressing_ref_impl { * * @note Synchronizing `group` within `callback_op` is undefined behavior. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * @tparam CallbackOp Unary callback functor or device lambda * * @param group The Cooperative Group used to perform this operation @@ -1078,7 +1078,7 @@ class open_addressing_ref_impl { * synchronization points is capped by `window_size * cg_size`. The functor will be called right * after the current probing window has been traversed. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * @tparam CallbackOp Unary callback functor or device lambda * @tparam SyncOp Functor or device lambda which accepts the current `group` object * diff --git a/include/cuco/detail/static_map/static_map_ref.inl b/include/cuco/detail/static_map/static_map_ref.inl index b38562027..65ed81ebd 100644 --- a/include/cuco/detail/static_map/static_map_ref.inl +++ b/include/cuco/detail/static_map/static_map_ref.inl @@ -1150,7 +1150,7 @@ class operator_impl< * @note If the probe key `key` was inserted into the container, returns * true. Otherwise, returns false. * - * @tparam ProbeKey Input key type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param key The key to search for * @@ -1170,7 +1170,7 @@ class operator_impl< * @note If the probe key `key` was inserted into the container, returns * true. Otherwise, returns false. * - * @tparam ProbeKey Input key type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param group The Cooperative Group used to perform group contains * @param key The key to search for @@ -1213,7 +1213,7 @@ class operator_impl< * @note Returns a un-incrementable input iterator to the element whose key is equivalent to * `key`. If no such element exists, returns `end()`. * - * @tparam ProbeKey Input key type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param key The key to search for * @@ -1233,7 +1233,7 @@ class operator_impl< * @note Returns a un-incrementable input iterator to the element whose key is equivalent to * `key`. If no such element exists, returns `end()`. * - * @tparam ProbeKey Input key type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param group The Cooperative Group used to perform this operation * @param key The key to search for diff --git a/include/cuco/detail/static_multimap/static_multimap_ref.inl b/include/cuco/detail/static_multimap/static_multimap_ref.inl index 01f9171d4..59709ec41 100644 --- a/include/cuco/detail/static_multimap/static_multimap_ref.inl +++ b/include/cuco/detail/static_multimap/static_multimap_ref.inl @@ -431,7 +431,7 @@ class operator_impl< * @note If the probe key `key` was inserted into the container, returns * true. Otherwise, returns false. * - * @tparam ProbeKey Input key type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param key The key to search for * @@ -451,7 +451,7 @@ class operator_impl< * @note If the probe key `key` was inserted into the container, returns * true. Otherwise, returns false. * - * @tparam ProbeKey Input key type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param group The Cooperative Group used to perform group contains * @param key The key to search for diff --git a/include/cuco/detail/static_multiset/static_multiset_ref.inl b/include/cuco/detail/static_multiset/static_multiset_ref.inl index fc1f3db9d..141659985 100644 --- a/include/cuco/detail/static_multiset/static_multiset_ref.inl +++ b/include/cuco/detail/static_multiset/static_multiset_ref.inl @@ -380,7 +380,7 @@ class operator_impl< /** * @brief Indicates whether the probe key `key` was inserted into the container. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param key The key to search for * @@ -396,7 +396,7 @@ class operator_impl< /** * @brief Indicates whether the probe key `key` was inserted into the container. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param group The Cooperative Group used to perform group contains * @param key The key to search for @@ -439,7 +439,7 @@ class operator_impl< * @note Returns a un-incrementable input iterator to the element whose key is equivalent to * `key`. If no such element exists, returns `end()`. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param key The key to search for * @@ -459,7 +459,7 @@ class operator_impl< * @note Returns a un-incrementable input iterator to the element whose key is equivalent to * `key`. If no such element exists, returns `end()`. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * * @param group The Cooperative Group used to perform this operation * @param key The key to search for @@ -498,7 +498,7 @@ class operator_impl< * @note Passes an un-incrementable input iterator to the element whose key is equivalent to * `key` to the callback. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * @tparam CallbackOp Unary callback functor or device lambda * * @param key The key to search for @@ -525,7 +525,7 @@ class operator_impl< * * @note Synchronizing `group` within `callback_op` is undefined behavior. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * @tparam CallbackOp Unary callback functor or device lambda * * @param group The Cooperative Group used to perform this operation @@ -561,7 +561,7 @@ class operator_impl< * synchronization points is capped by `window_size * cg_size`. The functor will be called right * after the current probing window has been traversed. * - * @tparam ProbeKey Input type which is convertible to 'key_type' + * @tparam ProbeKey Probe key type * @tparam CallbackOp Unary callback functor or device lambda * @tparam SyncOp Functor or device lambda which accepts the current `group` object * @@ -606,7 +606,7 @@ class operator_impl< /** * @brief Counts the occurrence of a given key contained in multiset * - * @tparam ProbeKey Input type + * @tparam ProbeKey Probe key type * * @param key The key to count for * diff --git a/include/cuco/detail/static_set/static_set_ref.inl b/include/cuco/detail/static_set/static_set_ref.inl index dc25c2372..d6adf68be 100644 --- a/include/cuco/detail/static_set/static_set_ref.inl +++ b/include/cuco/detail/static_set/static_set_ref.inl @@ -529,7 +529,7 @@ class operator_impl