Unverified Commit 9e68e4e6 authored by op-hunter's avatar op-hunter Committed by GitHub
Browse files

fix bug of openblas library install fail (#2457) 



* fix bug of openblas library install fail

Signed-off-by: default avatarcmli <chengming.li@zilliz.com>

* fix openblas install cmakelist error

Signed-off-by: default avatarcmli <chengming.li@zilliz.com>

Co-authored-by: default avatarcmli <chengming.li@zilliz.com>
parent 1676f7cf

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#2399 The nlist set by the user may not take effect

-   \#2403 MySQL max_idle_time is 10 by default

-   \#2450 The deleted vectors may be found on GPU

-   \#2456 openblas library install failed



## Feature

core/src/CMakeLists.txt

+6 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ include_directories(${MILVUS_THIRDPARTY_SRC}) 
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status)

include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)



set(FOUND_OPENBLAS "unknown")

add_subdirectory(index)

if (FAISS_WITH_MKL)

    add_compile_definitions("WITH_MKL")
@@ -333,7 +334,7 @@ install(FILES 
        ${CMAKE_BINARY_DIR}/fiu_ep-prefix/src/fiu_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}fiu${CMAKE_SHARED_LIBRARY_SUFFIX}.1.00

        DESTINATION lib)



if(EXISTS ${CMAKE_BINARY_DIR}/src/index/openblas_ep-prefix/src/openblas_ep/lib/)

if (FOUND_OPENBLAS STREQUAL "false")

    install(FILES

        ${CMAKE_BINARY_DIR}/src/index/openblas_ep-prefix/src/openblas_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}openblas${CMAKE_SHARED_LIBRARY_SUFFIX}

        ${CMAKE_BINARY_DIR}/src/index/openblas_ep-prefix/src/openblas_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}openblas${CMAKE_SHARED_LIBRARY_SUFFIX}.0

core/src/index/cmake/FindOpenBLAS.cmake

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ else() 
    endif()



    if (OpenBLAS_FOUND)

        set(FOUND_OPENBLAS "true" PARENT_SCOPE)

        set(OpenBLAS_LIBRARIES ${OpenBLAS_LIB})

        STRING(REGEX REPLACE "/libopenblas.so" "" OpenBLAS_LIB_DIR ${OpenBLAS_LIBRARIES})

        message(STATUS "find OpenBLAS libraries:${OpenBLAS_LIBRARIES} ")
@@ -78,6 +79,7 @@ else() 
            message(STATUS "Found OpenBLAS include: ${OpenBLAS_INCLUDE_DIR}")

        endif()

    else()

        set(FOUND_OPENBLAS "false" PARENT_SCOPE)

        if (OpenBLAS_FIND_REQUIRED)

            message(FATAL_ERROR "Could not find OpenBLAS")

        endif()