Skip to content

Forward-merge branch-25.08 into branch-25.10 #1170

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
GPUtester merged 1 commit into from
Jul 23, 2025
Merged

Forward-merge branch-25.08 into branch-25.10 #1170

Show file tree
Hide file tree
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
21 changes: 17 additions & 4 deletions cpp/src/neighbors/detail/nn_descent.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include <optional>
#include <queue>
#include <random>
#include <type_traits>

namespace cuvs::neighbors::nn_descent::detail {

Expand Down Expand Up @@ -566,6 +567,10 @@ __launch_bounds__(BLOCK_SIZE)

__syncthreads();

// if we have a distance epilogue, distances need to be fully calculated instead of postprocessing
// them.
bool can_postprocess_dist = std::is_same_v<DistEpilogue_t, raft::identity_op>;

remove_duplicates(new_neighbors,
list_new_size2.x,
new_neighbors + list_new_size2.x,
Expand Down Expand Up @@ -638,7 +643,7 @@ __launch_bounds__(BLOCK_SIZE)
int col_id = i / SKEWED_MAX_NUM_BI_SAMPLES;

if (row_id < list_new_size && col_id < list_new_size) {
if (metric == cuvs::distance::DistanceType::InnerProduct) {
if (metric == cuvs::distance::DistanceType::InnerProduct && can_postprocess_dist) {
s_distances[i] = -s_distances[i];
} else if (metric == cuvs::distance::DistanceType::CosineExpanded) {
s_distances[i] = 1.0 - s_distances[i];
Expand All @@ -658,6 +663,9 @@ __launch_bounds__(BLOCK_SIZE)
// for fp32 vs fp16 precision differences resulting in negative distances when distance
// should be 0 related issue: https://github.com/rapidsai/cuvs/issues/991
s_distances[i] = s_distances[i] < 0.0f ? 0.0f : s_distances[i];
if (!can_postprocess_dist && metric == cuvs::distance::DistanceType::L2SqrtExpanded) {
s_distances[i] = sqrtf(s_distances[i]);
}
}
s_distances[i] = dist_epilogue(s_distances[i], new_neighbors[row_id], new_neighbors[col_id]);
} else {
Expand Down Expand Up @@ -737,7 +745,7 @@ __launch_bounds__(BLOCK_SIZE)
int row_id = i % SKEWED_MAX_NUM_BI_SAMPLES;
int col_id = i / SKEWED_MAX_NUM_BI_SAMPLES;
if (row_id < list_old_size && col_id < list_new_size) {
if (metric == cuvs::distance::DistanceType::InnerProduct) {
if (metric == cuvs::distance::DistanceType::InnerProduct && can_postprocess_dist) {
s_distances[i] = -s_distances[i];
} else if (metric == cuvs::distance::DistanceType::CosineExpanded) {
s_distances[i] = 1.0 - s_distances[i];
Expand All @@ -757,6 +765,9 @@ __launch_bounds__(BLOCK_SIZE)
// for fp32 vs fp16 precision differences resulting in negative distances when distance
// should be 0 related issue: https://github.com/rapidsai/cuvs/issues/991
s_distances[i] = s_distances[i] < 0.0f ? 0.0f : s_distances[i];
if (!can_postprocess_dist && metric == cuvs::distance::DistanceType::L2SqrtExpanded) {
s_distances[i] = sqrtf(s_distances[i]);
}
}
s_distances[i] = dist_epilogue(s_distances[i], old_neighbors[row_id], new_neighbors[col_id]);
} else {
Expand Down Expand Up @@ -1257,10 +1268,12 @@ void GNND<Data_t, Index_t>::build(Data_t* data,
auto output_dist_view = raft::make_device_matrix_view<DistData_t, int64_t, raft::row_major>(
output_distances, nrow_, build_config_.output_graph_degree);
// distance post-processing
if (build_config_.metric == cuvs::distance::DistanceType::L2SqrtExpanded) {
bool can_postprocess_dist = std::is_same_v<DistEpilogue_t, raft::identity_op>;
if (build_config_.metric == cuvs::distance::DistanceType::L2SqrtExpanded &&
can_postprocess_dist) {
raft::linalg::map(
res, output_dist_view, raft::sqrt_op{}, raft::make_const_mdspan(output_dist_view));
} else if (!cuvs::distance::is_min_close(build_config_.metric)) {
} else if (!cuvs::distance::is_min_close(build_config_.metric) && can_postprocess_dist) {
// revert negated innerproduct
raft::linalg::map(res,
output_dist_view,
Expand Down
13 changes: 7 additions & 6 deletions cpp/tests/neighbors/ann_nn_descent.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,12 +498,13 @@ const std::vector<AnnNNDescentInputs> inputsLargeBatch =
{0.90});

const std::vector<AnnNNDescentInputs> inputsDistEpilogue =
raft::util::itertools::product<AnnNNDescentInputs>({2000, 4000}, // n_rows
{64, 1024}, // dim
{32, 64}, // graph_degree
{cuvs::distance::DistanceType::L2Expanded},
{true}, // data on host
{0.90});
raft::util::itertools::product<AnnNNDescentInputs>(
{2000, 4000}, // n_rows
{64, 1024}, // dim
{32, 64}, // graph_degree
{cuvs::distance::DistanceType::L2Expanded, cuvs::distance::DistanceType::L2SqrtExpanded},
{true}, // data on host
{0.90});

const std::vector<AnnNNDescentBatchInputs> inputsBatch =
raft::util::itertools::product<AnnNNDescentBatchInputs>(
Expand Down