mirror of
https://github.com/facebookresearch/faiss.git
synced 2026-10-11 22:50:00 +00:00
Summary: ## What Split the existing VPOPCNTDQ RaBitQ and Hamming kernels from the full Sapphire Rapids SIMD level. DD builds now expose an `AVX512_VPOPCNT` capability for CPUs such as Ice Lake and Zen 4. The fallback chain is: `AVX512_SPR -> AVX512_VPOPCNT -> AVX512 -> AVX2 -> NONE` The ordinary static AVX512 target remains unchanged and contains no VPOPCNT instructions. ## Why The VPOPCNT kernels only require baseline AVX-512 plus `AVX512_VPOPCNTDQ`. Tying them to the SPR level unnecessarily excluded CPUs that support VPOPCNTDQ but not AVX512-FP16, notably Zen 4. ## Changes made while importing Two changes were needed on top of the pull request. **Feature detection read the wrong CPUID leaf.** `AVX512_VPOPCNTDQ` and `AVX512_VNNI` were read from leaf 1 ECX. Both live in leaf 7 subleaf 0 ECX, at bits 14 and 11. Leaf 1 ECX holds unrelated bits at those positions, so the new level was never selected on any CPU. Measured on an AMD Genoa host before the fix: the level reported as unavailable and detection returned `AVX512`. After the fix the same host reports `AVX512_VPOPCNT`. **The build definitions outside CMake were not updated.** The pull request renames three files. The other build description still named the old paths and had no entry for the new level, so the library did not build. This adds the level constant, its compiler flags, its `COMPILE_SIMD_AVX512_VPOPCNT` define, and the renamed paths. **The new level was not registered in the compiled-level mask.** `compiled_simd_levels()` reports which levels a binary holds, and `FAISS_SIMD_LEVEL` walks down from the requested level until it finds one that is present. The new level had no entry, so the override always stepped past it to `AVX512` and printed that the level was not compiled in. This was reported by `test_dispatch_with_env_var` on the open-source dynamic-dispatch build. **The test helper inferred available levels from `/proc/cpuinfo`.** A CPU feature does not imply that a level is compiled into the build, so the helper listed a level the override then refused. It now asks `SIMDConfig::is_simd_level_available()`, which reports compiled and supported. That is a subset of compiled, so every level it returns is one the override accepts. The mask and helper names also follow the naming used in the parent diff, so `AVAILABLE_SIMD_LEVELS_BASE_WITH_VPOPCNT` and `with_simd_level_with_vpopcnt`. Pull Request resolved: https://github.com/facebookresearch/faiss/pull/5531 Test Plan: ``` buck2 test fbcode//mode/opt -c faiss.dynamic_dispatch=true \ fbcode//faiss/tests:test_simd_levels fbcode//faiss/tests:test_rabitq_simd ``` Result: all pass. The build failures the imported version reported are cleared. All three configurations build: ``` buck2 build fbcode//mode/dev fbcode//faiss:faiss fbcode//faiss:faiss_no_multithreading fbcode//faiss:faiss_omp_mock buck2 build fbcode//mode/opt -c faiss.dynamic_dispatch=true <same three targets> buck2 build fbcode//mode/dev -c fbcode.arch=aarch64 <same three targets> ``` Detection on an AMD Genoa host, which has AVX512_VPOPCNTDQ and AVX512_BF16 but not AVX512_FP16: | | before the CPUID fix | after | | --- | --- | --- | | detected level | `AVX512` | `AVX512_VPOPCNT` | | `AVX512_VPOPCNT` available | 0 | 1 | | `AVX512_SPR` available | 0 | 0 | Reviewed By: alibeklfc Differential Revision: D118969754 Pulled By: mnorris11 fbshipit-source-id: d1ca52b614829a3d4b322c9fecf0c004f2174dab
243 lines
7.3 KiB
Python
243 lines
7.3 KiB
Python
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
#
|
|
# This source code is licensed under the MIT license found in the
|
|
# LICENSE file in the root directory of this source tree.
|
|
|
|
# a few common functions for the tests
|
|
|
|
from __future__ import (
|
|
absolute_import,
|
|
division,
|
|
print_function,
|
|
unicode_literals,
|
|
)
|
|
|
|
import sys
|
|
import unittest
|
|
|
|
import numpy as np
|
|
import faiss
|
|
|
|
# reduce number of threads to avoid excessive nb of threads in opt
|
|
# mode (reduces runtime from 100s to 4s!)
|
|
faiss.omp_set_num_threads(4)
|
|
|
|
|
|
def random_unitary(n, d, seed):
|
|
x = faiss.randn(n * d, seed).reshape(n, d)
|
|
faiss.normalize_L2(x)
|
|
return x
|
|
|
|
|
|
class Randu10k:
|
|
|
|
def __init__(self):
|
|
self.nb = 10000
|
|
self.nq = 1000
|
|
self.nt = 10000
|
|
self.d = 128
|
|
|
|
self.xb = random_unitary(self.nb, self.d, 1)
|
|
self.xt = random_unitary(self.nt, self.d, 2)
|
|
self.xq = random_unitary(self.nq, self.d, 3)
|
|
|
|
dotprods = np.dot(self.xq, self.xb.T)
|
|
self.gt = dotprods.argmax(1)
|
|
self.k = 100
|
|
|
|
def launch(self, name, index):
|
|
if not index.is_trained:
|
|
index.train(self.xt)
|
|
index.add(self.xb)
|
|
return index.search(self.xq, self.k)
|
|
|
|
def evalres(self, DI):
|
|
D, I = DI
|
|
e = {}
|
|
for rank in 1, 10, 100:
|
|
e[rank] = (I[:, :rank] == self.gt.reshape(-1, 1)).sum() / float(
|
|
self.nq
|
|
)
|
|
return e
|
|
|
|
|
|
class Randu10kUnbalanced(Randu10k):
|
|
|
|
def __init__(self):
|
|
Randu10k.__init__(self)
|
|
|
|
weights = 0.95 ** np.arange(self.d)
|
|
rs = np.random.RandomState(123)
|
|
weights = weights[rs.permutation(self.d)]
|
|
self.xb *= weights
|
|
self.xb /= np.linalg.norm(self.xb, axis=1)[:, np.newaxis]
|
|
self.xq *= weights
|
|
self.xq /= np.linalg.norm(self.xq, axis=1)[:, np.newaxis]
|
|
self.xt *= weights
|
|
self.xt /= np.linalg.norm(self.xt, axis=1)[:, np.newaxis]
|
|
|
|
dotprods = np.dot(self.xq, self.xb.T)
|
|
self.gt = dotprods.argmax(1)
|
|
self.k = 100
|
|
|
|
|
|
def get_dataset(d, nb, nt, nq):
|
|
rs = np.random.RandomState(123)
|
|
xb = rs.rand(nb, d).astype("float32")
|
|
xt = rs.rand(nt, d).astype("float32")
|
|
xq = rs.rand(nq, d).astype("float32")
|
|
|
|
return (xt, xb, xq)
|
|
|
|
|
|
def get_dataset_2(d, nt, nb, nq):
|
|
"""A dataset that is not completely random but still challenging to
|
|
index
|
|
"""
|
|
d1 = 10 # intrinsic dimension (more or less)
|
|
n = nb + nt + nq
|
|
rs = np.random.RandomState(1338)
|
|
x = rs.normal(size=(n, d1))
|
|
x = np.dot(x, rs.rand(d1, d))
|
|
# now we have a d1-dim ellipsoid in d-dimensional space
|
|
# higher factor (>4) -> higher frequency -> less linear
|
|
x = x * (rs.rand(d) * 4 + 0.1)
|
|
x = np.sin(x)
|
|
x = x.astype("float32")
|
|
return x[:nt], x[nt : nt + nb], x[nt + nb :]
|
|
|
|
|
|
def make_binary_dataset(d, nt, nb, nq):
|
|
assert d % 8 == 0
|
|
rs = np.random.RandomState(123)
|
|
x = rs.randint(256, size=(nb + nq + nt, int(d / 8))).astype("uint8")
|
|
return x[:nt], x[nt:-nq], x[-nq:]
|
|
|
|
|
|
def compare_binary_result_lists(D1, I1, D2, I2):
|
|
"""comparing result lists is difficult because there are many
|
|
ties. Here we sort by (distance, index) pairs and ignore the largest
|
|
distance of each result. Compatible result lists should pass this."""
|
|
assert D1.shape == I1.shape == D2.shape == I2.shape
|
|
n, k = D1.shape
|
|
ndiff = (D1 != D2).sum()
|
|
assert ndiff == 0, "%d differences in distance matrix %s" % (
|
|
ndiff,
|
|
D1.shape,
|
|
)
|
|
|
|
def normalize_DI(D, I):
|
|
norm = I.max() + 1.0
|
|
Dr = D.astype("float64") + I / norm
|
|
# ignore -1s and elements on last column
|
|
Dr[I1 == -1] = 1e20
|
|
Dr[D == D[:, -1:]] = 1e20
|
|
Dr.sort(axis=1)
|
|
return Dr
|
|
|
|
ndiff = (normalize_DI(D1, I1) != normalize_DI(D2, I2)).sum()
|
|
assert ndiff == 0, "%d differences in normalized D matrix" % ndiff
|
|
|
|
|
|
# Map SIMDLevel enum values to their string names.
|
|
_SIMD_LEVEL_NAMES = {
|
|
faiss.SIMDLevel_NONE: "NONE",
|
|
faiss.SIMDLevel_AVX2: "AVX2",
|
|
faiss.SIMDLevel_AVX512: "AVX512",
|
|
faiss.SIMDLevel_AVX512_SPR: "AVX512_SPR",
|
|
faiss.SIMDLevel_ARM_NEON: "ARM_NEON",
|
|
faiss.SIMDLevel_ARM_SVE: "ARM_SVE",
|
|
faiss.SIMDLevel_RISCV_RVV: "RISCV_RVV",
|
|
faiss.SIMDLevel_AVX512_VPOPCNT: "AVX512_VPOPCNT",
|
|
}
|
|
|
|
|
|
class NoneSIMDLevel:
|
|
"""Context manager that temporarily pins SIMDConfig to SIMDLevel.NONE.
|
|
|
|
Use inside a @for_all_simd_levels test to compute a reference value at
|
|
NONE for a cross-level equivalence check::
|
|
|
|
codes = quantizer.compute_codes(xb)
|
|
with NoneSIMDLevel():
|
|
codes_none = quantizer.compute_codes(xb)
|
|
np.testing.assert_array_equal(codes, codes_none)
|
|
|
|
The previous level is restored on exit (including via exception).
|
|
|
|
If SIMDLevel.NONE is not compiled into this build (static-AVX2 CI
|
|
lane), the context manager raises SkipTest from __enter__, so the
|
|
enclosing test_method is skipped cleanly without per-call guards.
|
|
|
|
Caveat: SkipTest raised from inside a self.subTest(...) block is
|
|
swallowed by the subTest mechanism instead of skipping the parent
|
|
test. When iterating with subTest, do an up-front availability check
|
|
before the loop::
|
|
|
|
if not faiss.SIMDConfig.is_simd_level_available(
|
|
faiss.SIMDLevel_NONE):
|
|
self.skipTest("SIMDLevel.NONE not available")
|
|
for x in cases:
|
|
with self.subTest(x=x):
|
|
...
|
|
with NoneSIMDLevel():
|
|
...
|
|
"""
|
|
|
|
def __enter__(self):
|
|
if not faiss.SIMDConfig.is_simd_level_available(faiss.SIMDLevel_NONE):
|
|
raise unittest.SkipTest("SIMDLevel.NONE not available")
|
|
self._prev = faiss.SIMDConfig.get_level()
|
|
faiss.SIMDConfig.set_level(faiss.SIMDLevel_NONE)
|
|
return self
|
|
|
|
def __exit__(self, exc_type, exc_val, exc_tb):
|
|
faiss.SIMDConfig.set_level(self._prev)
|
|
return False
|
|
|
|
|
|
def for_all_simd_levels(cls):
|
|
"""Parameterize a test class to run at each available SIMD level.
|
|
|
|
In DD builds, creates TestClass_NONE, TestClass_AVX2, etc.
|
|
In static builds, only one level is available so one class is created.
|
|
Each subclass calls set_level() in setUp and restores in tearDown.
|
|
|
|
Usage::
|
|
|
|
@for_all_simd_levels
|
|
class TestDistances(unittest.TestCase):
|
|
def test_L2(self):
|
|
...
|
|
"""
|
|
caller_globals = sys._getframe(1).f_globals
|
|
|
|
for level, name in _SIMD_LEVEL_NAMES.items():
|
|
if not faiss.SIMDConfig.is_simd_level_available(level):
|
|
continue
|
|
|
|
def make_class(lv, ln):
|
|
class Parameterized(cls):
|
|
simd_level = lv
|
|
simd_level_name = ln
|
|
|
|
def setUp(self):
|
|
faiss.SIMDConfig.set_level(self.simd_level)
|
|
super().setUp()
|
|
|
|
def tearDown(self):
|
|
super().tearDown()
|
|
faiss.SIMDConfig.set_level(
|
|
faiss.SIMDConfig.get_dispatched_level()
|
|
)
|
|
|
|
Parameterized.__name__ = f"{cls.__name__}_{ln}"
|
|
Parameterized.__qualname__ = f"{cls.__qualname__}_{ln}"
|
|
Parameterized.__module__ = cls.__module__
|
|
return Parameterized
|
|
|
|
caller_globals[f"{cls.__name__}_{name}"] = make_class(level, name)
|
|
|
|
# Remove original class from test discovery.
|
|
return None
|