Commit 1e991d0f authored by zirui.chen's avatar zirui.chen
Browse files

format changelog and fix several problems

parents 98571d5f 49ec7e1a

CHANGELOG.md

+6 −14
Original line number Diff line number Diff line
@@ -4,31 +4,23 @@ Please mark all change in change log and use the ticket from JIRA. 
# Milvus 0.6.0 (TODO)



## Bug



- \#228 - memory usage increased slowly during searching vectors

- \#246 - Exclude src/external folder from code coverage for jenkin ci

- \#248 - Reside src/external in thirdparty



## 



## Feature



- \#12 - Pure CPU version for Milvus

- \#77 - Support table partition

- \#226 - Experimental shards middleware for Milvus

- #127 - Support new Index type IVFPQ



## 

- \#127 - Support new Index type IVFPQ



## Improvement



- \#275 - Rename C++ SDK IndexType

- \#284 - Change C++ SDK to shared library

- \#260 - C++ SDK README

- \#314 - add Find FAISS in CMake

- \#310 - Add Q&A for 'protocol https not supported or disable in libcurl' issue



## 



## Task



# Milvus 0.5.3 (2019-11-13)

core/CMakeLists.txt

+18 −14
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ else () 
    add_compile_definitions("MILVUS_CPU_VERSION")

endif ()



if (MILVUS_WITH_PROMETHEUS)

    add_compile_definitions("MILVUS_WITH_PROMETHEUS")

endif ()



if (CMAKE_BUILD_TYPE STREQUAL "Release")

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fPIC -DELPP_THREAD_SAFE -fopenmp")

    if (MILVUS_GPU_VERSION)

core/build.sh

+10 −4
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ CUSTOMIZATION="OFF" # default use ori faiss 
CUDA_COMPILER=/usr/local/cuda/bin/nvcc

GPU_VERSION="OFF" #defaults to CPU version

WITH_MKL="OFF"

FAISS_ROOT=""

FAISS_ROOT="" #FAISS root path

FAISS_SOURCE="BUNDLED"

WITH_PROMETHEUS="ON"



while getopts "p:d:t:f:ulrcgjhxzm" arg

while getopts "p:d:t:f:ulrcgjhxzme" arg

do

        case $arg in

             p)
@@ -64,6 +65,9 @@ do 
             m)

                WITH_MKL="ON"

                ;;

             e)

               WITH_PROMETHEUS="OFF"

                ;;

             h) # help

                echo "
@@ -80,10 +84,11 @@ parameter: 
-j: use jfrog cache build directory(default: OFF)

-g: build GPU version(default: OFF)

-m: build with MKL(default: OFF)

-e: build without prometheus

-h: help



usage:

./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} -f \${FAISS_ROOT} [-u] [-l] [-r] [-c] [-z] [-j] [-g] [-m] [-h]

./build.sh -p \${INSTALL_PREFIX} -t \${BUILD_TYPE} -f \${FAISS_ROOT} [-u] [-l] [-r] [-c] [-z] [-j] [-g] [-m] [-e] [-h]

                "

                exit 0

                ;;
@@ -118,6 +123,7 @@ CMAKE_CMD="cmake \ 
-DCUSTOMIZATION=${CUSTOMIZATION} \

-DMILVUS_GPU_VERSION=${GPU_VERSION} \

-DFAISS_WITH_MKL=${WITH_MKL} \

-DMILVUS_WITH_PROMETHEUS=${WITH_PROMETHEUS} \

../"

echo ${CMAKE_CMD}

${CMAKE_CMD}

core/conf/server_gpu_config.template

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ metric_config: 
cache_config:

  cpu_cache_capacity: 16            # GB, CPU memory used for cache, must be a positive integer

  cpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered, must be in range (0.0, 1.0]

  gpu_cache_capacity: 3             # GB, GPU memory used for cache, must be a positive integer

  gpu_cache_capacity: 4             # GB, GPU memory used for cache, must be a positive integer

  gpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered, must be in range (0.0, 1.0]

  cache_insert_data: false          # whether to load inserted data into cache, must be a boolean

core/src/CMakeLists.txt

+24 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ endforeach () 
aux_source_directory(${MILVUS_ENGINE_SRC}/cache cache_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/config config_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/metrics metrics_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/metrics/prometheus metrics_prometheus_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/db db_main_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/db/engine db_engine_files)

aux_source_directory(${MILVUS_ENGINE_SRC}/db/insert db_insert_files)
@@ -91,6 +92,11 @@ set(engine_files 
        ${wrapper_files}

        )



if (MILVUS_WITH_PROMETHEUS)

    set(engine_files ${engine_files}

            ${metrics_prometheus_files})

endif ()



set(client_grpc_lib

        grpcpp_channelz

        grpc++
@@ -115,7 +121,6 @@ set(third_party_libs 
        sqlite

        ${client_grpc_lib}

        yaml-cpp

        ${prometheus_lib}

        mysqlpp

        zlib

        ${boost_lib}
@@ -138,13 +143,19 @@ if (MILVUS_GPU_VERSION) 
            )

endif ()



if (MILVUS_ENABLE_PROFILING STREQUAL "ON")

if (MILVUS_ENABLE_PROFILING)

    set(third_party_libs ${third_party_libs}

            gperftools

            libunwind

            )

endif ()



if (MILVUS_WITH_PROMETHEUS)

    set(third_party_libs ${third_party_libs}

            ${prometheus_lib}

            )

endif ()



set(engine_libs

        pthread

        libgomp.a
@@ -166,12 +177,21 @@ target_link_libraries(milvus_engine 
        ${engine_libs}

        )



if (MILVUS_WITH_PROMETHEUS)

    add_library(metrics STATIC ${metrics_files} ${metrics_prometheus_files})

else ()

    add_library(metrics STATIC ${metrics_files})

endif ()



set(metrics_lib

        yaml-cpp

        )



if (MILVUS_WITH_PROMETHEUS)

    set(metrics_lib ${metrics_lib}

            ${prometheus_lib}

            )

endif ()



target_link_libraries(metrics ${metrics_lib})