faiss 0.6.0 → 0.6.1

data/vendor/faiss/faiss/impl/NNDescent.cpp

@@ -23,7 +23,7 @@ namespace nndescent {
 
 void gen_random(std::mt19937& rng, int* addr, const int size, const int N);
 
-Nhood::Nhood(int l, int s, std::mt19937& rng, int N) {
+Nhood::Nhood(int /* l */, int s, std::mt19937& rng, int N) {
     M = s;
     nn_new.resize(s * 2);
     gen_random(rng, nn_new.data(), (int)nn_new.size(), N);
@@ -31,25 +31,46 @@ Nhood::Nhood(int l, int s, std::mt19937& rng, int N) {
 
 /// Copy operator
 Nhood& Nhood::operator=(const Nhood& other) {
-    M = other.M;
-    std::copy(
-            other.nn_new.begin(),
-            other.nn_new.end(),
-            std::back_inserter(nn_new));
-    nn_new.reserve(other.nn_new.capacity());
-    pool.reserve(other.pool.capacity());
+    if (this != &other) {
+        M = other.M;
+        nn_new = other.nn_new;
+        nn_old = other.nn_old;
+        rnn_new = other.rnn_new;
+        rnn_old = other.rnn_old;
+        pool = other.pool;
+    }
     return *this;
 }
 
 /// Copy constructor
-Nhood::Nhood(const Nhood& other) {
-    M = other.M;
-    std::copy(
-            other.nn_new.begin(),
-            other.nn_new.end(),
-            std::back_inserter(nn_new));
-    nn_new.reserve(other.nn_new.capacity());
-    pool.reserve(other.pool.capacity());
+Nhood::Nhood(const Nhood& other)
+        : pool(other.pool),
+          M(other.M),
+          nn_old(other.nn_old),
+          nn_new(other.nn_new),
+          rnn_old(other.rnn_old),
+          rnn_new(other.rnn_new) {}
+
+/// Move constructor
+Nhood::Nhood(Nhood&& other) noexcept
+        : pool(std::move(other.pool)),
+          M(other.M),
+          nn_old(std::move(other.nn_old)),
+          nn_new(std::move(other.nn_new)),
+          rnn_old(std::move(other.rnn_old)),
+          rnn_new(std::move(other.rnn_new)) {}
+
+/// Move assignment operator
+Nhood& Nhood::operator=(Nhood&& other) noexcept {
+    if (this != &other) {
+        M = other.M;
+        nn_new = std::move(other.nn_new);
+        nn_old = std::move(other.nn_old);
+        rnn_new = std::move(other.rnn_new);
+        rnn_old = std::move(other.rnn_old);
+        pool = std::move(other.pool);
+    }
+    return *this;
 }
 
 /// Insert a point into the candidate pool
@@ -58,7 +79,7 @@ void Nhood::insert(int id, float dist) {
     if (dist > pool.front().distance) {
         return;
     }
-    for (int i = 0; i < pool.size(); i++) {
+    for (size_t i = 0; i < pool.size(); i++) {
         if (id == pool[i].id) {
             return;
         }
@@ -90,6 +111,22 @@ void Nhood::join(C callback) const {
 }
 
 void gen_random(std::mt19937& rng, int* addr, const int size, const int N) {
+    FAISS_THROW_IF_NOT_FMT(
+            size > 0 && size <= N,
+            "gen_random: size (%d) must be > 0 and <= N (%d)",
+            size,
+            N);
+    if (size == N) {
+        // Special case: return all indices in random order
+        for (int i = 0; i < size; ++i) {
+            addr[i] = i;
+        }
+        for (int i = size - 1; i > 0; --i) {
+            int j = rng() % (i + 1);
+            std::swap(addr[i], addr[j]);
+        }
+        return;
+    }
     for (int i = 0; i < size; ++i) {
         addr[i] = rng() % (N - size);
     }
@@ -153,7 +190,7 @@ using namespace nndescent;
 
 constexpr int NUM_EVAL_POINTS = 100;
 
-NNDescent::NNDescent(const int d, const int K) : K(K), d(d) {
+NNDescent::NNDescent(const int d_in, const int K_in) : K(K_in), d(d_in) {
     L = K + 50;
 }
 
@@ -197,7 +234,7 @@ void NNDescent::update() {
         auto& nn = graph[n];
         std::sort(nn.pool.begin(), nn.pool.end());
 
-        if (nn.pool.size() > L) {
+        if (nn.pool.size() > static_cast<size_t>(L)) {
             nn.pool.resize(L);
         }
         nn.pool.reserve(L); // keep the pool size be L
@@ -238,7 +275,7 @@ void NNDescent::update() {
                     // the candidate pool of the other side
                     if (nn.distance > other.pool.back().distance) {
                         LockGuard guard(other.lock);
-                        if (other.rnn_new.size() < R) {
+                        if (other.rnn_new.size() < static_cast<size_t>(R)) {
                             other.rnn_new.push_back(n);
                         } else {
                             int pos = rng() % R;
@@ -254,7 +291,7 @@ void NNDescent::update() {
                     // the candidate pool of the other side
                     if (nn.distance > other.pool.back().distance) {
                         LockGuard guard(other.lock);
-                        if (other.rnn_old.size() < R) {
+                        if (other.rnn_old.size() < static_cast<size_t>(R)) {
                             other.rnn_old.push_back(n);
                         } else {
                             int pos = rng() % R;
@@ -280,7 +317,7 @@ void NNDescent::update() {
 
         nn_new.insert(nn_new.end(), rnn_new.begin(), rnn_new.end());
         nn_old.insert(nn_old.end(), rnn_old.begin(), rnn_old.end());
-        if (nn_old.size() > R * 2) {
+        if (nn_old.size() > static_cast<size_t>(R * 2)) {
             nn_old.resize(R * 2);
             nn_old.reserve(R * 2);
         }
@@ -294,7 +331,7 @@ void NNDescent::nndescent(DistanceComputer& qdis, bool verbose) {
     int num_eval_points = std::min(NUM_EVAL_POINTS, ntotal);
     std::vector<int> eval_points(num_eval_points);
     std::vector<std::vector<int>> acc_eval_set(num_eval_points);
-    std::mt19937 rng(random_seed * 6577 + omp_get_thread_num());
+    std::mt19937 rng(random_seed * 6577);
     gen_random(rng, eval_points.data(), eval_points.size(), ntotal);
     generate_eval_set(qdis, eval_points, acc_eval_set, ntotal);
     for (int it = 0; it < iter; it++) {
@@ -315,7 +352,7 @@ void NNDescent::generate_eval_set(
         std::vector<std::vector<int>>& v,
         int N) {
 #pragma omp parallel for
-    for (int i = 0; i < c.size(); i++) {
+    for (int i = 0; i < static_cast<int>(c.size()); i++) {
         std::vector<Neighbor> tmp;
         for (int j = 0; j < N; j++) {
             if (c[i] == j) {
@@ -488,7 +525,7 @@ void NNDescent::search(
             ++k;
         }
     }
-    for (size_t i = 0; i < topk; i++) {
+    for (int i = 0; i < topk; i++) {
         indices[i] = retset[i].id;
         dists[i] = retset[i].distance;
     }

data/vendor/faiss/faiss/impl/NNDescent.h

@@ -54,8 +54,8 @@ struct Neighbor {
     bool flag;
 
     Neighbor() = default;
-    Neighbor(int id, float distance, bool f)
-            : id(id), distance(distance), flag(f) {}
+    Neighbor(int id_in, float distance_in, bool f)
+            : id(id_in), distance(distance_in), flag(f) {}
 
     inline bool operator<(const Neighbor& other) const {
         return distance < other.distance;
@@ -80,6 +80,10 @@ struct Nhood {
 
     Nhood(const Nhood& other);
 
+    Nhood(Nhood&& other) noexcept;
+
+    Nhood& operator=(Nhood&& other) noexcept;
+
     void insert(int id, float dist);
 
     template <typename C>

data/vendor/faiss/faiss/impl/NSG.cpp

@@ -8,6 +8,7 @@
 #include <faiss/impl/NSG.h>
 
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <mutex>
 #include <stack>
@@ -42,8 +43,8 @@ struct Neighbor {
     bool flag;
 
     Neighbor() = default;
-    Neighbor(int id, float distance, bool f)
-            : id(id), distance(distance), flag(f) {}
+    Neighbor(int id_in, float distance_in, bool f)
+            : id(id_in), distance(distance_in), flag(f) {}
 
     inline bool operator<(const Neighbor& other) const {
         return distance < other.distance;
@@ -55,7 +56,7 @@ struct Node {
     float distance;
 
     Node() = default;
-    Node(int id, float distance) : id(id), distance(distance) {}
+    Node(int id_in, float distance_in) : id(id_in), distance(distance_in) {}
 
     inline bool operator<(const Node& other) const {
         return distance < other.distance;
@@ -110,10 +111,9 @@ inline int insert_into_pool(Neighbor* addr, int K, Neighbor nn) {
 
 using namespace nsg;
 
-NSG::NSG(int R) : R(R), rng(0x0903) {
+NSG::NSG(int R_in) : R(R_in), rng(0x0903) {
     L = R + 32;
     C = R + 100;
-    srand(0x1998);
 }
 
 void NSG::search(
@@ -131,7 +131,7 @@ void NSG::search(
     search_on_graph<false>(
             *final_graph, dis, vt, enterpoint, pool_size, retset, tmp);
 
-    for (size_t i = 0; i < k; i++) {
+    for (int i = 0; i < k; i++) {
         I[i] = retset[i].id;
         D[i] = retset[i].distance;
     }
@@ -179,7 +179,7 @@ void NSG::build(
     is_built = true;
 
     if (verbose) {
-        int max = 0, min = 1e6;
+        int max = 0, min = std::numeric_limits<int>::max();
         double avg = 0;
 
         for (int i = 0; i < n; i++) {
@@ -256,16 +256,18 @@ void NSG::search_on_graph(
     retset.resize(pool_size + 1);
     std::vector<int> init_ids(pool_size);
 
+    vt.reserve(pool_size);
+
     int num_ids = 0;
     std::vector<index_t> neighbors(graph.K);
     size_t nneigh = graph.get_neighbors(ep, neighbors.data());
-    for (int i = 0; i < init_ids.size() && i < nneigh; i++) {
+    for (size_t i = 0; i < init_ids.size() && i < nneigh; i++) {
         int id = (int)neighbors[i];
         if (id >= ntotal) {
             continue;
         }
 
-        init_ids[i] = id;
+        init_ids[num_ids] = id;
         vt.set(id);
         num_ids += 1;
     }
@@ -281,7 +283,7 @@ void NSG::search_on_graph(
         vt.set(id);
     }
 
-    for (int i = 0; i < init_ids.size(); i++) {
+    for (size_t i = 0; i < init_ids.size(); i++) {
         int id = init_ids[i];
 
         float dist = dis(id);
@@ -303,7 +305,7 @@ void NSG::search_on_graph(
             int n = retset[k].id;
 
             size_t nneigh_for_n = graph.get_neighbors(n, neighbors.data());
-            for (int m = 0; m < nneigh_for_n; m++) {
+            for (size_t m = 0; m < nneigh_for_n; m++) {
                 int id = neighbors[m];
                 if (id >= ntotal || vt.get(id)) {
                     continue;
@@ -397,16 +399,30 @@ void NSG::sync_prune(
 
     std::vector<Node> result;
 
+    if (pool.empty()) {
+        for (int i = 0; i < R; i++) {
+            graph.at(q, i).id = EMPTY_ID;
+        }
+        return;
+    }
+
     int start = 0;
     if (pool[start].id == q) {
         start++;
     }
+    if (start >= static_cast<int>(pool.size())) {
+        for (int i = 0; i < R; i++) {
+            graph.at(q, i).id = EMPTY_ID;
+        }
+        return;
+    }
     result.push_back(pool[start]);
 
-    while (result.size() < R && (++start) < pool.size() && start < C) {
+    while (result.size() < static_cast<size_t>(R) &&
+           (++start) < static_cast<int>(pool.size()) && start < C) {
         auto& p = pool[start];
         bool occlude = false;
-        for (int t = 0; t < result.size(); t++) {
+        for (size_t t = 0; t < result.size(); t++) {
             if (p.id == result[t].id) {
                 occlude = true;
                 break;
@@ -422,8 +438,8 @@ void NSG::sync_prune(
         }
     }
 
-    for (size_t i = 0; i < R; i++) {
-        if (i < result.size()) {
+    for (int i = 0; i < R; i++) {
+        if (static_cast<size_t>(i) < result.size()) {
             graph.at(q, i).id = result[i].id;
             graph.at(q, i).distance = result[i].distance;
         } else {
@@ -437,7 +453,7 @@ void NSG::add_reverse_links(
         std::vector<std::mutex>& locks,
         DistanceComputer& dis,
         nsg::Graph<Node>& graph) {
-    for (size_t i = 0; i < R; i++) {
+    for (int i = 0; i < R; i++) {
         if (graph.at(q, i).id == EMPTY_ID) {
             break;
         }
@@ -466,17 +482,18 @@ void NSG::add_reverse_links(
         }
 
         tmp_pool.push_back(sn);
-        if (tmp_pool.size() > R) {
+        if (tmp_pool.size() > static_cast<size_t>(R)) {
             std::vector<Node> result;
             int start = 0;
             std::sort(tmp_pool.begin(), tmp_pool.end());
             result.push_back(tmp_pool[start]);
 
-            while (result.size() < R && (++start) < tmp_pool.size()) {
+            while (result.size() < static_cast<size_t>(R) &&
+                   (++start) < static_cast<int>(tmp_pool.size())) {
                 auto& p = tmp_pool[start];
                 bool occlude = false;
 
-                for (int t = 0; t < result.size(); t++) {
+                for (size_t t = 0; t < result.size(); t++) {
                     if (p.id == result[t].id) {
                         occlude = true;
                         break;
@@ -495,7 +512,7 @@ void NSG::add_reverse_links(
 
             {
                 LockGuard guard(locks[des]);
-                for (int t = 0; t < result.size(); t++) {
+                for (size_t t = 0; t < result.size(); t++) {
                     graph.at(des, t) = result[t];
                 }
             }
@@ -614,7 +631,7 @@ int NSG::attach_unlinked(
 
     int node;
     bool found = false;
-    for (int i = 0; i < pool.size(); i++) {
+    for (size_t i = 0; i < pool.size(); i++) {
         node = pool[i].id;
         if (degrees[node] < R && node != id) {
             found = true;

data/vendor/faiss/faiss/impl/NSG.h

@@ -60,14 +60,14 @@ struct Graph {
     bool own_fields; ///< the underlying data owned by itself or not
 
     // construct from a known graph
-    Graph(node_t* data, int N, int K)
-            : data(data), K(K), N(N), own_fields(false) {}
+    Graph(node_t* data_in, int N_in, int K_in)
+            : data(data_in), K(K_in), N(N_in), own_fields(false) {}
 
     // construct an empty graph
     // NOTE: the newly allocated data needs to be destroyed at destruction time
-    Graph(int N, int K) : K(K), N(N), own_fields(true) {
+    Graph(int N_in, int K_in) : K(K_in), N(N_in), own_fields(true) {
         size_t total = faiss::mul_no_overflow(
-                (size_t)N, (size_t)K, "Graph allocation");
+                (size_t)N_in, (size_t)K_in, "Graph allocation");
         data = new node_t[total];
     }
 

data/vendor/faiss/faiss/impl/Panorama.cpp

@@ -54,16 +54,33 @@ inline void compute_cum_sums_impl(
  * Panorama structure implementation
  **************************************************************/
 
-Panorama::Panorama(size_t code_size, size_t n_levels, size_t batch_size)
-        : code_size(code_size), n_levels(n_levels), batch_size(batch_size) {
+Panorama::Panorama(
+        size_t code_size_in,
+        size_t n_levels_in,
+        size_t batch_size_in)
+        : code_size(code_size_in),
+          n_levels(n_levels_in),
+          batch_size(batch_size_in) {
     set_derived_values();
 }
 
 void Panorama::set_derived_values() {
     FAISS_THROW_IF_NOT_MSG(n_levels > 0, "Panorama: n_levels must be > 0");
     this->d = code_size / sizeof(float);
+    FAISS_THROW_IF_NOT_MSG(n_levels <= d, "Panorama: n_levels must be <= d");
     this->level_width_floats = ((d + n_levels - 1) / n_levels);
     this->level_width = this->level_width_floats * sizeof(float);
+    size_t n_real_levels = d / level_width_floats;
+    if (d > n_real_levels * level_width_floats) {
+        n_real_levels++;
+    }
+    if (this->n_levels != n_real_levels) {
+        fprintf(stderr,
+                "WARNING truncating nlevels from %zu to %zu\n",
+                this->n_levels,
+                n_real_levels);
+        this->n_levels = n_real_levels;
+    }
 }
 
 /**
@@ -146,12 +163,12 @@ void Panorama::reconstruct(idx_t key, float* recons, const uint8_t* codes_base)
 
     for (size_t level = 0; level < n_levels; level++) {
         size_t level_offset = level * level_width * batch_size;
+        size_t actual_level_width =
+                std::min(level_width, code_size - level * level_width);
         const uint8_t* src = codes_base + batch_offset + level_offset +
-                pos_in_batch * level_width;
+                pos_in_batch * actual_level_width;
         uint8_t* dest = recons_buffer + level * level_width;
-        size_t copy_size =
-                std::min(level_width, code_size - level * level_width);
-        memcpy(dest, src, copy_size);
+        memcpy(dest, src, actual_level_width);
     }
 }