Merge remote-tracking branch 'source/0.6.0' into ongoing

pull/607/head
groot 2019-11-29 16:15:47 +08:00
commit 5380e0c9df
4 changed files with 7 additions and 4 deletions

View File

@ -39,6 +39,7 @@ Please mark all change in change log and use the ticket from JIRA.
- \#596 - Frequently insert operation cost too much disk space - \#596 - Frequently insert operation cost too much disk space
- \#599 - Build index log is incorrect - \#599 - Build index log is incorrect
- \#602 - Optimizer specify wrong gpu_id - \#602 - Optimizer specify wrong gpu_id
- \#606 - No log generated during building index with CPU
## Feature ## Feature
- \#12 - Pure CPU version for Milvus - \#12 - Pure CPU version for Milvus
@ -51,6 +52,7 @@ Please mark all change in change log and use the ticket from JIRA.
- \#488 - Add log in scheduler/optimizer - \#488 - Add log in scheduler/optimizer
- \#502 - C++ SDK support IVFPQ and SPTAG - \#502 - C++ SDK support IVFPQ and SPTAG
- \#560 - Add version in server config file - \#560 - Add version in server config file
- \#605 - Print more messages when server start
## Improvement ## Improvement
- \#255 - Add ivfsq8 test report detailed version - \#255 - Add ivfsq8 test report detailed version

View File

@ -21,10 +21,10 @@ spec:
tty: true tty: true
resources: resources:
limits: limits:
memory: "32Gi" memory: "12Gi"
cpu: "8.0" cpu: "8.0"
requests: requests:
memory: "16Gi" memory: "8Gi"
cpu: "4.0" cpu: "4.0"
- name: milvus-mysql - name: milvus-mysql
image: mysql:5.6 image: mysql:5.6

View File

@ -21,11 +21,11 @@ spec:
tty: true tty: true
resources: resources:
limits: limits:
memory: "32Gi" memory: "12Gi"
cpu: "8.0" cpu: "8.0"
nvidia.com/gpu: 1 nvidia.com/gpu: 1
requests: requests:
memory: "16Gi" memory: "8Gi"
cpu: "4.0" cpu: "4.0"
- name: milvus-mysql - name: milvus-mysql
image: mysql:5.6 image: mysql:5.6

View File

@ -205,6 +205,7 @@ Config::ValidateConfig() {
return s; return s;
} }
std::cout << "GPU resources " << (gpu_resource_enable ? "ENABLED !" : "DISABLED !") << std::endl;
if (gpu_resource_enable) { if (gpu_resource_enable) {
int64_t resource_cache_capacity; int64_t resource_cache_capacity;
s = GetGpuResourceConfigCacheCapacity(resource_cache_capacity); s = GetGpuResourceConfigCacheCapacity(resource_cache_capacity);