Remove parallel_mode (milvus-io#1027)

Signed-off-by: Yudong Cai <yudong.cai@zilliz.com>
yiwangdr · Aug 9, 2023 · 2de62cb · 2de62cb
1 parent 9881230
commit 2de62cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/src/index/ivf/ivf.cc b/src/index/ivf/ivf.cc
@@ -375,15 +375,10 @@ IvfIndexNode<T>::Search(const DataSet& dataset, const Config& cfg, const BitsetV
     auto k = ivf_cfg.k.value();
     auto nprobe = ivf_cfg.nprobe.value();
 
-    int parallel_mode = 0;
-    if (nprobe > 1 && rows <= 4) {
-        parallel_mode = 1;
-    }
     int64_t* ids(new (std::nothrow) int64_t[rows * k]);
     float* distances(new (std::nothrow) float[rows * k]);
     int32_t* i_distances = reinterpret_cast<int32_t*>(distances);
     try {
-        size_t max_codes = 0;
         std::vector<folly::Future<folly::Unit>> futs;
         futs.reserve(rows);
         for (int i = 0; i < rows; ++i) {
@@ -401,11 +396,10 @@ IvfIndexNode<T>::Search(const DataSet& dataset, const Config& cfg, const BitsetV
                 } else if constexpr (std::is_same<T, faiss::IndexIVFFlat>::value) {
                     auto cur_data = (const float*)data + index * dim;
                     index_->search_without_codes_thread_safe(1, cur_data, k, distances + offset, ids + offset, nprobe,
-                                                             parallel_mode, max_codes, bitset);
+                                                             0, bitset);
                 } else {
                     auto cur_data = (const float*)data + index * dim;
-                    index_->search_thread_safe(1, cur_data, k, distances + offset, ids + offset, nprobe, parallel_mode,
-                                               max_codes, bitset);
+                    index_->search_thread_safe(1, cur_data, k, distances + offset, ids + offset, nprobe, 0, bitset);
                 }
             }));
         }

diff --git a/thirdparty/faiss/faiss/IndexIVF.h b/thirdparty/faiss/faiss/IndexIVF.h
@@ -271,7 +271,6 @@ struct IndexIVF : Index, Level1Quantizer {
             float* distances,
             idx_t* labels,
             const size_t nprobe,
-            const int parallel_mode,
             const size_t max_codes,
             const BitsetView bitset = nullptr) const;
 
@@ -283,7 +282,6 @@ struct IndexIVF : Index, Level1Quantizer {
             float* distances,
             idx_t* labels,
             const size_t nprobe,
-            const int parallel_mode,
             const size_t max_codes,
             const BitsetView bitset = nullptr) const;
 

diff --git a/thirdparty/faiss/faiss/IndexIVFThreadSafe.cpp b/thirdparty/faiss/faiss/IndexIVFThreadSafe.cpp
@@ -42,14 +42,12 @@ void IndexIVF::search_thread_safe(
         float* distances,
         idx_t* labels,
         const size_t nprobe,
-        const int parallel_mode,
         const size_t max_codes,
         const BitsetView bitset) const {
     FAISS_THROW_IF_NOT(k > 0);
     const size_t final_nprobe = std::min(nlist, nprobe);
     FAISS_THROW_IF_NOT(final_nprobe > 0);
-    IVFSearchParameters params =
-            gen_search_param(final_nprobe, parallel_mode, max_codes);
+    IVFSearchParameters params = gen_search_param(final_nprobe, 0, max_codes);
 
     // search function for a subset of queries
     auto sub_search_func = [this, k, final_nprobe, bitset, &params](
@@ -132,14 +130,12 @@ void IndexIVF::search_without_codes_thread_safe(
         float* distances,
         idx_t* labels,
         const size_t nprobe,
-        const int parallel_mode,
         const size_t max_codes,
         const BitsetView bitset) const {
     FAISS_THROW_IF_NOT(k > 0);
     const size_t final_nprobe = std::min(nlist, nprobe);
     FAISS_THROW_IF_NOT(final_nprobe > 0);
-    IVFSearchParameters params =
-            gen_search_param(final_nprobe, parallel_mode, max_codes);
+    IVFSearchParameters params = gen_search_param(final_nprobe, 0, max_codes);
 
     // search function for a subset of queries
     auto sub_search_func = [this, k, final_nprobe, bitset, &params](