admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-06 02:42:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix test_nsg failed bug

Browse Source
This commit is contained in:
fishpenguin 2019-11-29 20:17:37 +08:00
parent b458bdbd33
commit fdfb397918
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/db/engine/ExecutionEngineImpl.cpp
View File

@ -611,6 +611,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();

3
core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp
View File

@ -118,8 +118,7 @@ NSG::Train(const DatasetPtr& dataset, const Config& config) {
// TODO(linxj): dev IndexFactory, support more IndexType
Graph knng;
#ifdef MILVUS_GPU_VERSION
auto temp_resource = FaissGpuResourceMgr::GetInstance().GetRes(build_cfg->gpu_id);
if (temp_resource == nullptr) {
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);

2
core/src/wrapper/ConfAdapter.cpp
View File

@ -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