提交 f74a9d87 编写于 作者: Y Yu Kun

fix conflicts


Former-commit-id: 2e966f35f2cd490e8bf88bc35672df5cf5881572
上级 e2776ebd
......@@ -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();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册