Commit 68d5693a authored by 余昆's avatar 余昆
Browse files

Merge remote-tracking branch 'upstream/0.5.1' into branch-0.5.1-yk 


Former-commit-id: 2af5f3b5de04c3834c70ae1a5380b3bba40fe0bf
parents 49105e44 b60677b4

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Please mark all change in change log and use the ticket from JIRA. 
# Milvus 0.5.1 (TODO)



## Bug

- \#134 - JFrog cache error



## Feature

- \#90 - The server start error messages could be improved to enhance user experience

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/cmake/ThirdPartyPackages.cmake

+193 −182
Original line number Diff line number Diff line
@@ -108,6 +108,13 @@ if (UNIX) 
                if (UBUNTU_FOUND)

                    set(CMAKE_OS_NAME "ubuntu" CACHE STRING "Operating system name" FORCE)

                    set(DEBIAN_FOUND FALSE)



                    find_program(LSB_RELEASE_EXEC lsb_release)

                    execute_process(COMMAND ${LSB_RELEASE_EXEC} -rs

                            OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT

                            OUTPUT_STRIP_TRAILING_WHITESPACE

                            )

                    STRING(REGEX REPLACE "\\." "_" UBUNTU_VERSION ${LSB_RELEASE_ID_SHORT})

                endif (UBUNTU_FOUND)

            endif (UBUNTU_EXTRA)

        endif (DEBIAN_FOUND)
@@ -130,7 +137,11 @@ if(USE_JFROG_CACHE STREQUAL "ON") 
    if (NOT DEFINED JFROG_ARTFACTORY_URL)

        message(FATAL_ERROR "JFROG_ARTFACTORY_URL is not set")

    endif ()

    if (UBUNTU_FOUND)

        set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${UBUNTU_VERSION}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")

    else ()

        set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")

    endif ()

    if (DEFINED ENV{JFROG_USER_NAME})

        set(JFROG_USER_NAME "$ENV{JFROG_USER_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")