Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into for_each
Browse files Browse the repository at this point in the history
  • Loading branch information
PointKernel committed Aug 12, 2024
2 parents 680f6e3 + 99282c0 commit d6bdb6d
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.8-gcc11/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda12.5-gcc12/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda12.5-gcc13/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ci/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions include/cuco/detail/open_addressing/open_addressing_ref_impl.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
*
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1077,7 +1077,7 @@ class open_addressing_ref_impl {
*
* @tparam ProbeKey Probe key type
* @tparam CallbackOp Type of unary callback function object
* @tparam SyncOp Functor or device lambda which accepts the current `group` object
* @tparam SyncOp Type of function object which accepts the current `group` object
*
* @param group The Cooperative Group used to perform this operation
* @param key The key to search for
Expand Down
8 changes: 4 additions & 4 deletions include/cuco/detail/static_map/static_map_ref.inl
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand All @@ -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
Expand Down Expand Up @@ -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
*
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/cuco/detail/static_multimap/static_multimap_ref.inl
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions include/cuco/detail/static_multiset/static_multiset_ref.inl
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand All @@ -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
Expand Down Expand Up @@ -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
*
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
*
Expand Down Expand Up @@ -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
*
Expand Down
8 changes: 4 additions & 4 deletions include/cuco/detail/static_set/static_set_ref.inl
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ class operator_impl<op::contains_tag,
* @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
*
Expand All @@ -548,7 +548,7 @@ class operator_impl<op::contains_tag,
* @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
Expand Down Expand Up @@ -589,7 +589,7 @@ class operator_impl<op::find_tag,
* @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
*
Expand All @@ -609,7 +609,7 @@ class operator_impl<op::find_tag,
* @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
Expand Down

0 comments on commit d6bdb6d

Please sign in to comment.