Commit 5380e0c9 authored by groot's avatar groot
Browse files

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

parents 22e86eb0 3566fbbc

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -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

- \#599 - Build index log is incorrect

- \#602 - Optimizer specify wrong gpu_id

- \#606 - No log generated during building index with CPU



## Feature

- \#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

- \#502 - C++ SDK support IVFPQ and SPTAG

- \#560 - Add version in server config file

- \#605 - Print more messages when server start



## Improvement

- \#255 - Add ivfsq8 test report detailed version

ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ spec: 
    tty: true

    resources:

      limits:

        memory: "32Gi"

        memory: "12Gi"

        cpu: "8.0"

      requests:

        memory: "16Gi"

        memory: "8Gi"

        cpu: "4.0"

  - name: milvus-mysql

    image: mysql:5.6

ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ spec: 
    tty: true

    resources:

      limits:

        memory: "32Gi"

        memory: "12Gi"

        cpu: "8.0"

        nvidia.com/gpu: 1

      requests:

        memory: "16Gi"

        memory: "8Gi"

        cpu: "4.0"

  - name: milvus-mysql

    image: mysql:5.6

core/src/server/Config.cpp

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ Config::ValidateConfig() { 
        return s;

    }



    std::cout << "GPU resources " << (gpu_resource_enable ? "ENABLED !" : "DISABLED !") << std::endl;

    if (gpu_resource_enable) {

        int64_t resource_cache_capacity;

        s = GetGpuResourceConfigCacheCapacity(resource_cache_capacity);