Skip to content

format rotator chocie for qg and ivf #8

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
merged 1 commit into from
Jun 11, 2025
Merged

format rotator chocie for qg and ivf #8

Show file tree
Hide file tree
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
15 changes: 6 additions & 9 deletions rabitqlib/index/ivf/ivf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <immintrin.h>
#include <omp.h>

#include <algorithm>
#include <cassert>
#include <cmath>
#include <cstddef>
Expand Down Expand Up @@ -118,9 +119,7 @@ inline IVF::IVF(size_t n, size_t dim, size_t cluster_num, size_t bits, RotatorTy
std::cerr.flush();
exit(1);
};
rotator_ = choose_rotator<float>(
dim, RotatorType::FhtKacRotator, round_up_to_multiple(dim_, 64)
);
rotator_ = choose_rotator<float>(dim, type, round_up_to_multiple(dim_, 64));
padded_dim_ = rotator_->size();
/* check size */
assert(padded_dim_ % 64 == 0);
Expand Down Expand Up @@ -332,9 +331,7 @@ inline void IVF::load(const char* filename) {
input.read(reinterpret_cast<char*>(&this->ex_bits_), sizeof(size_t));
input.read(reinterpret_cast<char*>(&type_), sizeof(type_));

rotator_ = choose_rotator<float>(
dim_, RotatorType::FhtKacRotator, round_up_to_multiple(dim_, 64)
);
rotator_ = choose_rotator<float>(dim_, type_, round_up_to_multiple(dim_, 64));
padded_dim_ = rotator_->size();

/* Load number of vectors of each cluster */
Expand Down Expand Up @@ -376,12 +373,12 @@ inline void IVF::search(
PID* __restrict__ results,
bool use_hacc = true
) const {
if (nprobe > num_cluster_) {
nprobe = num_cluster_;
}
nprobe = std::min(nprobe, num_cluster_); // corner case
std::vector<float> rotated_query(padded_dim_);
this->rotator_->rotate(query, rotated_query.data());

std::cout << l2norm_sqr(query, dim_) << '\t' << l2norm_sqr(rotated_query.data(), padded_dim_) << '\n';

// use initer to get closest nprobe centroids
std::vector<AnnCandidate<float>> centroid_dist(nprobe);
this->initer_->centroids_distances(rotated_query.data(), nprobe, centroid_dist);
Expand Down
4 changes: 1 addition & 3 deletions rabitqlib/index/symqg/qg.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,7 @@ template <typename T>
inline void QuantizedGraph<T>::initialize() {
::delete rotator_;

rotator_ = choose_rotator<float>(
dim_, RotatorType::FhtKacRotator, round_up_to_multiple(dim_, 64)
);
rotator_ = choose_rotator<float>(dim_, type_, round_up_to_multiple(dim_, 64));
padded_dim_ = rotator_->size();

/* check size */
Expand Down