Merge branch '0.6.0' of github.com:milvus-io/milvus into 0.6.0

CHANGELOG.md

@@ -34,8 +34,10 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#533 - NSG build failed with MetricType Inner Product
 - \#543 - client raise exception in shards when search results is empty
 - \#545 - Avoid dead circle of build index thread when error occurs
+- \#547 - NSG build failed using GPU-edition if set gpu_enable false
 - \#552 - Server down during building index_type: IVF_PQ using GPU-edition
 - \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error
+- \#579 - Build index hang in GPU version when gpu_resources disabled
 - \#599 - Build index log is incorrect
 - \#602 - Optimizer specify wrong gpu_id
 - \#606 - No log generated during building index with CPU

core/src/db/DBImpl.cpp

@@ -1033,11 +1033,7 @@ DBImpl::BuildTableIndexRecursively(const std::string& table_id, const TableIndex
     if (!failed_files.empty()) {
         std::string msg = "Failed to build index for " + std::to_string(failed_files.size()) +
                           ((failed_files.size() == 1) ? " file" : " files");
-#ifdef MILVUS_GPU_VERSION
-        msg += ", file size is too large or gpu memory is not enough.";
-#else
         msg += ", please double check index parameters.";
-#endif
         return Status(DB_ERROR, msg);
     }
 

core/src/db/engine/ExecutionEngineImpl.cpp

@@ -86,6 +86,11 @@ ExecutionEngineImpl::ExecutionEngineImpl(VecIndexPtr index, const std::string& l
 
 VecIndexPtr
 ExecutionEngineImpl::CreatetVecIndex(EngineType type) {
+#ifdef MILVUS_GPU_VERSION
+    server::Config& config = server::Config::GetInstance();
+    bool gpu_resource_enable = true;
+    config.GetGpuResourceConfigEnable(gpu_resource_enable);
+#endif
     std::shared_ptr<VecIndex> index;
     switch (type) {
         case EngineType::FAISS_IDMAP: {
@@ -94,18 +99,20 @@ ExecutionEngineImpl::CreatetVecIndex(EngineType type) {
         }
         case EngineType::FAISS_IVFFLAT: {
 #ifdef MILVUS_GPU_VERSION
-            index = GetVecIndexFactory(IndexType::FAISS_IVFFLAT_MIX);
+            if (gpu_resource_enable)
-#else
+                index = GetVecIndexFactory(IndexType::FAISS_IVFFLAT_MIX);
-            index = GetVecIndexFactory(IndexType::FAISS_IVFFLAT_CPU);
+            else
 #endif
+                index = GetVecIndexFactory(IndexType::FAISS_IVFFLAT_CPU);
             break;
         }
         case EngineType::FAISS_IVFSQ8: {
 #ifdef MILVUS_GPU_VERSION
-            index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_MIX);
+            if (gpu_resource_enable)
-#else
+                index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_MIX);
-            index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_CPU);
+            else
 #endif
+                index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_CPU);
             break;
         }
         case EngineType::NSG_MIX: {
@@ -120,10 +127,11 @@ ExecutionEngineImpl::CreatetVecIndex(EngineType type) {
 #endif
         case EngineType::FAISS_PQ: {
 #ifdef MILVUS_GPU_VERSION
-            index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_MIX);
+            if (gpu_resource_enable)
-#else
+                index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_MIX);
-            index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_CPU);
+            else
 #endif
+                index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_CPU);
             break;
         }
         case EngineType::SPTAG_KDT: {
@@ -611,6 +619,9 @@ ExecutionEngineImpl::Init() {
     server::Config& config = server::Config::GetInstance();
     std::vector<int64_t> gpu_ids;
     Status s = config.GetGpuResourceConfigBuildIndexResources(gpu_ids);
+    if (!s.ok()) {
+        gpu_num_ = knowhere::INVALID_VALUE;
+    }
     for (auto id : gpu_ids) {
         if (gpu_num_ == id) {
             return Status::OK();

core/src/grpc/README.md

@@ -1,6 +0,0 @@
-We manually change two APIs in "milvus.pb.h":
-    add_vector_data()
-    add_row_id_array()
-    add_ids()
-    add_distances()
-If proto files need be generated again, remember to re-change above APIs.

core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp

@@ -116,17 +116,28 @@ NSG::Train(const DatasetPtr& dataset, const Config& config) {
     }
 
     // TODO(linxj): dev IndexFactory, support more IndexType
+    Graph knng;
 #ifdef MILVUS_GPU_VERSION
-    auto preprocess_index = std::make_shared<GPUIVF>(build_cfg->gpu_id);
+    if (build_cfg->gpu_id == knowhere::INVALID_VALUE) {
+        auto preprocess_index = std::make_shared<IVF>();
+        auto model = preprocess_index->Train(dataset, config);
+        preprocess_index->set_index_model(model);
+        preprocess_index->AddWithoutIds(dataset, config);
+        preprocess_index->GenGraph(build_cfg->knng, knng, dataset, config);
+    } else {
+        auto preprocess_index = std::make_shared<GPUIVF>(build_cfg->gpu_id);
+        auto model = preprocess_index->Train(dataset, config);
+        preprocess_index->set_index_model(model);
+        preprocess_index->AddWithoutIds(dataset, config);
+        preprocess_index->GenGraph(build_cfg->knng, knng, dataset, config);
+    }
 #else
     auto preprocess_index = std::make_shared<IVF>();
-#endif
     auto model = preprocess_index->Train(dataset, config);
     preprocess_index->set_index_model(model);
     preprocess_index->AddWithoutIds(dataset, config);
-
-    Graph knng;
     preprocess_index->GenGraph(build_cfg->knng, knng, dataset, config);
+#endif
 
     algo::BuildParams b_params;
     b_params.candidate_pool_size = build_cfg->candidate_pool_size;

core/src/scheduler/SchedInst.h

@@ -25,6 +25,7 @@
 #include "optimizer/BuildIndexPass.h"
 #include "optimizer/FaissFlatPass.h"
 #include "optimizer/FaissIVFFlatPass.h"
+#include "optimizer/FaissIVFPQPass.h"
 #include "optimizer/FaissIVFSQ8HPass.h"
 #include "optimizer/FaissIVFSQ8Pass.h"
 #include "optimizer/FallbackPass.h"
@@ -129,7 +130,10 @@ class OptimizerInst {
                     pass_list.push_back(std::make_shared<FaissFlatPass>());
                     pass_list.push_back(std::make_shared<FaissIVFFlatPass>());
                     pass_list.push_back(std::make_shared<FaissIVFSQ8Pass>());
+#ifdef CUSTOMIZATION
                     pass_list.push_back(std::make_shared<FaissIVFSQ8HPass>());
+#endif
+                    pass_list.push_back(std::make_shared<FaissIVFPQPass>());
                 }
 #endif
                 pass_list.push_back(std::make_shared<FallbackPass>());

core/src/scheduler/optimizer/FaissIVFPQPass.cpp

@@ -0,0 +1,74 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+#ifdef MILVUS_GPU_VERSION
+#include "scheduler/optimizer/FaissIVFPQPass.h"
+#include "cache/GpuCacheMgr.h"
+#include "scheduler/SchedInst.h"
+#include "scheduler/Utils.h"
+#include "scheduler/task/SearchTask.h"
+#include "scheduler/tasklabel/SpecResLabel.h"
+#include "server/Config.h"
+#include "utils/Log.h"
+
+namespace milvus {
+namespace scheduler {
+
+void
+FaissIVFPQPass::Init() {
+#ifdef MILVUS_GPU_VERSION
+    server::Config& config = server::Config::GetInstance();
+    Status s = config.GetEngineConfigGpuSearchThreshold(threshold_);
+    if (!s.ok()) {
+        threshold_ = std::numeric_limits<int32_t>::max();
+    }
+    s = config.GetGpuResourceConfigSearchResources(gpus);
+    if (!s.ok()) {
+        throw;
+    }
+#endif
+}
+
+bool
+FaissIVFPQPass::Run(const TaskPtr& task) {
+    if (task->Type() != TaskType::SearchTask) {
+        return false;
+    }
+
+    auto search_task = std::static_pointer_cast<XSearchTask>(task);
+    if (search_task->file_->engine_type_ != (int)engine::EngineType::FAISS_PQ) {
+        return false;
+    }
+
+    auto search_job = std::static_pointer_cast<SearchJob>(search_task->job_.lock());
+    ResourcePtr res_ptr;
+    if (search_job->nq() < threshold_) {
+        SERVER_LOG_DEBUG << "FaissIVFPQPass: nq < gpu_search_threshold, specify cpu to search!";
+        res_ptr = ResMgrInst::GetInstance()->GetResource("cpu");
+    } else {
+        auto best_device_id = count_ % gpus.size();
+        SERVER_LOG_DEBUG << "FaissIVFPQPass: nq > gpu_search_threshold, specify gpu" << best_device_id << " to search!";
+        count_++;
+        res_ptr = ResMgrInst::GetInstance()->GetResource(ResourceType::GPU, gpus[best_device_id]);
+    }
+    auto label = std::make_shared<SpecResLabel>(res_ptr);
+    task->label() = label;
+    return true;
+}
+
+}  // namespace scheduler
+}  // namespace milvus
+#endif

core/src/scheduler/optimizer/FaissIVFPQPass.h

@@ -0,0 +1,58 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+#ifdef MILVUS_GPU_VERSION
+#pragma once
+
+#include <condition_variable>
+#include <deque>
+#include <limits>
+#include <list>
+#include <memory>
+#include <mutex>
+#include <queue>
+#include <string>
+#include <thread>
+#include <unordered_map>
+#include <vector>
+
+#include "Pass.h"
+
+namespace milvus {
+namespace scheduler {
+
+class FaissIVFPQPass : public Pass {
+ public:
+    FaissIVFPQPass() = default;
+
+ public:
+    void
+    Init() override;
+
+    bool
+    Run(const TaskPtr& task) override;
+
+ private:
+    int64_t threshold_ = std::numeric_limits<int64_t>::max();
+    int64_t count_ = 0;
+    std::vector<int64_t> gpus;
+};
+
+using FaissIVFPQPassPtr = std::shared_ptr<FaissIVFPQPass>;
+
+}  // namespace scheduler
+}  // namespace milvus
+#endif

core/src/wrapper/ConfAdapter.cpp

@@ -39,8 +39,6 @@ void
 ConfAdapter::MatchBase(knowhere::Config conf) {
     if (conf->metric_type == knowhere::DEFAULT_TYPE)
         conf->metric_type = knowhere::METRICTYPE::L2;
-    if (conf->gpu_id == knowhere::INVALID_VALUE)
-        conf->gpu_id = 0;
 }
 
 knowhere::Config