admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source 
Former-commit-id: e91a1292e4b65a509f1f1a749d2aac66d8d0d748
This commit is contained in:
Yu Kun 2019-09-05 15:55:49 +08:00
parent 1139157e41
commit 92aedc55b9
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cpp/src/scheduler/SchedInst.cpp
View File

@ -9,7 +9,6 @@
#include "ResourceFactory.h"
#include "knowhere/index/vector_index/gpu_ivf.h"
namespace zilliz {
namespace milvus {
namespace engine {
@ -60,20 +59,6 @@ StartSchedulerService() {
temp_memory,
resource_num);
}
ResMgrInst::GetInstance()->Add(ResourceFactory::Create(resname,
type,
device_id,
enable_loader,
enable_executor));
pinned_memory = 1024 * 1024 * pinned_memory;
temp_memory = 1024 * 1024 * temp_memory;
knowhere::FaissGpuResourceMgr::GetInstance().InitDevice(device_id,
pinned_memory,
temp_memory,
resource_num);
}
knowhere::FaissGpuResourceMgr::GetInstance().InitResource();