faiss 0.6.1 → 0.6.2

data/vendor/faiss/faiss/impl/platform_macros.h

@@ -110,12 +110,6 @@ inline int __builtin_clzll(uint64_t x) {
 #define FAISS_PACK_STRUCTS_BEGIN __pragma(pack(push, 1))
 #define FAISS_PACK_STRUCTS_END __pragma(pack(pop))
 
-#ifdef SWIG
-#define FAISS_MAYBE_UNUSED
-#else
-#define FAISS_MAYBE_UNUSED [[maybe_unused]]
-#endif
-
 #else
 /*******************************************************
  * Linux and OSX
@@ -130,12 +124,10 @@ inline int __builtin_clzll(uint64_t x) {
 #define ALIGNED(x)
 #define FAISS_PACKED
 #define FAISS_RESTRICT
-#define FAISS_MAYBE_UNUSED
 #else
 #define ALIGNED(x) __attribute__((aligned(x)))
 #define FAISS_PACKED __attribute__((packed))
 #define FAISS_RESTRICT __restrict
-#define FAISS_MAYBE_UNUSED [[maybe_unused]]
 #endif
 
 // On non-Windows, FAISS_PACKED handles packing, so these are no-ops
@@ -220,3 +212,15 @@ inline int __builtin_clzll(uint64_t x) {
 #define Swap4Bytes(val)                                           \
     ((((val) >> 24) & 0x000000FF) | (((val) >> 8) & 0x0000FF00) | \
      (((val) << 8) & 0x00FF0000) | (((val) << 24) & 0xFF000000))
+
+/*******************************************************
+ * A few things that SWIG has trouble parsing
+ *******************************************************/
+
+#ifdef SWIG
+#define FAISS_MAYBE_UNUSED
+#define FAISS_FINAL
+#else
+#define FAISS_MAYBE_UNUSED [[maybe_unused]]
+#define FAISS_FINAL final
+#endif

data/vendor/faiss/faiss/impl/pq_code_distance/avx2.cpp

@@ -13,6 +13,8 @@
 #include <faiss/impl/pq_code_distance/pq_code_distance-avx2.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/utils/hamming_distance/hamming_computer-avx2.h>
+// NOLINTNEXTLINE(facebook-hte-InlineHeader,facebook-unused-include-check)
+#include <faiss/impl/pq_code_distance/pq_scan_impl.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/impl/pq_code_distance/PQDistanceComputer_impl.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)

data/vendor/faiss/faiss/impl/pq_code_distance/avx512.cpp

@@ -14,6 +14,8 @@
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/utils/hamming_distance/hamming_computer-avx512.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
+#include <faiss/impl/pq_code_distance/pq_scan_impl.h>
+// NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/impl/pq_code_distance/PQDistanceComputer_impl.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/impl/pq_code_distance/IVFPQScanner_impl.h>

data/vendor/faiss/faiss/impl/pq_code_distance/neon.cpp

@@ -14,6 +14,8 @@
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/utils/hamming_distance/hamming_computer-neon.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
+#include <faiss/impl/pq_code_distance/pq_scan_impl.h>
+// NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/impl/pq_code_distance/PQDistanceComputer_impl.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/impl/pq_code_distance/IVFPQScanner_impl.h>

data/vendor/faiss/faiss/impl/pq_code_distance/pq_code_distance-generic.cpp

@@ -17,9 +17,29 @@
 
 #include <faiss/impl/pq_code_distance/pq_code_distance-generic.h>
 
+#define THE_SIMD_LEVEL SIMDLevel::NONE
+// NOLINTNEXTLINE(facebook-hte-InlineHeader)
+#include <faiss/impl/pq_code_distance/pq_scan_impl.h>
+#undef THE_SIMD_LEVEL
+
 namespace faiss {
 namespace pq_code_distance {
 
+void pq_scan_8bit(
+        size_t M,
+        const float* dis_table,
+        const uint8_t* codes,
+        size_t ncodes,
+        size_t k,
+        float* heap_dis,
+        int64_t* heap_ids,
+        bool max_heap) {
+    with_simd_level([&]<SIMDLevel SL>() {
+        pq_scan_8bit_impl<SL>(
+                M, dis_table, codes, ncodes, k, heap_dis, heap_ids, max_heap);
+    });
+}
+
 float pq_code_distance_8bit_single(
         size_t M,
         const float* sim_table,

data/vendor/faiss/faiss/impl/pq_code_distance/pq_code_distance-inl.h

@@ -245,11 +245,47 @@ FAISS_API void pq_code_distance_8bit_four(
         float& result2,
         float& result3);
 
+/*********************************************************************
+ * Standalone PQ scan — SIMD-dispatched full-index scan.
+ *
+ * Scans all ncodes PQ codes against a precomputed distance table,
+ * maintaining a k-nearest-neighbor heap. Uses the SIMD PQ distance
+ * kernels (AVX2 gathers, etc.) for the inner loop, with the SIMD
+ * gathers inlined into the scan loop in each per-SIMD TU.
+ *
+ * Definitions are in pq_scan_impl.h (per-SIMD TUs) and
+ * pq_code_distance-generic.cpp (dispatch wrapper).
+ *********************************************************************/
+
+template <SIMDLevel SL>
+void pq_scan_8bit_impl(
+        size_t M,
+        const float* dis_table,
+        const uint8_t* codes,
+        size_t ncodes,
+        size_t k,
+        float* heap_dis,
+        int64_t* heap_ids,
+        bool max_heap);
+
+/// Scan all ncodes 8-bit PQ codes, dispatching to the best SIMD level.
+/// max_heap=true for L2 (CMax), false for IP (CMin).
+FAISS_API void pq_scan_8bit(
+        size_t M,
+        const float* dis_table,
+        const uint8_t* codes,
+        size_t ncodes,
+        size_t k,
+        float* heap_dis,
+        int64_t* heap_ids,
+        bool max_heap);
+
 } // namespace pq_code_distance
 
 // Re-export public API into namespace faiss for convenience
 using pq_code_distance::pq_code_distance_8bit_four;
 using pq_code_distance::pq_code_distance_8bit_single;
+using pq_code_distance::pq_scan_8bit;
 using pq_code_distance::PQCodeDistance;
 using pq_code_distance::PQCodeDistanceScalar;
 

data/vendor/faiss/faiss/impl/pq_code_distance/pq_code_distance-sve.cpp

@@ -347,4 +347,9 @@ void pq_code_distance_8bit_four_impl<SIMDLevel::ARM_SVE>(
 } // namespace pq_code_distance
 } // namespace faiss
 
+#define THE_SIMD_LEVEL SIMDLevel::ARM_SVE
+// NOLINTNEXTLINE(facebook-hte-InlineHeader)
+#include <faiss/impl/pq_code_distance/pq_scan_impl.h>
+#undef THE_SIMD_LEVEL
+
 #endif // COMPILE_SIMD_ARM_SVE

data/vendor/faiss/faiss/impl/pq_code_distance/pq_scan_impl.h

@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#ifndef THE_SIMD_LEVEL
+#error "THE_SIMD_LEVEL must be defined before including pq_scan_impl.h"
+#endif
+
+#include <faiss/impl/pq_code_distance/pq_code_distance-inl.h>
+#include <faiss/utils/Heap.h>
+
+namespace faiss {
+namespace pq_code_distance {
+
+namespace {
+
+template <class C>
+void pq_scan_8bit_at_level(
+        size_t M,
+        const float* dis_table,
+        const uint8_t* codes,
+        size_t ncodes,
+        size_t k,
+        float* heap_dis,
+        int64_t* heap_ids) {
+    const size_t code_size = M;
+
+    size_t j = 0;
+    for (; j + 3 < ncodes; j += 4) {
+        float d0, d1, d2, d3;
+        pq_code_distance_8bit_four_impl<THE_SIMD_LEVEL>( // NOLINT(facebook-modularize-issue-check)
+                M,
+                dis_table,
+                codes + j * code_size,
+                codes + (j + 1) * code_size,
+                codes + (j + 2) * code_size,
+                codes + (j + 3) * code_size,
+                d0,
+                d1,
+                d2,
+                d3);
+
+        if (C::cmp(heap_dis[0], d0)) {
+            heap_replace_top<C>(k, heap_dis, heap_ids, d0, j);
+        }
+        if (C::cmp(heap_dis[0], d1)) {
+            heap_replace_top<C>(k, heap_dis, heap_ids, d1, j + 1);
+        }
+        if (C::cmp(heap_dis[0], d2)) {
+            heap_replace_top<C>(k, heap_dis, heap_ids, d2, j + 2);
+        }
+        if (C::cmp(heap_dis[0], d3)) {
+            heap_replace_top<C>(k, heap_dis, heap_ids, d3, j + 3);
+        }
+    }
+
+    for (; j < ncodes; j++) {
+        float dis = pq_code_distance_8bit_single_impl<THE_SIMD_LEVEL>( // NOLINT(facebook-modularize-issue-check)
+                M, dis_table, codes + j * code_size);
+        if (C::cmp(heap_dis[0], dis)) {
+            heap_replace_top<C>(k, heap_dis, heap_ids, dis, j);
+        }
+    }
+}
+
+} // anonymous namespace
+
+template <SIMDLevel SL>
+void pq_scan_8bit_impl(
+        size_t M,
+        const float* dis_table,
+        const uint8_t* codes,
+        size_t ncodes,
+        size_t k,
+        float* heap_dis,
+        int64_t* heap_ids,
+        bool max_heap);
+
+// NOLINTNEXTLINE(facebook-hte-MisplacedTemplateSpecialization,facebook-modularize-issue-check)
+template <>
+void pq_scan_8bit_impl<THE_SIMD_LEVEL>(
+        size_t M,
+        const float* dis_table,
+        const uint8_t* codes,
+        size_t ncodes,
+        size_t k,
+        float* heap_dis,
+        int64_t* heap_ids,
+        bool max_heap) {
+    if (max_heap) {
+        pq_scan_8bit_at_level<CMax<float, int64_t>>(
+                M, dis_table, codes, ncodes, k, heap_dis, heap_ids);
+    } else {
+        pq_scan_8bit_at_level<CMin<float, int64_t>>(
+                M, dis_table, codes, ncodes, k, heap_dis, heap_ids);
+    }
+}
+
+} // namespace pq_code_distance
+} // namespace faiss

data/vendor/faiss/faiss/impl/pq_code_distance/rvv.cpp

@@ -56,6 +56,8 @@ void pq_code_distance_8bit_four_impl<SIMDLevel::RISCV_RVV>(
 
 #define THE_SIMD_LEVEL SIMDLevel::RISCV_RVV
 
+// NOLINTNEXTLINE(facebook-hte-InlineHeader)
+#include <faiss/impl/pq_code_distance/pq_scan_impl.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)
 #include <faiss/utils/hamming_distance/hamming_computer-rvv.h>
 // NOLINTNEXTLINE(facebook-hte-InlineHeader)

data/vendor/faiss/faiss/impl/scalar_quantizer/distance_computers.h

@@ -77,6 +77,12 @@ struct DCTemplate<Quantizer, Similarity, SIMDLevel::NONE> : SQDistanceComputer {
 template <class Similarity, SIMDLevel SL>
 struct DistanceComputerByte : SQDistanceComputer {};
 
+// Byte-domain distance computer for QT_8bit_direct_signed (storage is
+// value+128). Only specialized for AVX512_SPR; other levels fall back to
+// the float-domain DCTemplate path via the dispatch logic.
+template <class Similarity, SIMDLevel SL>
+struct DistanceComputerByteSigned : SQDistanceComputer {};
+
 template <class Similarity>
 struct DistanceComputerByte<Similarity, SIMDLevel::NONE> : SQDistanceComputer {
     using Sim = Similarity;