mirrors/faiss
1
0
Fork 0
mirror of https://github.com/facebookresearch/faiss.git synced 2025-06-03 21:54:02 +08:00
Code Issues Projects Releases Wiki Activity

Fix CircleCI IVFPQ GPU tests (#1690)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1690

The GPU and CPU were trained separately in the failing test, leading to fairly different PQ centroids. Instead, just train on the GPU and copy to the CPU like other tests.

Also silences the not enough centroids warnings.

Reviewed By: beauby

Differential Revision: D26470199

fbshipit-source-id: 1f7c036671c03ed4a97c8c4a44d3c5b9767019cb
This commit is contained in:
Jeff Johnson 2021-02-16 16:02:24 -08:00 committed by Facebook GitHub Bot
parent b4a0a9c617
commit 96d0d331a7
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
faiss/gpu/test/test_gpu_index.py
View File

@ -175,8 +175,8 @@ class TestInterleavedIVFPQLayout(unittest.TestCase):
for bits_per_code in [4, 5, 6, 8]:
d = 128
nb = 5000
nq = 50
nb = 10000
nq = 20
rs = np.random.RandomState(123)
xb = rs.rand(nb, d).astype('float32')
@ -184,7 +184,7 @@ class TestInterleavedIVFPQLayout(unittest.TestCase):
nlist = int(math.sqrt(nb))
sub_q = 16
nprobe = 4
nprobe = 16
config = faiss.GpuIndexIVFPQConfig()
config.interleavedLayout = True
@ -194,32 +194,33 @@ class TestInterleavedIVFPQLayout(unittest.TestCase):
idx_gpu.train(xb)
idx_gpu.add(xb)
idx_cpu.train(xb)
idx_cpu.add(xb)
idx_gpu.copyTo(idx_cpu)
idx_gpu.nprobe = nprobe
idx_cpu.nprobe = nprobe
k = 20
# Try without precomputed codes
d_g, i_g = idx_gpu.search(xq, 10)
d_c, i_c = idx_cpu.search(xq, 10)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size - 25)
self.assertTrue(np.allclose(d_g, d_c, rtol=5e-5, atol=3e-1))
d_g, i_g = idx_gpu.search(xq, k)
d_c, i_c = idx_cpu.search(xq, k)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size * 0.9)
self.assertTrue(np.allclose(d_g, d_c, rtol=5e-5, atol=5e-5))
# Try with precomputed codes (different kernel)
idx_gpu.setPrecomputedCodes(True)
d_g, i_g = idx_gpu.search(xq, 10)
d_c, i_c = idx_cpu.search(xq, 10)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size - 25)
self.assertTrue(np.allclose(d_g, d_c, rtol=5e-5, atol=3e-1))
d_g, i_g = idx_gpu.search(xq, k)
d_c, i_c = idx_cpu.search(xq, k)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size * 0.9)
self.assertTrue(np.allclose(d_g, d_c, rtol=5e-5, atol=5e-5))
def test_copy_to_cpu(self):
res = faiss.StandardGpuResources()
for bits_per_code in [4, 5, 6, 8]:
d = 128
nb = 5000
nq = 50
nb = 10000
nq = 20
rs = np.random.RandomState(234)
xb = rs.rand(nb, d).astype('float32')
@ -247,14 +248,14 @@ class TestInterleavedIVFPQLayout(unittest.TestCase):
# Try without precomputed codes
d_g, i_g = idx_gpu.search(xq, 10)
d_c, i_c = idx_cpu.search(xq, 10)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size - 20)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size * 0.9)
self.assertTrue(np.allclose(d_g, d_c))
# Try with precomputed codes (different kernel)
idx_gpu.setPrecomputedCodes(True)
d_g, i_g = idx_gpu.search(xq, 10)
d_c, i_c = idx_cpu.search(xq, 10)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size - 20)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size * 0.9)
self.assertTrue(np.allclose(d_g, d_c))
def test_copy_to_gpu(self):
@ -262,8 +263,8 @@ class TestInterleavedIVFPQLayout(unittest.TestCase):
for bits_per_code in [4, 5, 6, 8]:
d = 128
nb = 5000
nq = 50
nb = 10000
nq = 20
rs = np.random.RandomState(567)
xb = rs.rand(nb, d).astype('float32')
@ -291,14 +292,14 @@ class TestInterleavedIVFPQLayout(unittest.TestCase):
# Try without precomputed codes
d_g, i_g = idx_gpu.search(xq, 10)
d_c, i_c = idx_cpu.search(xq, 10)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size - 20)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size * 0.9)
self.assertTrue(np.allclose(d_g, d_c))
# Try with precomputed codes (different kernel)
idx_gpu.setPrecomputedCodes(True)
d_g, i_g = idx_gpu.search(xq, 10)
d_c, i_c = idx_cpu.search(xq, 10)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size - 20)
self.assertGreaterEqual((i_g == i_c).sum(), i_g.size * 0.9)
self.assertTrue(np.allclose(d_g, d_c))