Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into add-erase
Browse files Browse the repository at this point in the history
  • Loading branch information
PointKernel committed Sep 5, 2023
2 parents b7cb0a2 + 9b4ebaf commit bfab391
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions include/cuco/detail/open_addressing_impl.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ class open_addressing_impl {
}

/**
* @brief Asynchonously inserts all keys in the range `[first, last)`.
* @brief Asynchronously inserts all keys in the range `[first, last)`.
*
* @tparam InputIt Device accessible random access input iterator where
* <tt>std::is_convertible<std::iterator_traits<InputIt>::value_type,
Expand Down Expand Up @@ -281,7 +281,7 @@ class open_addressing_impl {
}

/**
* @brief Asynchonously inserts keys in the range `[first, last)` if `pred` of the corresponding
* @brief Asynchronously inserts keys in the range `[first, last)` if `pred` of the corresponding
* stencil returns true.
*
* @note The key `*(first + i)` is inserted if `pred( *(stencil + i) )` returns true.
Expand Down Expand Up @@ -362,7 +362,7 @@ class open_addressing_impl {
}

/**
* @brief Asynchonously indicates whether the keys in the range `[first, last)` are contained in
* @brief Asynchronously indicates whether the keys in the range `[first, last)` are contained in
* the container.
*
* @tparam InputIt Device accessible input iterator
Expand Down Expand Up @@ -396,7 +396,7 @@ class open_addressing_impl {
}

/**
* @brief Asynchonously indicates whether the keys in the range `[first, last)` are contained in
* @brief Asynchronously indicates whether the keys in the range `[first, last)` are contained in
* the container if `pred` of the corresponding stencil returns true.
*
* @note If `pred( *(stencil + i) )` is true, stores `true` or `false` to `(output_begin + i)`
Expand Down
16 changes: 8 additions & 8 deletions include/cuco/static_map.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ namespace experimental {
* construction.
*
* @note Allows constant time concurrent modify or lookup operations from threads in device code.
* @note cuCollections data stuctures always place the slot keys on the left-hand side when invoking
* the key comparison predicate, i.e., `pred(slot_key, query_key)`. Order-sensitive `KeyEqual`
* should be used with caution.
* @note cuCollections data structures always place the slot keys on the left-hand side when
* invoking the key comparison predicate, i.e., `pred(slot_key, query_key)`. Order-sensitive
* `KeyEqual` should be used with caution.
* @note `ProbingScheme::cg_size` indicates how many threads are used to handle one independent
* device operation. `cg_size == 1` uses the scalar (or non-CG) code paths.
*
Expand Down Expand Up @@ -221,7 +221,7 @@ class static_map {
size_type insert(InputIt first, InputIt last, cuda_stream_ref stream = {});

/**
* @brief Asynchonously inserts all keys in the range `[first, last)`.
* @brief Asynchronously inserts all keys in the range `[first, last)`.
*
* @tparam InputIt Device accessible random access input iterator where
* <tt>std::is_convertible<std::iterator_traits<InputIt>::value_type,
Expand Down Expand Up @@ -263,7 +263,7 @@ class static_map {
InputIt first, InputIt last, StencilIt stencil, Predicate pred, cuda_stream_ref stream = {});

/**
* @brief Asynchonously inserts keys in the range `[first, last)` if `pred` of the corresponding
* @brief Asynchronously inserts keys in the range `[first, last)` if `pred` of the corresponding
* stencil returns true.
*
* @note The key `*(first + i)` is inserted if `pred( *(stencil + i) )` returns true.
Expand Down Expand Up @@ -404,7 +404,7 @@ class static_map {
cuda_stream_ref stream = {}) const;

/**
* @brief Asynchonously indicates whether the keys in the range `[first, last)` are contained in
* @brief Asynchronously indicates whether the keys in the range `[first, last)` are contained in
* the map.
*
* @tparam InputIt Device accessible input iterator
Expand Down Expand Up @@ -455,7 +455,7 @@ class static_map {
cuda_stream_ref stream = {}) const;

/**
* @brief Asynchonously indicates whether the keys in the range `[first, last)` are contained in
* @brief Asynchronously indicates whether the keys in the range `[first, last)` are contained in
* the map if `pred` of the corresponding stencil returns true.
*
* @note If `pred( *(stencil + i) )` is true, stores `true` or `false` to `(output_begin + i)`
Expand Down Expand Up @@ -506,7 +506,7 @@ class static_map {
void find(InputIt first, InputIt last, OutputIt output_begin, cuda_stream_ref stream = {}) const;

/**
* @brief For all keys in the range `[first, last)`, asynchonously finds a payload with its key
* @brief For all keys in the range `[first, last)`, asynchronously finds a payload with its key
* equivalent to the query key.
*
* @note If the key `*(first + i)` has a matched `element` in the map, copies the payload of
Expand Down
2 changes: 1 addition & 1 deletion include/cuco/static_map_ref.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace experimental {
*
* @note Concurrent modify and lookup will be supported if both kinds of operators are specified
* during the ref construction.
* @note cuCollections data stuctures always place the slot keys on the left-hand
* @note cuCollections data structures always place the slot keys on the left-hand
* side when invoking the key comparison predicate.
* @note Ref types are trivially-copyable and are intended to be passed by value.
* @note `ProbingScheme::cg_size` indicates how many threads are used to handle one independent
Expand Down
16 changes: 8 additions & 8 deletions include/cuco/static_set.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ namespace experimental {
* construction.
*
* @note Allows constant time concurrent modify or lookup operations from threads in device code.
* @note cuCollections data stuctures always place the slot keys on the left-hand side when invoking
* the key comparison predicate, i.e., `pred(slot_key, query_key)`. Order-sensitive `KeyEqual`
* should be used with caution.
* @note cuCollections data structures always place the slot keys on the left-hand side when
* invoking the key comparison predicate, i.e., `pred(slot_key, query_key)`. Order-sensitive
* `KeyEqual` should be used with caution.
* @note `ProbingScheme::cg_size` indicates how many threads are used to handle one independent
* device operation. `cg_size == 1` uses the scalar (or non-CG) code paths.
*
Expand Down Expand Up @@ -194,7 +194,7 @@ class static_set {
size_type insert(InputIt first, InputIt last, cuda_stream_ref stream = {});

/**
* @brief Asynchonously inserts all keys in the range `[first, last)`.
* @brief Asynchronously inserts all keys in the range `[first, last)`.
*
* @tparam InputIt Device accessible random access input iterator where
* <tt>std::is_convertible<std::iterator_traits<InputIt>::value_type,
Expand Down Expand Up @@ -236,7 +236,7 @@ class static_set {
InputIt first, InputIt last, StencilIt stencil, Predicate pred, cuda_stream_ref stream = {});

/**
* @brief Asynchonously inserts keys in the range `[first, last)` if `pred` of the corresponding
* @brief Asynchronously inserts keys in the range `[first, last)` if `pred` of the corresponding
* stencil returns true.
*
* @note The key `*(first + i)` is inserted if `pred( *(stencil + i) )` returns true.
Expand Down Expand Up @@ -337,7 +337,7 @@ class static_set {
cuda_stream_ref stream = {}) const;

/**
* @brief Asynchonously indicates whether the keys in the range `[first, last)` are contained in
* @brief Asynchronously indicates whether the keys in the range `[first, last)` are contained in
* the set.
*
* @tparam InputIt Device accessible input iterator
Expand Down Expand Up @@ -388,7 +388,7 @@ class static_set {
cuda_stream_ref stream = {}) const;

/**
* @brief Asynchonously indicates whether the keys in the range `[first, last)` are contained in
* @brief Asynchronously indicates whether the keys in the range `[first, last)` are contained in
* the set if `pred` of the corresponding stencil returns true.
*
* @note If `pred( *(stencil + i) )` is true, stores `true` or `false` to `(output_begin + i)`
Expand Down Expand Up @@ -438,7 +438,7 @@ class static_set {
void find(InputIt first, InputIt last, OutputIt output_begin, cuda_stream_ref stream = {}) const;

/**
* @brief For all keys in the range `[first, last)`, asynchonously finds an element with key
* @brief For all keys in the range `[first, last)`, asynchronously finds an element with key
* equivalent to the query key.
*
* @note If the key `*(first + i)` has a matched `element` in the set, copies `element` to
Expand Down
2 changes: 1 addition & 1 deletion include/cuco/static_set_ref.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace experimental {
*
* @note Concurrent modify and lookup will be supported if both kinds of operators are specified
* during the ref construction.
* @note cuCollections data stuctures always place the slot keys on the left-hand
* @note cuCollections data structures always place the slot keys on the left-hand
* side when invoking the key comparison predicate.
* @note Ref types are trivially-copyable and are intended to be passed by value.
* @note `ProbingScheme::cg_size` indicates how many threads are used to handle one independent
Expand Down

0 comments on commit bfab391

Please sign in to comment.