Skip to content

Use raft::util::popc(...) public API #249

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
rapids-bot merged 4 commits into from
Jul 26, 2024
Merged

Use raft::util::popc(...) public API #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c636914
popc public api
divyegala Jul 24, 2024
182952e
account for future changes
divyegala Jul 24, 2024
cc05eab
remove todos
divyegala Jul 25, 2024
8404782
namespace
divyegala Jul 25, 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
9 changes: 5 additions & 4 deletions cpp/src/neighbors/detail/knn_brute_force.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "./knn_utils.cuh"

#include <raft/core/bitmap.cuh>
#include <raft/core/detail/popc.cuh>
#include <raft/core/device_csr_matrix.hpp>
#include <raft/core/host_mdspan.hpp>
#include <raft/core/resource/cuda_stream.hpp>
#include <raft/core/resource/cuda_stream_pool.hpp>
#include <raft/core/resource/device_memory_resource.hpp>
Expand All @@ -46,6 +46,7 @@
#include <raft/sparse/matrix/select_k.cuh>
#include <raft/util/cuda_utils.cuh>
#include <raft/util/cudart_utils.hpp>
#include <raft/util/popc.cuh>

#include <rmm/cuda_device.hpp>
#include <rmm/device_uvector.hpp>
Expand Down Expand Up @@ -591,10 +592,10 @@ void brute_force_search_filtered(
auto nnz_view = raft::make_device_scalar_view<IdxT>(nnz.data());
auto filter_view =
raft::make_device_vector_view<const BitmapT, IdxT>(filter.data(), filter.n_elements());
IdxT size_h = n_queries * n_dataset;
auto size_view = raft::make_host_scalar_view<IdxT>(&size_h);

// TODO(rhdong): Need to switch to the public API,
// with the issue: https://github.com/rapidsai/cuvs/issues/158
raft::detail::popc(res, filter_view, n_queries * n_dataset, nnz_view);
raft::popc(res, filter_view, size_view, nnz_view);
raft::copy(&nnz_h, nnz.data(), 1, stream);

raft::resource::sync_stream(res, stream);
Expand Down
9 changes: 5 additions & 4 deletions cpp/test/neighbors/brute_force_prefiltered.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@
#include <cuvs/distance/distance.hpp>
#include <cuvs/neighbors/brute_force.hpp>

#include <raft/core/detail/popc.cuh>
#include <raft/core/host_mdspan.hpp>
#include <raft/matrix/copy.cuh>
#include <raft/random/make_blobs.cuh>
#include <raft/random/rmat_rectangular_generator.cuh>
#include <raft/random/rng.cuh>
#include <raft/random/rng_state.hpp>
#include <raft/util/popc.cuh>

#include <gtest/gtest.h>

Expand Down Expand Up @@ -192,12 +193,12 @@ class PrefilteredBruteForceTest
auto nnz_view = raft::make_device_scalar_view<index_t>(nnz.data());
auto filter_view =
raft::make_device_vector_view<const uint32_t, index_t>(filter_d.data(), filter_d.size());
index_t size_h = m * n;
auto size_view = raft::make_host_scalar_view<index_t>(&size_h);

set_bitmap(src, dst, bitmap, n_edges, n, stream);

// TODO(rhdong): Need to switch to the public API,
// with the issue: https://github.com/rapidsai/cuvs/issues/158
raft::detail::popc(handle, filter_view, m * n, nnz_view);
raft::popc(handle, filter_view, size_view, nnz_view);
raft::copy(&nnz_h, nnz.data(), 1, stream);

raft::resource::sync_stream(handle, stream);
Expand Down