mirrors
/
faiss
mirror of https://github.com/facebookresearch/faiss.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix an incorrectly counted the number of computed distances for HNSW (#3840) 

Summary:
https://github.com/facebookresearch/faiss/issues/3819

A definite bug in my code from the past.
The number of reported distances is higher that the number of distances actually computed.

Pull Request resolved: https://github.com/facebookresearch/faiss/pull/3840

Reviewed By: junjieqi

Differential Revision: D62392577

Pulled By: mengdilin

fbshipit-source-id: c4d595849cc95e77eb6cd8d499b3128bbe9a6e13
pull/3847/head
Alexandr Guzhva 2024-09-09 12:59:16 -07:00 committed by Facebook GitHub Bot
parent 3f41161cae
commit 21dfdbaaa0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
faiss/impl/HNSW.cpp
View File

@ -775,7 +775,6 @@ int search_from_candidates(
int counter = 0;
size_t saved_j[4];
ndis += jmax - begin;
threshold = res.threshold;
auto add_to_heap = [&](const size_t idx, const float dis) {
@ -814,6 +813,8 @@ int search_from_candidates(
add_to_heap(saved_j[id4], dis[id4]);
}
ndis += 4;
counter = 0;
}
}
@ -821,6 +822,8 @@ int search_from_candidates(
for (size_t icnt = 0; icnt < counter; icnt++) {
float dis = qdis(saved_j[icnt]);
add_to_heap(saved_j[icnt], dis);
ndis += 1;
}
}
@ -919,8 +922,6 @@ std::priority_queue<HNSW::Node> search_from_candidate_unbounded(
int counter = 0;
size_t saved_j[4];
ndis += jmax - begin;
auto add_to_heap = [&](const size_t idx, const float dis) {
if (top_candidates.top().first > dis ||
top_candidates.size() < ef) {
@ -957,6 +958,8 @@ std::priority_queue<HNSW::Node> search_from_candidate_unbounded(
add_to_heap(saved_j[id4], dis[id4]);
}
ndis += 4;
counter = 0;
}
}
@ -964,6 +967,8 @@ std::priority_queue<HNSW::Node> search_from_candidate_unbounded(
for (size_t icnt = 0; icnt < counter; icnt++) {
float dis = qdis(saved_j[icnt]);
add_to_heap(saved_j[icnt], dis);
ndis += 1;
}
}