diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 08cd89d6defcdadab912613839be381b8dfe5b17..67a17013f4a97df1a9b46544c66b0ec06adbaa09 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -73,6 +73,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 a112bd4c4084a147d8208c8e62c8a5d5dea6a268..218dceed7a03b44277f88c1e0286998c9956d3d2 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