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 for function exposing KNN merge #1418

Merged
merged 6 commits into from
Jun 26, 2023
Merged

Fix for function exposing KNN merge #1418

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd6dacb
Fix for function exposing KNN merge
viclafargue Apr 14, 2023
7666009
Merge branch 'branch-23.06' into fix-knn-merge
viclafargue May 10, 2023
6391d33
Merge branch 'branch-23.06' into fix-knn-merge
cjnolet May 15, 2023
568f432
adressing review
viclafargue May 22, 2023
e96d49b
Merge branch 'branch-23.08' into fix-knn-merge
viclafargue Jun 23, 2023
2f81cc4
Merge branch 'branch-23.08' into fix-knn-merge
cjnolet Jun 23, 2023
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
12 changes: 8 additions & 4 deletions cpp/include/raft/neighbors/brute_force-inl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,14 @@ inline void knn_merge_parts(
RAFT_EXPECTS(in_keys.extent(1) == in_values.extent(1) && in_keys.extent(0) == in_values.extent(0),
"in_keys and in_values must have the same shape.");
RAFT_EXPECTS(
out_keys.extent(0) == out_values.extent(0) == n_samples,
out_keys.extent(0) == out_values.extent(0) && out_keys.extent(0) == n_samples,
"Number of rows in output keys and val matrices must equal number of rows in search matrix.");
RAFT_EXPECTS(out_keys.extent(1) == out_values.extent(1) == in_keys.extent(1),
"Number of columns in output indices and distances matrices must be equal to k");
RAFT_EXPECTS(
out_keys.extent(1) == out_values.extent(1) && out_keys.extent(1) == in_keys.extent(1),
"Number of columns in output indices and distances matrices must be equal to k");

idx_t* translations_ptr = nullptr;
if (translations.has_value()) { translations_ptr = translations.value().data_handle(); }

auto n_parts = in_keys.extent(0) / n_samples;
detail::knn_merge_parts(in_keys.data_handle(),
Expand All @@ -103,7 +107,7 @@ inline void knn_merge_parts(
n_parts,
in_keys.extent(1),
handle.get_stream(),
translations.value_or(nullptr));
translations_ptr);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/neighbors/brute_force.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@

#ifdef RAFT_COMPILED
#include "brute_force-ext.cuh"
#endif
#endif
28 changes: 14 additions & 14 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 @@ -30,10 +30,10 @@ template <typename value_idx = std::int64_t,
int warp_q,
int thread_q,
int tpb>
__global__ void knn_merge_parts_kernel(value_t* inK,
value_idx* inV,
value_t* outK,
value_idx* outV,
__global__ void knn_merge_parts_kernel(const value_t* const inK,
const value_idx* const inV,
value_t* const outK,
value_idx* const outV,
size_t n_samples,
int n_parts,
value_t initK,
Expand Down Expand Up @@ -65,8 +65,8 @@ __global__ void knn_merge_parts_kernel(value_t* inK,

int col = i % k;

value_t* inKStart = inK + (row_idx + col);
value_idx* inVStart = inV + (row_idx + col);
const value_t* inKStart = inK + (row_idx + col);
const value_idx* inVStart = inV + (row_idx + col);

int limit = Pow2<WarpSize>::roundDown(total_k);
value_idx translation = 0;
Expand Down Expand Up @@ -99,10 +99,10 @@ __global__ void knn_merge_parts_kernel(value_t* inK,
}

template <typename value_idx = std::int64_t, typename value_t = float, int warp_q, int thread_q>
inline void knn_merge_parts_impl(value_t* inK,
value_idx* inV,
value_t* outK,
value_idx* outV,
inline void knn_merge_parts_impl(const value_t* const inK,
const value_idx* const inV,
value_t* const outK,
value_idx* const outV,
size_t n_samples,
int n_parts,
int k,
Expand Down Expand Up @@ -137,10 +137,10 @@ inline void knn_merge_parts_impl(value_t* inK,
* @param translations mapping of index offsets for each partition
*/
template <typename value_idx = std::int64_t, typename value_t = float>
inline void knn_merge_parts(value_t* inK,
value_idx* inV,
value_t* outK,
value_idx* outV,
inline void knn_merge_parts(const value_t* const inK,
const value_idx* const inV,
value_t* const outK,
value_idx* const outV,
size_t n_samples,
int n_parts,
int k,
Expand Down
8 changes: 4 additions & 4 deletions cpp/include/raft/spatial/knn/knn.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ namespace raft::spatial::knn {
* @param translations
*/
template <typename idx_t = int64_t, typename value_t = float>
inline void knn_merge_parts(value_t* in_keys,
idx_t* in_values,
value_t* out_keys,
idx_t* out_values,
inline void knn_merge_parts(const value_t* const in_keys,
viclafargue marked this conversation as resolved.
Show resolved Hide resolved
const idx_t* const in_values,
value_t* const out_keys,
idx_t* const out_values,
size_t n_samples,
int n_parts,
int k,
Expand Down