From cab9e5c2a68be46fefdae82f4dd02c99022a1bb6 Mon Sep 17 00:00:00 2001 From: op-hunter Date: Thu, 28 May 2020 20:57:34 +0800 Subject: [PATCH] fix bug of openblas library install fail (#2457) * fix bug of openblas library install fail Signed-off-by: cmli * fix openblas install cmakelist error Signed-off-by: cmli Co-authored-by: cmli --- CHANGELOG.md | 1 + core/src/CMakeLists.txt | 11 ++++++----- core/src/index/cmake/FindOpenBLAS.cmake | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 295bad9d44..f83b144d1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,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 diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt index 270e83f5cf..08466ac060 100644 --- a/core/src/CMakeLists.txt +++ b/core/src/CMakeLists.txt @@ -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,10 +334,10 @@ 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 - ${CMAKE_BINARY_DIR}/src/index/openblas_ep-prefix/src/openblas_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}openblas${CMAKE_SHARED_LIBRARY_SUFFIX}.0.3 - DESTINATION lib) + ${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 + ${CMAKE_BINARY_DIR}/src/index/openblas_ep-prefix/src/openblas_ep/lib/${CMAKE_SHARED_LIBRARY_PREFIX}openblas${CMAKE_SHARED_LIBRARY_SUFFIX}.0.3 + DESTINATION lib) endif() diff --git a/core/src/index/cmake/FindOpenBLAS.cmake b/core/src/index/cmake/FindOpenBLAS.cmake index 3a7b307998..f8936889da 100644 --- a/core/src/index/cmake/FindOpenBLAS.cmake +++ b/core/src/index/cmake/FindOpenBLAS.cmake @@ -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()