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

Fix ANN bench ground truth generation for k>1024 #2180

Merged
merged 5 commits into from
Mar 19, 2024
Merged

Fix ANN bench ground truth generation for k>1024 #2180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbfa7dd
Fix ANN bench ground truth generation for k>1024
tfeher Feb 13, 2024
4854609
Fix style
tfeher Feb 13, 2024
e4be8d4
Merge branch 'branch-24.04' into knn1024
tfeher Feb 15, 2024
04269c7
Merge branch 'branch-24.04' into knn1024
tfeher Mar 4, 2024
c246765
Merge branch 'branch-24.04' into knn1024
tfeher Mar 17, 2024
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
3 changes: 3 additions & 0 deletions cpp/include/raft/neighbors/detail/knn_merge_parts.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#pragma once

#include <raft/core/error.hpp>
#include <raft/neighbors/detail/faiss_select/DistanceUtils.h>
#include <raft/neighbors/detail/faiss_select/Select.cuh>
#include <raft/util/cuda_utils.cuh>
Expand Down Expand Up @@ -168,5 +169,7 @@ inline void knn_merge_parts(const value_t* inK,
else if (k <= 1024)
knn_merge_parts_impl<value_idx, value_t, 1024, 8>(
inK, inV, outK, outV, n_samples, n_parts, k, stream, translations);
else
THROW("Unimplemented for k=%d, knn_merge_parts works for k<=1024", k);
}
} // namespace raft::neighbors::detail
13 changes: 4 additions & 9 deletions python/raft-ann-bench/src/raft-ann-bench/generate_groundtruth/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -62,17 +62,12 @@ def calc_truth(dataset, queries, k, metric="sqeuclidean"):

X = cp.asarray(dataset[i : i + n_batch, :], cp.float32)

D, Ind = knn(
X,
queries,
k,
metric=metric,
handle=handle,
global_id_offset=i, # shift neighbor index by offset i
)
D, Ind = knn(X, queries, k, metric=metric, handle=handle)
handle.sync()

D, Ind = cp.asarray(D), cp.asarray(Ind)
Ind += i # shift neighbor index by offset i

if distances is None:
distances = D
indices = Ind
Expand Down
Loading