Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into fix-cagra-graph-optimization-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
enp1s0 authored Jan 16, 2025
2 parents 263286b + b9f71fe commit 534cbad
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cpp/src/neighbors/detail/dynamic_batching.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ enum struct slot_state : int32_t {
struct batch_token {
uint64_t value = 0;

constexpr inline batch_token() {}
explicit constexpr inline batch_token(uint32_t buffer_id) { id() = buffer_id; }
constexpr inline batch_token() = default;
RAFT_INLINE_FUNCTION explicit batch_token(uint32_t buffer_id) { id() = buffer_id; }

/**
* Sequential id of the batch in the array of batches.
Expand Down Expand Up @@ -492,7 +492,7 @@ struct batch_queue_t {
* NB: "round" is the number of times the queue counters went over the whole ring buffer.
* It's used to avoid the ABA problem for atomic token updates.
*/
static constexpr inline auto make_empty_token(seq_order_id seq_id) noexcept -> batch_token
static inline auto make_empty_token(seq_order_id seq_id) noexcept -> batch_token
{
// Modify the seq_id to identify that the token slot is empty
auto empty_round = static_cast<uint32_t>(slot_state::kEmptyPast) * kSize;
Expand Down

0 comments on commit 534cbad

Please sign in to comment.