From ee303a525a0200933e5f4dc745af1ada78450e7a Mon Sep 17 00:00:00 2001 From: "xj.lin" Date: Wed, 4 Sep 2019 20:43:26 +0800 Subject: [PATCH] MS-476 1. fix resource mgr config Former-commit-id: 3914417a5fa92e5fe59868e3a0ccb0885fea7f9d --- cpp/src/scheduler/SchedInst.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cpp/src/scheduler/SchedInst.cpp b/cpp/src/scheduler/SchedInst.cpp index 54548540..67c12b8b 100644 --- a/cpp/src/scheduler/SchedInst.cpp +++ b/cpp/src/scheduler/SchedInst.cpp @@ -31,19 +31,21 @@ StartSchedulerService() { auto device_id = resconf.GetInt64Value(server::CONFIG_RESOURCE_DEVICE_ID); auto enable_loader = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_LOADER); auto enable_executor = resconf.GetBoolValue(server::CONFIG_RESOURCE_ENABLE_EXECUTOR); - auto pinned_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_PIN_MEMORY); - auto temp_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_TEMP_MEMORY); - auto resource_num = resconf.GetInt64Value(server::CONFIG_RESOURCE_NUM); - ResMgrInst::GetInstance()->Add(ResourceFactory::Create(resname, + auto res = 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); + if (res.lock()->Type() == ResourceType::GPU) { + auto pinned_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_PIN_MEMORY); + auto temp_memory = resconf.GetInt64Value(server::CONFIG_RESOURCE_TEMP_MEMORY); + auto resource_num = resconf.GetInt64Value(server::CONFIG_RESOURCE_NUM); + 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(); -- GitLab