Commit a048b6a5 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #145 from JinHai-CN/0.5.1 

Update from internal milvus

Former-commit-id: 6d3877dc5ff22a7dc24fb0362eb7aba66651122a
parents 87b80491 62887680

core/CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -32,10 +32,14 @@ string(REGEX REPLACE "\n" "" BUILD_TIME ${BUILD_TIME}) 
message(STATUS "Build time = ${BUILD_TIME}")



MACRO (GET_GIT_BRANCH_NAME GIT_BRANCH_NAME)

    execute_process(COMMAND "git" symbolic-ref --short HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    execute_process(COMMAND "git" rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    if(GIT_BRANCH_NAME STREQUAL "")

        execute_process(COMMAND "git" symbolic-ref --short -q HEAD OUTPUT_VARIABLE ${GIT_BRANCH_NAME})

    endif()

ENDMACRO (GET_GIT_BRANCH_NAME)



GET_GIT_BRANCH_NAME(GIT_BRANCH_NAME)

message(STATUS "GIT_BRANCH_NAME = ${GIT_BRANCH_NAME}")

if(NOT GIT_BRANCH_NAME STREQUAL "")

    string(REGEX REPLACE "\n" "" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})

endif()

core/src/index/cmake/ThirdPartyPackagesCore.cmake

+2 −1
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ if(CUSTOMIZATION) 
        # set(FAISS_MD5 "072db398351cca6e88f52d743bbb9fa0") # commit-id 3a2344d04744166af41ef1a74449d68a315bfe17 branch-0.2.1

        # set(FAISS_MD5 "c89ea8e655f5cdf58f42486f13614714") # commit-id 9c28a1cbb88f41fa03b03d7204106201ad33276b branch-0.2.1

        # set(FAISS_MD5 "87fdd86351ffcaf3f80dc26ade63c44b") # commit-id 841a156e67e8e22cd8088e1b58c00afbf2efc30b branch-0.2.1

         set(FAISS_MD5 "f3b2ce3364c3fa7febd3aa7fdd0fe380") # commit-id 694e03458e6b69ce8a62502f71f69a614af5af8f branch-0.3.0

        # set(FAISS_MD5 "f3b2ce3364c3fa7febd3aa7fdd0fe380") # commit-id 694e03458e6b69ce8a62502f71f69a614af5af8f branch-0.3.0

         set(FAISS_MD5 "bb30722c22390ce5f6759ccb216c1b2a") # commit-id d324db297475286afe107847c7fb7a0f9dc7e90e branch-0.3.0

    endif()

else()

    set(FAISS_SOURCE_URL "https://github.com/milvus-io/faiss/archive/1.6.0.tar.gz")