Skip to content

Fix the use of constexpr in the dynamic batching header #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Fix the use of constexpr in the dynamic batching header #582

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cpp/src/neighbors/detail/dynamic_batching.cuh
View file
Open in desktop
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
Loading