提交 cf636c0c 编写于 作者: J jinhai

Merge branch 'branch-0.4.0' into 'branch-0.4.0'

MS-451 Update server_config.template file, set GPU compute default

See merge request megasearch/milvus!461

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