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

Handle some corner case in generate_cache_list_from_sample_queries #361

Merged
merged 1 commit into from
May 30, 2023
Merged

Handle some corner case in generate_cache_list_from_sample_queries #361

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
16 changes: 14 additions & 2 deletions src/pq_flash_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,17 @@ void PQFlashIndex<T, LabelT>::generate_cache_list_from_sample_queries(std::strin
std::vector<uint32_t> &node_list)
{
#endif
if (num_nodes_to_cache >= this->num_points)
{
// for small num_points and big num_nodes_to_cache, use below way to get the node_list quickly
node_list.resize(this->num_points);
for (uint32_t i = 0; i < this->num_points; ++i)
{
node_list[i] = i;
}
return;
}

this->count_visited_nodes = true;
this->node_visit_counter.clear();
this->node_visit_counter.resize(this->num_points);
Expand Down Expand Up @@ -244,8 +255,8 @@ void PQFlashIndex<T, LabelT>::generate_cache_list_from_sample_queries(std::strin
#pragma omp parallel for schedule(dynamic, 1) num_threads(nthreads)
for (int64_t i = 0; i < (int64_t)sample_num; i++)
{
cached_beam_search(samples + (i * sample_aligned_dim), 1, l_search, tmp_result_ids_64.data() + (i * 1),
tmp_result_dists.data() + (i * 1), beamwidth);
cached_beam_search(samples + (i * sample_aligned_dim), 1, l_search, tmp_result_ids_64.data() + i,
tmp_result_dists.data() + i, beamwidth);
}

std::sort(this->node_visit_counter.begin(), node_visit_counter.end(),
Expand All @@ -254,6 +265,7 @@ void PQFlashIndex<T, LabelT>::generate_cache_list_from_sample_queries(std::strin
});
node_list.clear();
node_list.shrink_to_fit();
num_nodes_to_cache = std::min(num_nodes_to_cache, this->node_visit_counter.size());
node_list.reserve(num_nodes_to_cache);
for (uint64_t i = 0; i < num_nodes_to_cache; i++)
{
Expand Down