Commit 450e40a9 authored by 王翔宇's avatar 王翔宇
Browse files

solve conflicts 


Former-commit-id: bf85b638927f0fe01daccc5497e0be844af67d5b
parents f7605e41 21840934

cpp/CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-601 - Docker logs error caused by get CPUTemperature error

- MS-622 - Delete vectors should be failed if date range is invalid

- MS-620 - Get table row counts display wrong error code

- MS-637 - out of memory when load too many tasks

- MS-640 - Cache object size calculate incorrect



## Improvement
@@ -38,6 +39,7 @@ Please mark all change in change log and use the ticket from JIRA. 
## New Feature

- MS-627 - Integrate new index: IVFSQHybrid

- MS-631 - IVFSQ8H Index support

- MS-636 - Add optimizer in scheduler for FAISS_IVFSQ8H



## Task

- MS-554 - Change license to Apache 2.0
@@ -50,6 +52,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-600 - Reconstruct unittest code

- MS-602 - Remove zilliz namespace

- MS-610 - Change error code base value from hex to decimal

- MS-635 - Add compile option to support customized faiss



# Milvus 0.4.0 (2019-09-12)

cpp/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ set(MILVUS_SOURCE_DIR ${PROJECT_SOURCE_DIR}) 
set(MILVUS_BINARY_DIR ${PROJECT_BINARY_DIR})

set(MILVUS_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src)



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



include(ExternalProject)

include(DefineOptions)

include(BuildUtils)

cpp/build.sh

+8 −1
Original line number Diff line number Diff line
@@ -9,9 +9,12 @@ DB_PATH="/opt/milvus" 
PROFILING="OFF"

USE_JFROG_CACHE="OFF"

RUN_CPPLINT="OFF"

CUSTOMIZATION="ON"

CUDA_COMPILER=/usr/local/cuda/bin/nvcc



while getopts "p:d:t:ulrcgjh" arg

wget -q --method HEAD



while getopts "p:d:t:ulrcgjhx" arg

do

        case $arg in

             p)
@@ -45,6 +48,9 @@ do 
             j)

                USE_JFROG_CACHE="ON"

                ;;

             x)

                CUSTOMIZATION="OFF"

                ;;

             h) # help

                echo "
@@ -87,6 +93,7 @@ CMAKE_CMD="cmake \ 
-DMILVUS_DB_PATH=${DB_PATH} \

-DMILVUS_ENABLE_PROFILING=${PROFILING} \

-DUSE_JFROG_CACHE=${USE_JFROG_CACHE} \

-DCUSTOMIZATION=${CUSTOMIZATION} \

../"

echo ${CMAKE_CMD}

${CMAKE_CMD}

cpp/src/core/cmake/ThirdPartyPackagesCore.cmake

+16 −9
Original line number Diff line number Diff line
@@ -228,17 +228,24 @@ foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT}) 
    set(${_LIB_NAME} "${_LIB_VERSION}")

endforeach()



if(DEFINED ENV{KNOWHERE_FAISS_URL})

    set(FAISS_SOURCE_URL "$ENV{KNOWHERE_FAISS_URL}")

else()

if(CUSTOMIZATION)

    set(FAISS_SOURCE_URL "http://192.168.1.105:6060/jinhai/faiss/-/archive/${FAISS_VERSION}/faiss-${FAISS_VERSION}.tar.gz")

    message(STATUS "FAISS URL = ${FAISS_SOURCE_URL}")

endif()

    # set(FAISS_MD5 "a589663865a8558205533c8ac414278c")

    # set(FAISS_MD5 "57da9c4f599cc8fa4260488b1c96e1cc") # commit-id 6dbdf75987c34a2c853bd172ea0d384feea8358c branch-0.2.0

    # set(FAISS_MD5 "21deb1c708490ca40ecb899122c01403") # commit-id 643e48f479637fd947e7b93fa4ca72b38ecc9a39 branch-0.2.0

    # set(FAISS_MD5 "072db398351cca6e88f52d743bbb9fa0") # commit-id 3a2344d04744166af41ef1a74449d68a315bfe17 branch-0.2.1

set(FAISS_MD5 "5af237d77947ee632f169bcb36feee2b") # commit-id 2c8affd0da60354e4322fa4c0224519e7912b9c4 branch-0.2.1

    set(FAISS_MD5 "94988b7bdac4eb82a9575c702a3f2df3") # commit-id 1407526b31cad26f98ceca8dddaface8f18c4c19 branch-0.2.1



    execute_process(COMMAND wget -q --method HEAD ${FAISS_SOURCE_URL} RESULT_VARIABLE return_code)

    message(STATUS "Check the remote cache file ${FAISS_SOURCE_URL}. return code = ${return_code}")

    if (NOT return_code EQUAL 0)

        set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/v1.5.3.tar.gz")

    endif()

else()

    set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/v1.5.3.tar.gz")

    set(FAISS_MD5 "0bc12737b23def156f6a1eb782050135")

endif()

message(STATUS "FAISS URL = ${FAISS_SOURCE_URL}")



if(DEFINED ENV{KNOWHERE_ARROW_URL})

    set(ARROW_SOURCE_URL "$ENV{KNOWHERE_ARROW_URL}")

cpp/src/core/knowhere/knowhere/index/vector_index/FaissBaseIndex.cpp

+2 −6
Original line number Diff line number Diff line
@@ -64,17 +64,13 @@ FaissBaseIndex::LoadImpl(const BinarySet& index_binary) { 


void

FaissBaseIndex::SealImpl() {

    // TODO(linxj): enable

    //#ifdef ZILLIZ_FAISS

#ifdef CUSTOMIZATION

    faiss::Index* index = index_.get();

    auto idx = dynamic_cast<faiss::IndexIVF*>(index);

    if (idx != nullptr) {

        idx->to_readonly();

    }

    // else {

    //    KNOHWERE_ERROR_MSG("Seal failed");

    //}

    //#endif

#endif

}



}  // namespace knowhere