From 2e892c8ac3b741adfd9e890c9b29b88622e4fe19 Mon Sep 17 00:00:00 2001
From: wxyu <xy.wang@zilliz.com>
Date: Sat, 31 Aug 2019 15:47:52 +0800
Subject: [PATCH] MS-451 Update server_config.template file, set GPU compute
 default

Former-commit-id: a2ab91f2390243498fbc0814989412b90b56e627
---
 cpp/CHANGELOG.md                |  1 +
 cpp/conf/server_config.template | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index 1d367916..7d873721 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -71,6 +71,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-440 - Add DumpTaskTables in sdk
 - MS-442 - Merge Knowhere
 - MS-445 - Rename CopyCompleted to LoadCompleted
+- MS-451 - Update server_config.template file, set GPU compute default
 
 ## New Feature
 - MS-343 - Implement ResourceMgr
diff --git a/cpp/conf/server_config.template b/cpp/conf/server_config.template
index a112bd4c..218dceed 100644
--- a/cpp/conf/server_config.template
+++ b/cpp/conf/server_config.template
@@ -64,26 +64,26 @@ resource_config:
       memory: 64
       device_id: 0
       enable_loader: true
-      enable_executor: true
+      enable_executor: false
 
-#    gtx1060:
-#      type: GPU
-#      memory: 6
-#      device_id: 0
-#      enable_loader: true
-#      enable_executor: true
+    gpu0:
+      type: GPU
+      memory: 6
+      device_id: 0
+      enable_loader: true
+      enable_executor: true
 
 #    gtx1660:
 #      type: GPU
 #      memory: 6
 #      device_id: 1
-#      enable_loader: false
-#      enable_executor: false
+#      enable_loader: true
+#      enable_executor: true
 
   # connection list, length: 0~N
   # format: -${resource_name}===${resource_name}
   connections:
     - ssda===cpu
-#    - cpu===gtx1060
+    - cpu===gpu0
 #    - cpu===gtx1660
 
-- 
GitLab