faiss 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18db7914c6db421beb972845cdf1d6489f179d6347f2cc52252b5908c7dd2db0
-  data.tar.gz: fcbc66c8b544a9f96e913c4e4e3d7a8be8c450d56db0332bc3ea1810776e424b
+  metadata.gz: '08fc3bcca329e78e913982923c3fb3743e07591ffd717f5f3027e0609037b5de'
+  data.tar.gz: 2a1a79aeaef1756a974fe7e9c3448794496ef145046da39aae3b6ce04a9bf131
 SHA512:
-  metadata.gz: a885807f3c74cb4ce27a5931f7f2b73dc3ec9bd214c06e96d191086a841d1f366e1d8ebbe9af35143c8facd1285070d0f0b46814f5a78d1d55fb0b1821ab3fa3
-  data.tar.gz: f7ec06da8dc75e0341763f15501e2bc503ef3001dee29c88a0b0253ce78c38cb5e5b222ec75b26814a7c9f2a69e02e1ff685f108d3a4512ef8bf55e5a42214ce
+  metadata.gz: 86e6528125608c64ab9bec3f289019cc0a4125e6719d8c43ca7e9f8eb09cb57ce42f9e040fd0290969f45f70fb25c789a50de7aceef07c38b0acb5ca5e674c49
+  data.tar.gz: 4efe37e9e855ab4da2e620e391ac817e6bfa808ca227ea047b55eaff4e7cfdae4c5af59d35b57963653d208e50334edc048fc168fd6d49f805cdb07d3dbc115e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.1 (2026-05-23)
+
+- Updated Faiss to 1.14.2
+
 ## 0.6.0 (2026-04-06)
 
 - Updated Faiss to 1.14.1

data/ext/faiss/extconf.rb

@@ -34,7 +34,8 @@ vendor = File.expand_path("../../vendor/faiss", __dir__)
 
 $srcs = Dir["{#{ext},#{vendor}/faiss,#{vendor}/faiss/{impl,invlists,utils}/**}/*.{cpp}"]
 $srcs -= ["avx2", "avx512", "aarch64", "arm_sve"].map { |v| "#{vendor}/faiss/utils/simd_impl/distances_#{v}.cpp" }
+$objs = $srcs.map { |v| v.sub(/cpp\z/, "o") }
 abort "Faiss not found" unless find_header("faiss/Index.h", vendor)
-$VPATH += $srcs.filter_map { |v| File.dirname(v) if v.start_with?(vendor) }.uniq
+$VPATH << vendor
 
 create_makefile("faiss/ext")

data/ext/faiss/{index_rb.cpp → index.cpp}

