faiss 0.5.3 → 0.6.1

data/vendor/faiss/faiss/IndexBinaryIVF.cpp

@@ -14,6 +14,7 @@
 #include <cstdio>
 
 #include <algorithm>
+#include <limits>
 #include <memory>
 
 #include <faiss/IndexFlat.h>
@@ -24,22 +25,33 @@
 #include <faiss/utils/sorting.h>
 #include <faiss/utils/utils.h>
 
+#include <faiss/impl/simd_dispatch.h>
+
+// Scalar (NONE) fallback for dynamic dispatch
+#define THE_SIMD_LEVEL SIMDLevel::NONE
+// NOLINTNEXTLINE(facebook-hte-InlineHeader)
+// NOLINTNEXTLINE(facebook-hte-InlineHeader)
+#include <faiss/impl/binary_hamming/IndexBinaryIVF_impl.h>
+#include <faiss/utils/hamming_distance/hamming_computer-generic.h>
+#undef THE_SIMD_LEVEL
+
 namespace faiss {
 
 IndexBinaryIVF::IndexBinaryIVF(
-        IndexBinary* quantizer,
-        size_t d,
-        size_t nlist,
-        bool own_invlists)
-        : IndexBinary(d),
+        IndexBinary* quantizer_,
+        size_t d_,
+        size_t nlist_,
+        bool own_invlists_)
+        : IndexBinary(d_),
           invlists(
-                  own_invlists ? new ArrayInvertedLists(nlist, code_size)
-                               : nullptr),
-          own_invlists(own_invlists),
-          quantizer(quantizer),
-          nlist(nlist) {
-    FAISS_THROW_IF_NOT(d == quantizer->d);
-    is_trained = quantizer->is_trained && (quantizer->ntotal == nlist);
+                  own_invlists_ ? new ArrayInvertedLists(nlist_, code_size)
+                                : nullptr),
+          own_invlists(own_invlists_),
+          quantizer(quantizer_),
+          nlist(nlist_) {
+    FAISS_THROW_IF_NOT(d_ == static_cast<size_t>(quantizer_->d));
+    is_trained = quantizer_->is_trained &&
+            (static_cast<size_t>(quantizer_->ntotal) == nlist_);
     cp.niter = 10;
 }
 
