Skip to content
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

ANN_BENCH: Fix segfault in CAGRA wrapper when moving its graph #733

Merged
merged 3 commits into from
Feb 28, 2025
Merged

ANN_BENCH: Fix segfault in CAGRA wrapper when moving its graph #733

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84475d0
ANN_BENCH: Fix segfault in CAGRA wrapper when moving its graph
achirkin Feb 27, 2025
2a7b310
Use the index_.graph() view instead of graph_ (which is sometimes nul…
achirkin Feb 27, 2025
65882ba
Merge branch 'branch-25.04' into fix-ann-bench-cagra-graph-segfault
achirkin Feb 28, 2025
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
14 changes: 9 additions & 5 deletions cpp/bench/ann/src/cuvs/cuvs_cagra_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,13 +250,17 @@ void cuvs_cagra<T, IdxT>::set_search_param(const search_param_base& param,
RAFT_LOG_DEBUG("moving graph to new memory space: %s", allocator_to_string(graph_mem_).c_str());
// We create a new graph and copy to it from existing graph
auto mr = get_mr(graph_mem_);
*graph_ = raft::make_device_mdarray<IdxT, int64_t>(
handle_, mr, raft::make_extents<int64_t>(index_->graph().extent(0), index_->graph_degree()));

raft::copy(graph_->data_handle(),
index_->graph().data_handle(),
index_->graph().size(),
// Create a new graph, then copy, and __only then__ replace the shared pointer.
auto old_graph =
index_->graph(); // view of graph_ if it exists, of an internal index member otherwise
auto new_graph = raft::make_device_mdarray<IdxT, int64_t>(handle_, mr, old_graph.extents());
raft::copy(new_graph.data_handle(),
old_graph.data_handle(),
old_graph.size(),
raft::resource::get_cuda_stream(handle_));
raft::resource::sync_stream(handle_);
*graph_ = std::move(new_graph);

// NB: update_graph() only stores a view in the index. We need to keep the graph object alive.
index_->update_graph(handle_, make_const_mdspan(graph_->view()));
Expand Down