From 92aedc55b9c4bf967794b5bcd4461043e9bdafea Mon Sep 17 00:00:00 2001
From: Yu Kun <kun.yu@zilliz.com>
Date: Thu, 5 Sep 2019 15:55:49 +0800
Subject: [PATCH] fix conflicts

Former-commit-id: e91a1292e4b65a509f1f1a749d2aac66d8d0d748
---
 cpp/src/scheduler/SchedInst.cpp | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/cpp/src/scheduler/SchedInst.cpp b/cpp/src/scheduler/SchedInst.cpp
index bbffe719..7fcbf827 100644
--- a/cpp/src/scheduler/SchedInst.cpp
+++ b/cpp/src/scheduler/SchedInst.cpp
@@ -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();
-- 
GitLab