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

[REVIEW] Disabling fused l2 knn from bfknn #407

Merged
merged 3 commits into from
Dec 3, 2021
+68 −66
Merged

[REVIEW] Disabling fused l2 knn from bfknn #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7db7563
Disabling fused l2 knn from bfknn
cjnolet Dec 3, 2021
d9abe17
Fixing style
cjnolet Dec 3, 2021
c3b6895
Fixing style
cjnolet Dec 3, 2021
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
120 changes: 60 additions & 60 deletions cpp/include/raft/spatial/knn/detail/knn_brute_force_faiss.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,69 +293,69 @@ void brute_force_knn_impl(

cudaStream_t stream = raft::select_stream(userStream, internalStreams, n_int_streams, i);

// TODO: Enable this once we figure out why it's causing pytest failures in cuml.
if (k <= 64 && rowMajorQuery == rowMajorIndex && rowMajorQuery == true &&
(metric == raft::distance::DistanceType::L2Unexpanded ||
metric == raft::distance::DistanceType::L2SqrtUnexpanded //||
// metric == raft::distance::DistanceType::L2Expanded ||
// metric == raft::distance::DistanceType::L2SqrtExpanded)
)) {
fusedL2Knn(D,
out_i_ptr,
out_d_ptr,
input[i],
search_items,
sizes[i],
n,
k,
rowMajorIndex,
rowMajorQuery,
stream,
metric);
} else {
switch (metric) {
case raft::distance::DistanceType::Haversine:

ASSERT(D == 2,
"Haversine distance requires 2 dimensions "
"(latitude / longitude).");

haversine_knn(out_i_ptr, out_d_ptr, input[i], search_items, sizes[i], n, k, stream);
break;
default:
faiss::MetricType m = build_faiss_metric(metric);

faiss::gpu::StandardGpuResources gpu_res;

gpu_res.noTempMemory();
gpu_res.setDefaultStream(device, stream);

faiss::gpu::GpuDistanceParams args;
args.metric = m;
args.metricArg = metricArg;
args.k = k;
args.dims = D;
args.vectors = input[i];
args.vectorsRowMajor = rowMajorIndex;
args.numVectors = sizes[i];
args.queries = search_items;
args.queriesRowMajor = rowMajorQuery;
args.numQueries = n;
args.outDistances = out_d_ptr;
args.outIndices = out_i_ptr;

/**
* @todo: Until FAISS supports pluggable allocation strategies,
* we will not reap the benefits of the pool allocator for
* avoiding device-wide synchronizations from cudaMalloc/cudaFree
*/
bfKnn(&gpu_res, args);
}
// // TODO: Enable this once we figure out why it's causing pytest failures in cuml.
// if (k <= 64 && rowMajorQuery == rowMajorIndex && rowMajorQuery == true &&
// (metric == raft::distance::DistanceType::L2Unexpanded ||
// metric == raft::distance::DistanceType::L2SqrtUnexpanded //||
// // metric == raft::distance::DistanceType::L2Expanded ||
// // metric == raft::distance::DistanceType::L2SqrtExpanded)
// )) {
// fusedL2Knn(D,
// out_i_ptr,
// out_d_ptr,
// input[i],
// search_items,
// sizes[i],
// n,
// k,
// rowMajorIndex,
// rowMajorQuery,
// stream,
// metric);
// } else {
switch (metric) {
case raft::distance::DistanceType::Haversine:

ASSERT(D == 2,
"Haversine distance requires 2 dimensions "
"(latitude / longitude).");

haversine_knn(out_i_ptr, out_d_ptr, input[i], search_items, sizes[i], n, k, stream);
break;
default:
faiss::MetricType m = build_faiss_metric(metric);

faiss::gpu::StandardGpuResources gpu_res;

gpu_res.noTempMemory();
gpu_res.setDefaultStream(device, stream);

faiss::gpu::GpuDistanceParams args;
args.metric = m;
args.metricArg = metricArg;
args.k = k;
args.dims = D;
args.vectors = input[i];
args.vectorsRowMajor = rowMajorIndex;
args.numVectors = sizes[i];
args.queries = search_items;
args.queriesRowMajor = rowMajorQuery;
args.numQueries = n;
args.outDistances = out_d_ptr;
args.outIndices = out_i_ptr;

/**
* @todo: Until FAISS supports pluggable allocation strategies,
* we will not reap the benefits of the pool allocator for
* avoiding device-wide synchronizations from cudaMalloc/cudaFree
*/
bfKnn(&gpu_res, args);
}

CUDA_CHECK(cudaPeekAtLastError());
}

CUDA_CHECK(cudaPeekAtLastError());
// }

// Sync internal streams if used. We don't need to
// sync the user stream because we'll already have
// fully serial execution.
Expand Down
14 changes: 8 additions & 6 deletions cpp/test/spatial/ball_cover.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ __global__ void count_discrepancies_kernel(value_idx* actual_idx,
if (row < m) {
for (uint32_t i = 0; i < n; i++) {
value_t d = actual[row * n + i] - expected[row * n + i];
bool matches = fabsf(d) <= thres;
if (!matches) {
// printf("row=%d, actual_idx=%ld, actual=%f, expected_id=%ld, expected=%f\n",
// row, actual_idx[row*n+i], actual[row*n+i], expected_idx[row*n+i],
// expected[row*n+i]);
}
bool matches = (fabsf(d) <= thres) || (actual_idx[row * n + i] == expected_idx[row * n + i] &&
actual_idx[row * n + i] == row);
// if (!matches) {
// printf("row=%d, actual_idx=%ld, actual=%f, expected_id=%ld,
// expected=%f\n",
// row, actual_idx[row*n+i], actual[row*n+i], expected_idx[row*n+i],
// expected[row*n+i]);
// }

n_diffs += !matches;
out[row] = n_diffs;
Expand Down