@@ -22,7 +22,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils_rb.h"
+#include "utils.h"
 
 namespace Rice::detail {
   template<>

data/ext/faiss/index_binary.cpp

@@ -13,7 +13,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils_rb.h"
+#include "utils.h"
 
 void init_index_binary(Rice::Module& m) {
   Rice::define_class_under<faiss::IndexBinary>(m, "IndexBinary")

data/ext/faiss/kmeans.cpp

@@ -6,7 +6,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils_rb.h"
+#include "utils.h"
 
 void init_kmeans(Rice::Module& m) {
   Rice::define_class_under<faiss::Clustering>(m, "Kmeans")

data/ext/faiss/pca_matrix.cpp

@@ -4,7 +4,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils_rb.h"
+#include "utils.h"
 
 void init_pca_matrix(Rice::Module& m) {
   Rice::define_class_under<faiss::PCAMatrix>(m, "PCAMatrix")

data/ext/faiss/product_quantizer.cpp

@@ -5,7 +5,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils_rb.h"
+#include "utils.h"
 
 void init_product_quantizer(Rice::Module& m) {
   Rice::define_class_under<faiss::ProductQuantizer>(m, "ProductQuantizer")

data/ext/faiss/{utils_rb.cpp → utils.cpp}

@@ -3,7 +3,7 @@
 #include <rice/rice.hpp>
 
 #include "numo.hpp"
-#include "utils_rb.h"
+#include "utils.h"
 
 size_t check_shape(const numo::NArray& objects, size_t k) {
   size_t ndim = objects.ndim();

data/lib/faiss/version.rb

@@ -1,3 +1,3 @@
 module Faiss
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/vendor/faiss/faiss/AutoTune.cpp

@@ -33,35 +33,36 @@
 
 namespace faiss {
 
-AutoTuneCriterion::AutoTuneCriterion(idx_t nq, idx_t nnn)
-        : nq(nq), nnn(nnn), gt_nnn(0) {}
+AutoTuneCriterion::AutoTuneCriterion(idx_t nq_in, idx_t nnn_in)
+        : nq(nq_in), nnn(nnn_in), gt_nnn(0) {}
 
 void AutoTuneCriterion::set_groundtruth(
-        int gt_nnn,
+        int gt_nnn_in,
         const float* gt_D_in,
         const idx_t* gt_I_in) {
-    this->gt_nnn = gt_nnn;
+    this->gt_nnn = gt_nnn_in;
     if (gt_D_in) { // allow null for this, as it is often not used
-        gt_D.resize(nq * gt_nnn);
-        memcpy(gt_D.data(), gt_D_in, sizeof(gt_D[0]) * nq * gt_nnn);
+        gt_D.resize(nq * gt_nnn_in);
+        memcpy(gt_D.data(), gt_D_in, sizeof(gt_D[0]) * nq * gt_nnn_in);
     }
-    gt_I.resize(nq * gt_nnn);
-    memcpy(gt_I.data(), gt_I_in, sizeof(gt_I[0]) * nq * gt_nnn);
+    gt_I.resize(nq * gt_nnn_in);
+    memcpy(gt_I.data(), gt_I_in, sizeof(gt_I[0]) * nq * gt_nnn_in);
 }
 
-OneRecallAtRCriterion::OneRecallAtRCriterion(idx_t nq, idx_t R)
-        : AutoTuneCriterion(nq, R), R(R) {}
+OneRecallAtRCriterion::OneRecallAtRCriterion(idx_t nq_in, idx_t R_in)
+        : AutoTuneCriterion(nq_in, R_in), R(R_in) {}
 
 double OneRecallAtRCriterion::evaluate(const float* /*D*/, const idx_t* I)
         const {
     FAISS_THROW_IF_NOT_MSG(
-            (gt_I.size() == gt_nnn * nq && gt_nnn >= 1 && nnn >= R),
+            (gt_I.size() == static_cast<size_t>(gt_nnn * nq) && gt_nnn >= 1 &&
+             nnn >= R),
             "ground truth not initialized");
     idx_t n_ok = 0;
     for (idx_t q = 0; q < nq; q++) {
         idx_t gt_nn = gt_I[q * gt_nnn];
         const idx_t* I_line = I + q * nnn;
-        for (int i = 0; i < R; i++) {
+        for (idx_t i = 0; i < R; i++) {
             if (I_line[i] == gt_nn) {
                 n_ok++;
                 break;
@@ -71,13 +72,14 @@ double OneRecallAtRCriterion::evaluate(const float* /*D*/, const idx_t* I)
     return n_ok / double(nq);
 }
 
-IntersectionCriterion::IntersectionCriterion(idx_t nq, idx_t R)
-        : AutoTuneCriterion(nq, R), R(R) {}
+IntersectionCriterion::IntersectionCriterion(idx_t nq_in, idx_t R_in)
+        : AutoTuneCriterion(nq_in, R_in), R(R_in) {}
 
 double IntersectionCriterion::evaluate(const float* /*D*/, const idx_t* I)
         const {
     FAISS_THROW_IF_NOT_MSG(
-            (gt_I.size() == gt_nnn * nq && gt_nnn >= R && nnn >= R),
+            (gt_I.size() == static_cast<size_t>(gt_nnn * nq) && gt_nnn >= R &&
+             nnn >= R),
             "ground truth not initialized");
     int64_t n_ok = 0;
 #pragma omp parallel for reduction(+ : n_ok)
@@ -126,14 +128,14 @@ bool OperatingPoints::add(
             return false;
         }
     } else {
-        int i;
+        size_t i;
         // stricto sensu this should be a bisection
         for (i = 0; i < a.size(); i++) {
             if (a[i].perf >= perf) {
                 break;
             }
         }
-        assert(i < a.size());
+        FAISS_THROW_IF_NOT(i < a.size());
         if (t < a[i].t) {
             if (a[i].perf == perf) {
                 a[i] = op;
@@ -145,7 +147,7 @@ bool OperatingPoints::add(
         }
     }
     // remove non-optimal points from array
-    for (int i = a.size() - 1; i > 0; --i) {
+    for (size_t i = a.size() - 1; i > 0; --i) {
         if (a[i].t < a[i - 1].t) {
             a.erase(a.begin() + (i - 1));
         }
@@ -157,7 +159,7 @@ int OperatingPoints::merge_with(
         const OperatingPoints& other,
         const std::string& prefix) {
     int n_add = 0;
-    for (int i = 0; i < other.all_pts.size(); i++) {
+    for (size_t i = 0; i < other.all_pts.size(); i++) {
         const OperatingPoint& op = other.all_pts[i];
         if (add(op.perf, op.t, prefix + op.key, op.cno)) {
             n_add++;
@@ -172,7 +174,7 @@ double OperatingPoints::t_for_perf(double perf) const {
     if (perf > a.back().perf) {
         return 1e50;
     }
-    int i0 = -1, i1 = a.size() - 1;
+    int i0 = -1, i1 = static_cast<int>(a.size()) - 1;
     while (i0 + 1 < i1) {
         int imed = (i0 + i1 + 1) / 2;
         if (a[imed].perf < perf) {
@@ -191,7 +193,7 @@ void OperatingPoints::all_to_gnuplot(const char* fname) const {
         perror("");
         abort();
     }
-    for (int i = 0; i < all_pts.size(); i++) {
+    for (size_t i = 0; i < all_pts.size(); i++) {
         const OperatingPoint& op = all_pts[i];
         fprintf(f, "%g %g %s\n", op.perf, op.t, op.key.c_str());
     }
@@ -206,7 +208,7 @@ void OperatingPoints::optimal_to_gnuplot(const char* fname) const {
         abort();
     }
     double prev_perf = 0.0;
-    for (int i = 0; i < optimal_pts.size(); i++) {
+    for (size_t i = 0; i < optimal_pts.size(); i++) {
         const OperatingPoint& op = optimal_pts[i];
         fprintf(f, "%g %g\n", prev_perf, op.t);
         fprintf(f, "%g %g %s\n", op.perf, op.t, op.key.c_str());
@@ -222,11 +224,11 @@ void OperatingPoints::display(bool only_optimal) const {
            all_pts.size(),
            optimal_pts.size());
 
-    for (int i = 0; i < pts.size(); i++) {
+    for (size_t i = 0; i < pts.size(); i++) {
         const OperatingPoint& op = pts[i];
         const char* star = "";
         if (!only_optimal) {
-            for (int j = 0; j < optimal_pts.size(); j++) {
+            for (size_t j = 0; j < optimal_pts.size(); j++) {
                 if (op.cno == optimal_pts[j].cno) {
                     star = "*";
                     break;
@@ -269,7 +271,7 @@ ParameterSpace::ParameterSpace (Index *index):
 
 size_t ParameterSpace::n_combinations() const {
     size_t n = 1;
-    for (int i = 0; i < parameter_ranges.size(); i++) {
+    for (size_t i = 0; i < parameter_ranges.size(); i++) {
         n *= parameter_ranges[i].values.size();
     }
     return n;
@@ -277,9 +279,10 @@ size_t ParameterSpace::n_combinations() const {
 
 /// get string representation of the combination
 std::string ParameterSpace::combination_name(size_t cno) const {
-    char buf[1000], *wp = buf;
+    char buf[1000];
+    char* wp = buf;
     *wp = 0;
-    for (int i = 0; i < parameter_ranges.size(); i++) {
+    for (size_t i = 0; i < parameter_ranges.size(); i++) {
         FAISS_THROW_IF_NOT_MSG(
                 buf + 1000 - wp >= 0, "Overflow detected in snprintf");
         const ParameterRange& pr = parameter_ranges[i];
@@ -297,8 +300,8 @@ std::string ParameterSpace::combination_name(size_t cno) const {
 }
 
 bool ParameterSpace::combination_ge(size_t c1, size_t c2) const {
-    for (int i = 0; i < parameter_ranges.size(); i++) {
-        int nval = parameter_ranges[i].values.size();
+    for (size_t i = 0; i < parameter_ranges.size(); i++) {
+        size_t nval = parameter_ranges[i].values.size();
         size_t j1 = c1 % nval;
         size_t j2 = c2 % nval;
         if (!(j1 >= j2)) {
@@ -316,7 +319,7 @@ static void init_pq_ParameterRange(
     if (pq.code_size % 4 == 0) {
         // Polysemous not supported for code sizes that are not a
         // multiple of 4
-        for (int i = 2; i <= pq.code_size * 8 / 2; i += 2) {
+        for (size_t i = 2; i <= pq.code_size * 8 / 2; i += 2) {
             pr.values.push_back(i);
         }
     }
@@ -336,22 +339,22 @@ ParameterRange& ParameterSpace::add_range(const std::string& name) {
 
 // Do not use this macro if ix will be unused
 #define DC(classname) \
-    const classname* ix = dynamic_cast<const classname*>(index)
+    const classname* ix_c = dynamic_cast<const classname*>(index)
 
 /// initialize with reasonable parameters for this type of index
 void ParameterSpace::initialize(const Index* index) {
     if (DC(IndexPreTransform)) {
-        index = ix->index;
+        index = ix_c->index;
     }
     if (DC(IndexRefine)) {
         ParameterRange& pr = add_range("k_factor_rf");
         for (int i = 0; i <= 6; i++) {
             pr.values.push_back(1 << i);
         }
-        index = ix->base_index;
+        index = ix_c->base_index;
     }
     if (DC(IndexPreTransform)) {
-        index = ix->index;
+        index = ix_c->index;
     }
 
     if (DC(IndexIVFInterface)) {
@@ -359,14 +362,14 @@ void ParameterSpace::initialize(const Index* index) {
             ParameterRange& pr = add_range("nprobe");
             for (int i = 0; i < 13; i++) {
                 size_t nprobe = 1 << i;
-                if (nprobe >= ix->nlist) {
+                if (nprobe >= ix_c->nlist) {
                     break;
                 }
                 pr.values.push_back(nprobe);
             }
         }
         ParameterSpace ivf_pspace;
-        ivf_pspace.initialize(ix->quantizer);
+        ivf_pspace.initialize(ix_c->quantizer);
 
         for (const ParameterRange& p : ivf_pspace.parameter_ranges) {
             ParameterRange& pr = add_range("quantizer_" + p.name);
@@ -375,16 +378,16 @@ void ParameterSpace::initialize(const Index* index) {
     }
     if (DC(IndexPQ)) {
         ParameterRange& pr = add_range("ht");
-        init_pq_ParameterRange(ix->pq, pr);
+        init_pq_ParameterRange(ix_c->pq, pr);
     }
     if (DC(IndexIVFPQ)) {
         ParameterRange& pr = add_range("ht");
-        init_pq_ParameterRange(ix->pq, pr);
+        init_pq_ParameterRange(ix_c->pq, pr);
     }
 
     if (DC(IndexIVF)) {
         const MultiIndexQuantizer* miq =
-                dynamic_cast<const MultiIndexQuantizer*>(ix->quantizer);
+                dynamic_cast<const MultiIndexQuantizer*>(ix_c->quantizer);
         if (miq) {
             ParameterRange& pr_max_codes = add_range("max_codes");
             for (int i = 8; i < 20; i++) {
@@ -415,7 +418,7 @@ static void set_index_parameters_common(
         const ParameterSpace* ps,
         size_t cno,
         SetParamFunc set_param) {
-    for (int i = 0; i < ps->parameter_ranges.size(); i++) {
+    for (size_t i = 0; i < ps->parameter_ranges.size(); i++) {
         const ParameterRange& pr = ps->parameter_ranges[i];
         size_t j = cno % pr.values.size();
         cno /= pr.values.size();
@@ -481,7 +484,7 @@ void ParameterSpace::set_index_parameters(
 
 // non-const version
 // Do not use this macro if ix will be unused
-#define DC(classname) classname* ix = dynamic_cast<classname*>(index)
+#define DC(classname) classname* ix_ = dynamic_cast<classname*>(index)
 
 void ParameterSpace::set_index_parameter(
         Index* index,
@@ -496,11 +499,11 @@ void ParameterSpace::set_index_parameter(
         // and fall through to also enable it on sub-indexes
     }
     if (DC(IndexIDMap)) {
-        set_index_parameter(ix->index, name, val);
+        set_index_parameter(ix_->index, name, val);
         return;
     }
     if (DC(IndexPreTransform)) {
-        set_index_parameter(ix->index, name, val);
+        set_index_parameter(ix_->index, name, val);
         return;
     }
     if (DC(IndexShardsIVF)) {
@@ -509,7 +512,7 @@ void ParameterSpace::set_index_parameter(
         if (name.find("quantizer_") == 0 && name != "nprobe" &&
             name != "quantizer_nprobe") {
             std::string sub_name = name.substr(strlen("quantizer_"));
-            set_index_parameter(ix->quantizer, sub_name, val);
+            set_index_parameter(ix_->quantizer, sub_name, val);
             return;
         }
     }
@@ -518,16 +521,16 @@ void ParameterSpace::set_index_parameter(
         auto fn = [this, name, val](int /* no */, Index* subIndex) {
             set_index_parameter(subIndex, name, val);
         };
-        ix->runOnIndex(fn);
+        ix_->runOnIndex(fn);
         return;
     }
     if (DC(IndexRefine)) {
         if (name == "k_factor_rf") {
-            ix->k_factor = int(val);
+            ix_->k_factor = int(val);
             return;
         }
         // otherwise it is for the sub-index
-        set_index_parameter(ix->base_index, name, val);
+        set_index_parameter(ix_->base_index, name, val);
         return;
     }
 
@@ -537,25 +540,26 @@ void ParameterSpace::set_index_parameter(
 
     if (name == "nprobe") {
         if (DC(IndexIVF)) {
-            ix->nprobe = int(val);
+            ix_->nprobe = int(val);
             return;
         }
     }
 
     if (name == "ht") {
         if (DC(IndexPQ)) {
-            if (val >= ix->pq.code_size * 8) {
-                ix->search_type = IndexPQ::ST_PQ;
+            if (val >= ix_->pq.code_size * 8) {
+                ix_->search_type = IndexPQ::ST_PQ;
             } else {
-                ix->search_type = IndexPQ::ST_polysemous;
-                ix->polysemous_ht = int(val);
+                ix_->search_type = IndexPQ::ST_polysemous;
+                ix_->polysemous_ht = int(val);
             }
             return;
-        } else if (DC(IndexIVFPQ)) {
-            if (val >= ix->pq.code_size * 8) {
-                ix->polysemous_ht = 0;
+        }
+        if (DC(IndexIVFPQ)) {
+            if (val >= ix_->pq.code_size * 8) {
+                ix_->polysemous_ht = 0;
             } else {
-                ix->polysemous_ht = int(val);
+                ix_->polysemous_ht = int(val);
             }
             return;
         }
@@ -563,24 +567,31 @@ void ParameterSpace::set_index_parameter(
 
     if (name == "k_factor") {
         if (DC(IndexIVFPQR)) {
-            ix->k_factor = val;
+            ix_->k_factor = val;
             return;
         }
     }
     if (name == "max_codes") {
         if (DC(IndexIVF)) {
-            ix->max_codes = std::isfinite(val) ? size_t(val) : 0;
+            ix_->max_codes = std::isfinite(val) ? size_t(val) : 0;
+            return;
+        }
+    }
+
+    if (name == "prune_headroom") {
+        if (DC(IndexHNSW)) {
+            ix_->hnsw.prune_headroom = val;
             return;
         }
     }
 
     if (name == "efConstruction") {
         if (DC(IndexHNSW)) {
-            ix->hnsw.efConstruction = int(val);
+            ix_->hnsw.efConstruction = int(val);
             return;
         }
         if (DC(IndexIVF)) {
-            if (IndexHNSW* cq = dynamic_cast<IndexHNSW*>(ix->quantizer)) {
+            if (IndexHNSW* cq = dynamic_cast<IndexHNSW*>(ix_->quantizer)) {
                 cq->hnsw.efConstruction = int(val);
                 return;
             }
@@ -589,11 +600,11 @@ void ParameterSpace::set_index_parameter(
 
     if (name == "efSearch") {
         if (DC(IndexHNSW)) {
-            ix->hnsw.efSearch = int(val);
+            ix_->hnsw.efSearch = int(val);
             return;
         }
         if (DC(IndexIVF)) {
-            if (IndexHNSW* cq = dynamic_cast<IndexHNSW*>(ix->quantizer)) {
+            if (IndexHNSW* cq = dynamic_cast<IndexHNSW*>(ix_->quantizer)) {
                 cq->hnsw.efSearch = int(val);
                 return;
             }
@@ -603,7 +614,7 @@ void ParameterSpace::set_index_parameter(
     if (name.find("quantizer_") == 0) {
         if (DC(IndexIVF)) {
             std::string sub_name = name.substr(strlen("quantizer_"));
-            set_index_parameter(ix->quantizer, sub_name, val);
+            set_index_parameter(ix_->quantizer, sub_name, val);
             return;
         }
     }
@@ -628,7 +639,7 @@ void ParameterSpace::set_index_parameter(
     }
 
     if (DC(IndexBinaryIDMap)) {
-        set_index_parameter(ix->index, name, val);
+        set_index_parameter(ix_->index, name, val);
         return;
     }
 
@@ -638,26 +649,26 @@ void ParameterSpace::set_index_parameter(
 
     if (name == "nprobe") {
         if (DC(IndexBinaryIVF)) {
-            ix->nprobe = int(val);
+            ix_->nprobe = int(val);
             return;
         }
     }
 
     if (name == "max_codes") {
         if (DC(IndexBinaryIVF)) {
-            ix->max_codes = std::isfinite(val) ? size_t(val) : 0;
+            ix_->max_codes = std::isfinite(val) ? size_t(val) : 0;
             return;
         }
     }
 
     if (name == "efConstruction") {
         if (DC(IndexBinaryHNSW)) {
-            ix->hnsw.efConstruction = int(val);
+            ix_->hnsw.efConstruction = int(val);
             return;
         }
         if (DC(IndexBinaryIVF)) {
             if (IndexBinaryHNSW* cq =
-                        dynamic_cast<IndexBinaryHNSW*>(ix->quantizer)) {
+                        dynamic_cast<IndexBinaryHNSW*>(ix_->quantizer)) {
                 cq->hnsw.efConstruction = int(val);
                 return;
             }
@@ -666,12 +677,12 @@ void ParameterSpace::set_index_parameter(
 
     if (name == "efSearch") {
         if (DC(IndexBinaryHNSW)) {
-            ix->hnsw.efSearch = int(val);
+            ix_->hnsw.efSearch = int(val);
             return;
         }
         if (DC(IndexBinaryIVF)) {
             if (IndexBinaryHNSW* cq =
-                        dynamic_cast<IndexBinaryHNSW*>(ix->quantizer)) {
+                        dynamic_cast<IndexBinaryHNSW*>(ix_->quantizer)) {
                 cq->hnsw.efSearch = int(val);
                 return;
             }
@@ -681,7 +692,7 @@ void ParameterSpace::set_index_parameter(
     if (name.find("quantizer_") == 0) {
         if (DC(IndexBinaryIVF)) {
             std::string sub_name = name.substr(strlen("quantizer_"));
-            set_index_parameter(ix->quantizer, sub_name, val);
+            set_index_parameter(ix_->quantizer, sub_name, val);
             return;
         }
     }
@@ -698,11 +709,11 @@ void ParameterSpace::display() const {
     printf("ParameterSpace, %zd parameters, %zd combinations:\n",
            parameter_ranges.size(),
            n_combinations());
-    for (int i = 0; i < parameter_ranges.size(); i++) {
+    for (size_t i = 0; i < parameter_ranges.size(); i++) {
         const ParameterRange& pr = parameter_ranges[i];
         printf("   %s: ", pr.name.c_str());
         char sep = '[';
-        for (int j = 0; j < pr.values.size(); j++) {
+        for (size_t j = 0; j < pr.values.size(); j++) {
             printf("%c %g", sep, pr.values[j]);
             sep = ',';
         }
@@ -734,7 +745,8 @@ void ParameterSpace::explore(
         const AutoTuneCriterion& crit,
         OperatingPoints* ops) const {
     FAISS_THROW_IF_NOT_MSG(
-            nq == crit.nq, "criterion does not have the same nb of queries");
+            nq == static_cast<size_t>(crit.nq),
+            "criterion does not have the same nb of queries");
 
     size_t n_comb = n_combinations();
 
@@ -765,7 +777,7 @@ void ParameterSpace::explore(
         return;
     }
 
-    int n_exp = n_experiments;
+    size_t n_exp = static_cast<size_t>(n_experiments);
 
     if (n_exp > n_comb) {
         n_exp = n_comb;
@@ -775,9 +787,9 @@ void ParameterSpace::explore(
     // make sure the slowest and fastest experiment are run
     perm[0] = 0;
     if (n_comb > 1) {
-        perm[1] = n_comb - 1;
+        perm[1] = static_cast<int>(n_comb - 1);
         rand_perm(&perm[2], n_comb - 2, 1234);
-        for (int i = 2; i < perm.size(); i++) {
+        for (size_t i = 2; i < perm.size(); i++) {
             perm[i]++;
         }
     }
@@ -786,7 +798,7 @@ void ParameterSpace::explore(
         size_t cno = perm[xp];
 
         if (verbose) {
-            printf("  %zd/%d: cno=%zd %s ",
+            printf("  %zd/%zd: cno=%zd %s ",
                    xp,
                    n_exp,
                    cno,
@@ -796,7 +808,7 @@ void ParameterSpace::explore(
         {
             double lower_bound_t = 0.0;
             double upper_bound_perf = 1.0;
-            for (int i = 0; i < ops->all_pts.size(); i++) {
+            for (size_t i = 0; i < ops->all_pts.size(); i++) {
                 update_bounds(
                         cno,
                         ops->all_pts[i],
@@ -827,7 +839,8 @@ void ParameterSpace::explore(
         do {
             if (thread_over_batches) {
 #pragma omp parallel for
-                for (idx_t q0 = 0; q0 < nq; q0 += batchsize) {
+                for (int64_t q0 = 0; q0 < static_cast<int64_t>(nq);
+                     q0 += batchsize) {
                     size_t q1 = q0 + batchsize;
                     if (q1 > nq) {
                         q1 = nq;