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

Cagra ANN benchmark improvements #1658

Merged
merged 7 commits into from
Jul 21, 2023
Merged

Cagra ANN benchmark improvements #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c707c2
Enable host dataset in cagra ann bench
tfeher Jul 20, 2023
9fc82dd
Fix itopk search param initialization
tfeher Jul 20, 2023
1bf7ef7
improve cagra logging
tfeher Jul 20, 2023
fd12057
Handle more conf parameters for ann cagra bench
tfeher Jul 20, 2023
f440854
Improve log messages for cagra build
tfeher Jul 20, 2023
f9cf1ae
Remove debug logging from CAGRA bench
tfeher Jul 20, 2023
e9ee5bb
Merge branch 'branch-23.08' into cagra_ann_benchmark_fixes
tfeher Jul 20, 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
7 changes: 6 additions & 1 deletion cpp/bench/ann/src/raft/raft_benchmark.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,18 @@ void parse_build_param(const nlohmann::json& conf,
param.graph_degree = conf.at("index_dim");
param.intermediate_graph_degree = param.graph_degree * 2;
}
if (conf.contains("intermediate_graph_degree")) {
param.intermediate_graph_degree = conf.at("intermediate_graph_degree");
}
}

template <typename T, typename IdxT>
void parse_search_param(const nlohmann::json& conf,
typename raft::bench::ann::RaftCagra<T, IdxT>::SearchParam& param)
{
param.itopk_size = conf.at("itopk");
if (conf.contains("itopk")) { param.p.itopk_size = conf.at("itopk"); }
if (conf.contains("search_width")) { param.p.num_parents = conf.at("search_width"); }
if (conf.contains("max_iterations")) { param.p.max_iterations = conf.at("max_iterations"); }
}
#endif

Expand Down
23 changes: 15 additions & 8 deletions cpp/bench/ann/src/raft/raft_cagra_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class RaftCagra : public ANN<T> {
using typename ANN<T>::AnnSearchParam;

struct SearchParam : public AnnSearchParam {
unsigned itopk_size;
raft::neighbors::experimental::cagra::search_params p;
};

using BuildParam = raft::neighbors::experimental::cagra::index_params;
Expand All @@ -71,7 +71,7 @@ class RaftCagra : public ANN<T> {
AlgoProperty get_property() const override
{
AlgoProperty property;
property.dataset_memory_type = MemoryType::Device;
property.dataset_memory_type = MemoryType::Host;
property.query_memory_type = MemoryType::Device;
property.need_dataset_when_search = true;
return property;
Expand Down Expand Up @@ -104,14 +104,24 @@ RaftCagra<T, IdxT>::RaftCagra(Metric metric, int dim, const BuildParam& param)
template <typename T, typename IdxT>
void RaftCagra<T, IdxT>::build(const T* dataset, size_t nrow, cudaStream_t)
{
auto dataset_view = raft::make_device_matrix_view<const T, IdxT>(dataset, IdxT(nrow), dimension_);
index_.emplace(raft::neighbors::experimental::cagra::build(handle_, index_params_, dataset_view));
if (get_property().dataset_memory_type == MemoryType::Host) {
auto dataset_view = raft::make_host_matrix_view<const T, IdxT>(dataset, IdxT(nrow), dimension_);
index_.emplace(
raft::neighbors::experimental::cagra::build(handle_, index_params_, dataset_view));
} else {
auto dataset_view =
raft::make_device_matrix_view<const T, IdxT>(dataset, IdxT(nrow), dimension_);
index_.emplace(
raft::neighbors::experimental::cagra::build(handle_, index_params_, dataset_view));
}
return;
}

template <typename T, typename IdxT>
void RaftCagra<T, IdxT>::set_search_param(const AnnSearchParam& param)
{
auto search_param = dynamic_cast<const SearchParam&>(param);
search_params_ = search_param.p;
return;
}

Expand Down Expand Up @@ -146,11 +156,8 @@ void RaftCagra<T, IdxT>::search(
auto neighbors_view = raft::make_device_matrix_view<IdxT, IdxT>(neighbors_IdxT, batch_size, k);
auto distances_view = raft::make_device_matrix_view<float, IdxT>(distances, batch_size, k);

raft::neighbors::experimental::cagra::search_params search_params;
search_params.max_queries = batch_size;
search_params.itopk_size = search_params_.max_queries;
raft::neighbors::experimental::cagra::search(
handle_, search_params, *index_, queries_view, neighbors_view, distances_view);
handle_, search_params_, *index_, queries_view, neighbors_view, distances_view);

if (!std::is_same<IdxT, size_t>::value) {
raft::linalg::unaryOp(neighbors,
Expand Down
32 changes: 20 additions & 12 deletions cpp/include/raft/neighbors/detail/cagra/cagra_build.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ void build_knn_graph(raft::resources const& res,
resource::get_cuda_stream(res),
device_memory);

size_t next_report_offset = 0;
size_t d_report_offset = dataset.extent(0) / 100; // Report progress in 1% steps.

for (const auto& batch : vec_batches) {
auto queries_view = raft::make_device_matrix_view<const DataT, uint32_t>(
batch.data(), batch.size(), batch.row_width());
Expand Down Expand Up @@ -212,18 +215,23 @@ void build_knn_graph(raft::resources const& res,

size_t num_queries_done = batch.offset() + batch.size();
const auto end_clock = std::chrono::system_clock::now();
const auto time =
std::chrono::duration_cast<std::chrono::microseconds>(end_clock - start_clock).count() * 1e-6;
const auto throughput = num_queries_done / time;
RAFT_LOG_DEBUG(
"# Search %12lu / %12lu (%3.2f %%), %e queries/sec, %.2f minutes ETA, self included = "
"%3.2f %% \r",
num_queries_done,
dataset.extent(0),
num_queries_done / static_cast<double>(dataset.extent(0)) * 100,
throughput,
(num_queries - num_queries_done) / throughput / 60,
static_cast<double>(num_self_included) / num_queries_done * 100.);
if (batch.offset() > next_report_offset) {
next_report_offset += d_report_offset;
const auto time =
std::chrono::duration_cast<std::chrono::microseconds>(end_clock - start_clock).count() *
1e-6;
const auto throughput = num_queries_done / time;

RAFT_LOG_INFO(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I have changed the build progress messages from DEBUG to INFO. Since build takes long (10+ min for large datasetst) I find it useful to get a message about the progress. This will emit 100 message during the build process. The DEBUG messages are be flooded by other IVF-PQ debug printouts, therefore I set this to INFO.

"# Search %12lu / %12lu (%3.2f %%), %e queries/sec, %.2f minutes ETA, self included = "
"%3.2f %% \r",
num_queries_done,
dataset.extent(0),
num_queries_done / static_cast<double>(dataset.extent(0)) * 100,
throughput,
(num_queries - num_queries_done) / throughput / 60,
static_cast<double>(num_self_included) / num_queries_done * 100.);
}
first = false;
}
if (!first) RAFT_LOG_DEBUG("# Finished building kNN graph");
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/spatial/knn/detail/ann_utils.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ struct batch_load_iterator {
if (source_ == nullptr) { return; }
if (needs_copy_) {
if (size() > 0) {
RAFT_LOG_DEBUG("batch_load_iterator::copy(offset = %zu, size = %zu, row_width = %zu)",
RAFT_LOG_TRACE("batch_load_iterator::copy(offset = %zu, size = %zu, row_width = %zu)",
size_t(offset()),
size_t(size()),
size_t(row_width()));
Expand Down