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

fix centroids_norms storage for ResidualCoarseQuantizer (#2018) 

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

The centroids norms table was not reconstructed correctly after being stored in RCQ.

Reviewed By: Sugoshnr

Differential Revision: D30484389

fbshipit-source-id: 9f618a3939c99dc987590c07eda8e76e19248b08
pull/2029/head
Matthijs Douze 2021-08-25 06:36:33 -07:00 committed by Facebook GitHub Bot
parent 760cce7f3a
commit 151e3d7be5
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
faiss/IndexAdditiveQuantizer.cpp
View File

@ -310,7 +310,7 @@ ResidualCoarseQuantizer::ResidualCoarseQuantizer(
MetricType metric)
: ResidualCoarseQuantizer(d, std::vector<size_t>(M, nbits), metric) {}
ResidualCoarseQuantizer::ResidualCoarseQuantizer(): beam_factor(4.0) {}
ResidualCoarseQuantizer::ResidualCoarseQuantizer(): ResidualCoarseQuantizer(0, 0, 0) {}
@ -319,8 +319,13 @@ void ResidualCoarseQuantizer::set_beam_factor(float new_beam_factor) {
if (new_beam_factor > 0) {
FAISS_THROW_IF_NOT(new_beam_factor >= 1.0);
return;
} else if (metric_type == METRIC_L2 && ntotal != centroid_norms.size()) {
if (verbose) {
printf("AdditiveCoarseQuantizer::train: computing centroid norms for %ld centroids\n", ntotal);
}
centroid_norms.resize(ntotal);
aq->compute_centroid_norms(centroid_norms.data());
}
}
void ResidualCoarseQuantizer::search(

7
tests/test_residual_quantizer.py
View File

@ -497,6 +497,13 @@ class TestIVFResidualCoarseQuantizer(unittest.TestCase):
np.testing.assert_array_almost_equal(Dref, Dnew, decimal=5)
np.testing.assert_array_equal(Iref, Inew)
# check i/o
CDref, CIref = quantizer.search(ds.get_queries(), 10)
quantizer2 = faiss.deserialize_index(faiss.serialize_index(quantizer))
quantizer2.search(ds.get_queries(), 10)
CDnew, CInew = quantizer2.search(ds.get_queries(), 10)
np.testing.assert_array_almost_equal(CDref, CDnew, decimal=5)
np.testing.assert_array_equal(CIref, CInew)
###########################################################
# Test search with LUTs