@@ -62,7 +74,7 @@ void IndexBinaryIVF::add_core(
         const idx_t* xids,
         const idx_t* precomputed_idx) {
     FAISS_THROW_IF_NOT(is_trained);
-    assert(invlists);
+    FAISS_THROW_IF_NOT_MSG(invlists, "invlists not initialized");
     direct_map.check_can_add(xids);
 
     const idx_t* idx;
@@ -78,7 +90,7 @@ void IndexBinaryIVF::add_core(
     }
 
     idx_t n_add = 0;
-    for (size_t i = 0; i < n; i++) {
+    for (idx_t i = 0; i < n; i++) {
         idx_t id = xids ? xids[i] : ntotal + i;
         idx_t list_no = idx[i];
 
@@ -120,25 +132,47 @@ void IndexBinaryIVF::search(
         idx_t k,
         int32_t* distances,
         idx_t* labels,
-        const SearchParameters* params) const {
-    FAISS_THROW_IF_NOT_MSG(
-            !params, "search params not supported for this index");
+        const SearchParameters* params_in) const {
     FAISS_THROW_IF_NOT(k > 0);
-    FAISS_THROW_IF_NOT(nprobe > 0);
+    FAISS_THROW_IF_NOT_MSG(invlists, "IVF index has no inverted lists");
+    const IVFSearchParameters* params = nullptr;
+    if (params_in) {
+        params = dynamic_cast<const IVFSearchParameters*>(params_in);
+        FAISS_THROW_IF_NOT_MSG(
+                params, "IndexBinaryIVF params have incorrect type");
+        FAISS_THROW_IF_MSG(
+                params->sel, "IDSelector is not supported for IndexBinaryIVF");
+    }
+    const size_t nprobe_ =
+            std::min(nlist, params ? params->nprobe : this->nprobe);
+    FAISS_THROW_IF_NOT(nprobe_ > 0);
 
-    const size_t nprobe_2 = std::min(nlist, this->nprobe);
-    std::unique_ptr<idx_t[]> idx(new idx_t[n * nprobe_2]);
-    std::unique_ptr<int32_t[]> coarse_dis(new int32_t[n * nprobe_2]);
+    std::unique_ptr<idx_t[]> idx(new idx_t[n * nprobe_]);
+    std::unique_ptr<int32_t[]> coarse_dis(new int32_t[n * nprobe_]);
 
     double t0 = getmillisecs();
-    quantizer->search(n, x, nprobe_2, coarse_dis.get(), idx.get());
+    quantizer->search(
+            n,
+            x,
+            nprobe_,
+            coarse_dis.get(),
+            idx.get(),
+            params ? params->quantizer_params : nullptr);
     indexIVF_stats.quantization_time += getmillisecs() - t0;
 
     t0 = getmillisecs();
-    invlists->prefetch_lists(idx.get(), n * nprobe_2);
+    invlists->prefetch_lists(idx.get(), static_cast<int>(n * nprobe_));
 
     search_preassigned(
-            n, x, k, idx.get(), coarse_dis.get(), distances, labels, false);
+            n,
+            x,
+            k,
+            idx.get(),
+            coarse_dis.get(),
+            distances,
+            labels,
+            false,
+            params);
     indexIVF_stats.search_time += getmillisecs() - t0;
 }
 
@@ -150,11 +184,11 @@ void IndexBinaryIVF::reconstruct(idx_t key, uint8_t* recons) const {
 void IndexBinaryIVF::reconstruct_n(idx_t i0, idx_t ni, uint8_t* recons) const {
     FAISS_THROW_IF_NOT(ni == 0 || (i0 >= 0 && i0 + ni <= ntotal));
 
-    for (idx_t list_no = 0; list_no < nlist; list_no++) {
+    for (size_t list_no = 0; list_no < nlist; list_no++) {
         size_t list_size = invlists->list_size(list_no);
         const idx_t* idlist = invlists->get_ids(list_no);
 
-        for (idx_t offset = 0; offset < list_size; offset++) {
+        for (size_t offset = 0; offset < list_size; offset++) {
             idx_t id = idlist[offset];
             if (!(id >= i0 && id < i0 + ni)) {
                 continue;
@@ -185,7 +219,7 @@ void IndexBinaryIVF::search_and_reconstruct(
 
     quantizer->search(n, x, nprobe_2, coarse_dis.get(), idx.get());
 
-    invlists->prefetch_lists(idx.get(), n * nprobe_2);
+    invlists->prefetch_lists(idx.get(), static_cast<int>(n * nprobe_2));
 
     // search_preassigned() with `store_pairs` enabled to obtain the list_no
     // and offset into `codes` for reconstruction
@@ -243,7 +277,8 @@ void IndexBinaryIVF::train(idx_t n, const uint8_t* x) {
         printf("Training quantizer\n");
     }
 
-    if (quantizer->is_trained && (quantizer->ntotal == nlist)) {
+    if (quantizer->is_trained &&
+        (static_cast<size_t>(quantizer->ntotal) == nlist)) {
         if (verbose) {
             printf("IVF quantizer does not need training.\n");
         }
@@ -252,7 +287,7 @@ void IndexBinaryIVF::train(idx_t n, const uint8_t* x) {
             printf("Training quantizer on %" PRId64 " vectors in %dD\n", n, d);
         }
 
-        Clustering clus(d, nlist, cp);
+        Clustering clus(d, static_cast<int>(nlist), cp);
         quantizer->reset();
 
         IndexFlatL2 index_tmp(d);
@@ -304,7 +339,9 @@ void IndexBinaryIVF::merge_from(IndexBinary& otherIndex, idx_t add_id) {
 }
 
 void IndexBinaryIVF::replace_invlists(InvertedLists* il, bool own) {
-    FAISS_THROW_IF_NOT(il->nlist == nlist && il->code_size == code_size);
+    FAISS_THROW_IF_NOT(
+            il->nlist == nlist &&
+            il->code_size == static_cast<size_t>(code_size));
     if (own_invlists) {
         delete invlists;
     }
@@ -312,68 +349,11 @@ void IndexBinaryIVF::replace_invlists(InvertedLists* il, bool own) {
     own_invlists = own;
 }
 
-namespace {
-
-template <class HammingComputer>
-struct IVFBinaryScannerL2 : BinaryInvertedListScanner {
-    HammingComputer hc;
-    size_t code_size;
-    bool store_pairs;
-
-    IVFBinaryScannerL2(size_t code_size, bool store_pairs)
-            : code_size(code_size), store_pairs(store_pairs) {}
-
-    void set_query(const uint8_t* query_vector) override {
-        hc.set(query_vector, code_size);
-    }
-
-    idx_t list_no;
-    void set_list(idx_t list_no_2, uint8_t /* coarse_dis */) override {
-        this->list_no = list_no_2;
-    }
-
-    uint32_t distance_to_code(const uint8_t* code) const override {
-        return hc.hamming(code);
-    }
+// IVFBinaryScannerL2, search_knn_hamming_count, BlockSearch,
+// BlockSearchVariableK, search_knn_hamming_per_invlist are now in
+// impl/binary_hamming/IndexBinaryIVF_impl.h (compiled per-ISA)
 
-    size_t scan_codes(
-            size_t n,
-            const uint8_t* __restrict codes,
-            const idx_t* __restrict ids,
-            int32_t* __restrict simi,
-            idx_t* __restrict idxi,
-            size_t k) const override {
-        using C = CMax<int32_t, idx_t>;
-
-        size_t nup = 0;
-        for (size_t j = 0; j < n; j++) {
-            uint32_t dis = hc.hamming(codes);
-            if (dis < simi[0]) {
-                idx_t id = store_pairs ? lo_build(list_no, j) : ids[j];
-                heap_replace_top<C>(k, simi, idxi, dis, id);
-                nup++;
-            }
-            codes += code_size;
-        }
-        return nup;
-    }
-
-    void scan_codes_range(
-            size_t n,
-            const uint8_t* __restrict codes,
-            const idx_t* __restrict ids,
-            int radius,
-            RangeQueryResult& result) const override {
-        for (size_t j = 0; j < n; j++) {
-            uint32_t dis = hc.hamming(codes);
-            if (dis < radius) {
-                int64_t id = store_pairs ? lo_build(list_no, j) : ids[j];
-                result.add(dis, id);
-            }
-            codes += code_size;
-        }
-    }
-};
+namespace {
 
 void search_knn_hamming_heap(
         const IndexBinaryIVF* ivf,
@@ -389,6 +369,10 @@ void search_knn_hamming_heap(
     idx_t nprobe = params ? params->nprobe : ivf->nprobe;
     nprobe = std::min((idx_t)ivf->nlist, nprobe);
     idx_t max_codes = params ? params->max_codes : ivf->max_codes;
+    const idx_t unlimited_list_size = std::numeric_limits<idx_t>::max();
+    if (max_codes == 0) {
+        max_codes = unlimited_list_size;
+    }
     MetricType metric_type = ivf->metric_type;
 
     // almost verbatim copy from IndexIVF::search_preassigned
@@ -403,7 +387,7 @@ void search_knn_hamming_heap(
                 ivf->get_InvertedListScanner(store_pairs));
 
 #pragma omp for
-        for (idx_t i = 0; i < n; i++) {
+        for (idx_t i = 0; i < static_cast<idx_t>(n); i++) {
             const uint8_t* xi = x + i * ivf->code_size;
             scanner->set_query(xi);
 
@@ -419,7 +403,7 @@ void search_knn_hamming_heap(
 
             size_t nscan = 0;
 
-            for (size_t ik = 0; ik < nprobe; ik++) {
+            for (idx_t ik = 0; ik < nprobe; ik++) {
                 idx_t key = keysi[ik]; /* select the list  */
                 if (key < 0) {
                     // not enough centroids for multiprobe
@@ -429,7 +413,7 @@ void search_knn_hamming_heap(
                         key < (idx_t)ivf->nlist,
                         "Invalid key=%" PRId64 " at ik=%zd nlist=%zd\n",
                         key,
-                        ik,
+                        static_cast<size_t>(ik),
                         ivf->nlist);
 
                 scanner->set_list(key, coarse_dis[i * nprobe + ik]);
@@ -437,6 +421,10 @@ void search_knn_hamming_heap(
                 nlistv++;
 
                 size_t list_size = ivf->invlists->list_size(key);
+                size_t list_size_max = static_cast<size_t>(max_codes) - nscan;
+                if (list_size > list_size_max) {
+                    list_size = list_size_max;
+                }
                 InvertedLists::ScopedCodes scodes(ivf->invlists, key);
                 std::unique_ptr<InvertedLists::ScopedIds> sids;
                 const idx_t* ids = nullptr;
@@ -451,7 +439,7 @@ void search_knn_hamming_heap(
                         list_size, scodes.get(), ids, simi, idxi, k);
 
                 nscan += list_size;
-                if (max_codes && nscan >= max_codes) {
+                if (nscan >= static_cast<size_t>(max_codes)) {
                     break;
                 }
             }
@@ -472,313 +460,17 @@ void search_knn_hamming_heap(
     indexIVF_stats.nheap_updates += nheap;
 }
 
-template <class HammingComputer, bool store_pairs>
-void search_knn_hamming_count(
-        const IndexBinaryIVF* ivf,
-        size_t nx,
-        const uint8_t* __restrict x,
-        const idx_t* __restrict keys,
-        int k,
-        int32_t* __restrict distances,
-        idx_t* __restrict labels,
-        const IVFSearchParameters* params) {
-    const int nBuckets = ivf->d + 1;
-    std::vector<int> all_counters(nx * nBuckets, 0);
-    std::unique_ptr<idx_t[]> all_ids_per_dis(new idx_t[nx * nBuckets * k]);
-
-    idx_t nprobe = params ? params->nprobe : ivf->nprobe;
-    nprobe = std::min((idx_t)ivf->nlist, nprobe);
-    idx_t max_codes = params ? params->max_codes : ivf->max_codes;
-
-    std::vector<HCounterState<HammingComputer>> cs;
-    for (size_t i = 0; i < nx; ++i) {
-        cs.push_back(
-                HCounterState<HammingComputer>(
-                        all_counters.data() + i * nBuckets,
-                        all_ids_per_dis.get() + i * nBuckets * k,
-                        x + i * ivf->code_size,
-                        ivf->d,
-                        k));
-    }
-
-    size_t nlistv = 0, ndis = 0;
-
-#pragma omp parallel for reduction(+ : nlistv, ndis)
-    for (int64_t i = 0; i < nx; i++) {
-        const idx_t* keysi = keys + i * nprobe;
-        HCounterState<HammingComputer>& csi = cs[i];
-
-        size_t nscan = 0;
-
-        for (size_t ik = 0; ik < nprobe; ik++) {
-            idx_t key = keysi[ik]; /* select the list  */
-            if (key < 0) {
-                // not enough centroids for multiprobe
-                continue;
-            }
-            FAISS_THROW_IF_NOT_FMT(
-                    key < (idx_t)ivf->nlist,
-                    "Invalid key=%" PRId64 " at ik=%zd nlist=%zd\n",
-                    key,
-                    ik,
-                    ivf->nlist);
-
-            nlistv++;
-            size_t list_size = ivf->invlists->list_size(key);
-            InvertedLists::ScopedCodes scodes(ivf->invlists, key);
-            const uint8_t* list_vecs = scodes.get();
-            const idx_t* ids =
-                    store_pairs ? nullptr : ivf->invlists->get_ids(key);
-
-            for (size_t j = 0; j < list_size; j++) {
-                const uint8_t* yj = list_vecs + ivf->code_size * j;
-
-                idx_t id = store_pairs ? (key << 32 | j) : ids[j];
-                csi.update_counter(yj, id);
-            }
-            if (ids) {
-                ivf->invlists->release_ids(key, ids);
-            }
-
-            nscan += list_size;
-            if (max_codes && nscan >= max_codes) {
-                break;
-            }
-        }
-        ndis += nscan;
-
-        int nres = 0;
-        for (int b = 0; b < nBuckets && nres < k; b++) {
-            for (int l = 0; l < csi.counters[b] && nres < k; l++) {
-                labels[i * k + nres] = csi.ids_per_dis[b * k + l];
-                distances[i * k + nres] = b;
-                nres++;
-            }
-        }
-        while (nres < k) {
-            labels[i * k + nres] = -1;
-            distances[i * k + nres] = std::numeric_limits<int32_t>::max();
-            ++nres;
-        }
-    }
-
-    indexIVF_stats.nq += nx;
-    indexIVF_stats.nlist += nlistv;
-    indexIVF_stats.ndis += ndis;
-}
-
-/* Manages NQ queries at a time, stores results */
-template <class HammingComputer, int NQ, int K>
-struct BlockSearch {
-    HammingComputer hcs[NQ];
-    // heaps to update for each query
-    int32_t* distances[NQ];
-    idx_t* labels[NQ];
-    // curent top of heap
-    int32_t heap_tops[NQ];
-
-    BlockSearch(
-            size_t code_size,
-            const uint8_t* __restrict x,
-            const int32_t* __restrict keys,
-            int32_t* __restrict all_distances,
-            idx_t* __restrict all_labels) {
-        for (idx_t q = 0; q < NQ; q++) {
-            idx_t qno = keys[q];
-            hcs[q] = HammingComputer(x + qno * code_size, code_size);
-            distances[q] = all_distances + qno * K;
-            labels[q] = all_labels + qno * K;
-            heap_tops[q] = distances[q][0];
-        }
-    }
-
-    void add_bcode(const uint8_t* bcode, idx_t id) {
-        using C = CMax<int32_t, idx_t>;
-        for (int q = 0; q < NQ; q++) {
-            int dis = hcs[q].hamming(bcode);
-            if (dis < heap_tops[q]) {
-                heap_replace_top<C>(K, distances[q], labels[q], dis, id);
-                heap_tops[q] = distances[q][0];
-            }
-        }
-    }
-};
-
-template <class HammingComputer, int NQ>
-struct BlockSearchVariableK {
-    int k;
-    HammingComputer hcs[NQ];
-    // heaps to update for each query
-    int32_t* distances[NQ];
-    idx_t* labels[NQ];
-    // curent top of heap
-    int32_t heap_tops[NQ];
-
-    BlockSearchVariableK(
-            size_t code_size,
-            int k,
-            const uint8_t* __restrict x,
-            const int32_t* __restrict keys,
-            int32_t* __restrict all_distances,
-            idx_t* __restrict all_labels)
-            : k(k) {
-        for (idx_t q = 0; q < NQ; q++) {
-            idx_t qno = keys[q];
-            hcs[q] = HammingComputer(x + qno * code_size, code_size);
-            distances[q] = all_distances + qno * k;
-            labels[q] = all_labels + qno * k;
-            heap_tops[q] = distances[q][0];
-        }
-    }
-
-    void add_bcode(const uint8_t* bcode, idx_t id) {
-        using C = CMax<int32_t, idx_t>;
-        for (int q = 0; q < NQ; q++) {
-            int dis = hcs[q].hamming(bcode);
-            if (dis < heap_tops[q]) {
-                heap_replace_top<C>(k, distances[q], labels[q], dis, id);
-                heap_tops[q] = distances[q][0];
-            }
-        }
-    }
-};
-
-template <class HammingComputer>
-void search_knn_hamming_per_invlist(
-        const IndexBinaryIVF* ivf,
-        size_t n,
-        const uint8_t* __restrict x,
-        idx_t k,
-        const idx_t* __restrict keys_in,
-        const int32_t* __restrict coarse_dis,
-        int32_t* __restrict distances,
-        idx_t* __restrict labels,
-        bool store_pairs,
-        const IVFSearchParameters* params) {
-    idx_t nprobe = params ? params->nprobe : ivf->nprobe;
-    nprobe = std::min((idx_t)ivf->nlist, nprobe);
-    idx_t max_codes = params ? params->max_codes : ivf->max_codes;
-    FAISS_THROW_IF_NOT(max_codes == 0);
-    FAISS_THROW_IF_NOT(!store_pairs);
-
-    // reorder buckets
-    std::vector<int64_t> lims(n + 1);
-    int32_t* keys = new int32_t[n * nprobe];
-    std::unique_ptr<int32_t[]> delete_keys(keys);
-    for (idx_t i = 0; i < n * nprobe; i++) {
-        keys[i] = keys_in[i];
-    }
-    matrix_bucket_sort_inplace(n, nprobe, keys, ivf->nlist, lims.data(), 0);
-
-    using C = CMax<int32_t, idx_t>;
-    heap_heapify<C>(n * k, distances, labels);
-    const size_t code_size = ivf->code_size;
-
-    for (idx_t l = 0; l < ivf->nlist; l++) {
-        idx_t l0 = lims[l], nq = lims[l + 1] - l0;
-
-        InvertedLists::ScopedCodes scodes(ivf->invlists, l);
-        InvertedLists::ScopedIds sidx(ivf->invlists, l);
-        idx_t nb = ivf->invlists->list_size(l);
-        const uint8_t* bcodes = scodes.get();
-        const idx_t* ids = sidx.get();
-
-        idx_t i = 0;
-
-        // process as much as possible by blocks
-        constexpr int BS = 4;
-
-        if (k == 1) {
-            for (; i + BS <= nq; i += BS) {
-                BlockSearch<HammingComputer, BS, 1> bc(
-                        code_size, x, keys + l0 + i, distances, labels);
-                for (idx_t j = 0; j < nb; j++) {
-                    bc.add_bcode(bcodes + j * code_size, ids[j]);
-                }
-            }
-        } else if (k == 2) {
-            for (; i + BS <= nq; i += BS) {
-                BlockSearch<HammingComputer, BS, 2> bc(
-                        code_size, x, keys + l0 + i, distances, labels);
-                for (idx_t j = 0; j < nb; j++) {
-                    bc.add_bcode(bcodes + j * code_size, ids[j]);
-                }
-            }
-        } else if (k == 4) {
-            for (; i + BS <= nq; i += BS) {
-                BlockSearch<HammingComputer, BS, 4> bc(
-                        code_size, x, keys + l0 + i, distances, labels);
-                for (idx_t j = 0; j < nb; j++) {
-                    bc.add_bcode(bcodes + j * code_size, ids[j]);
-                }
-            }
-        } else {
-            for (; i + BS <= nq; i += BS) {
-                BlockSearchVariableK<HammingComputer, BS> bc(
-                        code_size, k, x, keys + l0 + i, distances, labels);
-                for (idx_t j = 0; j < nb; j++) {
-                    bc.add_bcode(bcodes + j * code_size, ids[j]);
-                }
-            }
-        }
-
-        // leftovers
-        for (; i < nq; i++) {
-            idx_t qno = keys[l0 + i];
-            HammingComputer hc(x + qno * code_size, code_size);
-            idx_t* __restrict idxi = labels + qno * k;
-            int32_t* __restrict simi = distances + qno * k;
-            int32_t simi0 = simi[0];
-            for (idx_t j = 0; j < nb; j++) {
-                int dis = hc.hamming(bcodes + j * code_size);
-
-                if (dis < simi0) {
-                    idx_t id = store_pairs ? lo_build(l, j) : ids[j];
-                    heap_replace_top<C>(k, simi, idxi, dis, id);
-                    simi0 = simi[0];
-                }
-            }
-        }
-    }
-    for (idx_t i = 0; i < n; i++) {
-        heap_reorder<C>(k, distances + i * k, labels + i * k);
-    }
-}
-
-struct Run_search_knn_hamming_per_invlist {
-    using T = void;
-
-    template <class HammingComputer, class... Types>
-    void f(Types... args) {
-        search_knn_hamming_per_invlist<HammingComputer>(args...);
-    }
-};
-
-template <bool store_pairs>
-struct Run_search_knn_hamming_count {
-    using T = void;
-
-    template <class HammingComputer, class... Types>
-    void f(Types... args) {
-        search_knn_hamming_count<HammingComputer, store_pairs>(args...);
-    }
-};
-
-struct BuildScanner {
-    using T = BinaryInvertedListScanner*;
-
-    template <class HammingComputer>
-    T f(size_t code_size, bool store_pairs) {
-        return new IVFBinaryScannerL2<HammingComputer>(code_size, store_pairs);
-    }
-};
-
 } // anonymous namespace
 
+// The remaining template code (search_knn_hamming_count,
+// search_knn_hamming_per_invlist, etc.) has been moved to
+// impl/binary_hamming/IndexBinaryIVF_impl.h
+
 BinaryInvertedListScanner* IndexBinaryIVF::get_InvertedListScanner(
         bool store_pairs) const {
-    BuildScanner bs;
-    return dispatch_HammingComputer(code_size, bs, code_size, store_pairs);
+    return with_simd_level([&]<SIMDLevel SL>() {
+        return make_binary_ivf_scanner_fixSL<SL>(code_size, store_pairs);
+    });
 }
 
 void IndexBinaryIVF::search_preassigned(
@@ -792,23 +484,37 @@ void IndexBinaryIVF::search_preassigned(
         bool store_pairs,
         const IVFSearchParameters* params) const {
     if (per_invlist_search) {
-        Run_search_knn_hamming_per_invlist r;
-        // clang-format off
-        dispatch_HammingComputer(
-                code_size, r, this, n, x, k,
-                cidx, cdis, dis, idx, store_pairs, params);
-        // clang-format on
+        with_simd_level([&]<SIMDLevel SL>() {
+            search_knn_hamming_per_invlist_fixSL<SL>(
+                    code_size,
+                    this,
+                    n,
+                    x,
+                    k,
+                    cidx,
+                    cdis,
+                    dis,
+                    idx,
+                    store_pairs,
+                    params);
+        });
     } else if (use_heap) {
         search_knn_hamming_heap(
                 this, n, x, k, cidx, cdis, dis, idx, store_pairs, params);
-    } else if (store_pairs) { // !use_heap && store_pairs
-        Run_search_knn_hamming_count<true> r;
-        dispatch_HammingComputer(
-                code_size, r, this, n, x, cidx, k, dis, idx, params);
-    } else { // !use_heap && !store_pairs
-        Run_search_knn_hamming_count<false> r;
-        dispatch_HammingComputer(
-                code_size, r, this, n, x, cidx, k, dis, idx, params);
+    } else {
+        with_simd_level([&]<SIMDLevel SL>() {
+            search_knn_hamming_count_fixSL<SL>(
+                    code_size,
+                    store_pairs,
+                    this,
+                    n,
+                    x,
+                    cidx,
+                    k,
+                    dis,
+                    idx,
+                    params);
+        });
     }
 }
 
@@ -829,7 +535,7 @@ void IndexBinaryIVF::range_search(
     indexIVF_stats.quantization_time += getmillisecs() - t0;
 
     t0 = getmillisecs();
-    invlists->prefetch_lists(idx.get(), n * nprobe_2);
+    invlists->prefetch_lists(idx.get(), static_cast<int>(n * nprobe_2));
 
     range_search_preassigned(n, x, radius, idx.get(), coarse_dis.get(), res);
 
@@ -841,7 +547,7 @@ void IndexBinaryIVF::range_search_preassigned(
         const uint8_t* __restrict x,
         int radius,
         const idx_t* __restrict assign,
-        const int32_t* __restrict centroid_dis,
+        const int32_t* __restrict /* centroid_dis */,
         RangeSearchResult* __restrict res) const {
     const size_t nprobe_2 = std::min(nlist, this->nprobe);
     bool store_pairs = false;