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

Improve naming due to codemod #4065

Closed
wants to merge 2 commits into from
Closed

Improve naming due to codemod #4065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9be22c3
Improve naming due to codemod (#4064)
mengdilin Dec 5, 2024
f1a85d4
Improve naming due to codemod
mengdilin Dec 5, 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
16 changes: 8 additions & 8 deletions faiss/IndexFastScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@ inline size_t roundup(size_t a, size_t b) {

void IndexFastScan::init_fastscan(
int d,
size_t M_2,
size_t nbits_2,
size_t M_init,
size_t nbits_init,
MetricType metric,
int bbs) {
FAISS_THROW_IF_NOT(nbits_2 == 4);
FAISS_THROW_IF_NOT(nbits_init == 4);
FAISS_THROW_IF_NOT(bbs % 32 == 0);
this->d = d;
this->M = M_2;
this->nbits = nbits_2;
this->M = M_init;
this->nbits = nbits_init;
this->metric_type = metric;
this->bbs = bbs;
ksub = (1 << nbits_2);
ksub = (1 << nbits_init);

code_size = (M_2 * nbits_2 + 7) / 8;
code_size = (M_init * nbits_init + 7) / 8;
ntotal = ntotal2 = 0;
M2 = roundup(M_2, 2);
M2 = roundup(M_init, 2);
is_trained = false;
}

Expand Down
8 changes: 4 additions & 4 deletions faiss/impl/HNSW.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,17 +493,17 @@ void HNSW::add_links_starting_from(

::faiss::shrink_neighbor_list(ptdis, link_targets, M, keep_max_size_level0);

std::vector<storage_idx_t> neighbors_2;
neighbors_2.reserve(link_targets.size());
std::vector<storage_idx_t> neighbors_to_add;
neighbors_to_add.reserve(link_targets.size());
while (!link_targets.empty()) {
storage_idx_t other_id = link_targets.top().id;
add_link(*this, ptdis, pt_id, other_id, level, keep_max_size_level0);
neighbors_2.push_back(other_id);
neighbors_to_add.push_back(other_id);
link_targets.pop();
}

omp_unset_lock(&locks[pt_id]);
for (storage_idx_t other_id : neighbors_2) {
for (storage_idx_t other_id : neighbors_to_add) {
omp_set_lock(&locks[other_id]);
add_link(*this, ptdis, other_id, pt_id, level, keep_max_size_level0);
omp_unset_lock(&locks[other_id]);
Expand Down
Loading