|
| 1 | +--- src/faiss-1.10.0/faiss/CMakeLists.txt 2025-02-01 05:52:00.000000000 +0800 |
| 2 | ++++ src/faiss-1.10.0/faiss/CMakeLists.txt.new 2025-03-28 19:45:37.513624103 +0800 |
| 3 | +@@ -381,19 +381,51 @@ |
| 4 | + target_link_libraries(faiss_avx512 PRIVATE ${MKL_LIBRARIES}) |
| 5 | + target_link_libraries(faiss_avx512_spr PRIVATE ${MKL_LIBRARIES}) |
| 6 | + else() |
| 7 | +- find_package(BLAS REQUIRED) |
| 8 | +- target_link_libraries(faiss PRIVATE ${BLAS_LIBRARIES}) |
| 9 | +- target_link_libraries(faiss_avx2 PRIVATE ${BLAS_LIBRARIES}) |
| 10 | +- target_link_libraries(faiss_avx512 PRIVATE ${BLAS_LIBRARIES}) |
| 11 | +- target_link_libraries(faiss_avx512_spr PRIVATE ${BLAS_LIBRARIES}) |
| 12 | +- target_link_libraries(faiss_sve PRIVATE ${BLAS_LIBRARIES}) |
| 13 | ++ # If not found through find_package, look in the DORIS_THIRD_LIB_INSTALL_DIR |
| 14 | ++ if(DEFINED DORIS_THIRD_LIB_INSTALL_DIR) |
| 15 | ++ set(OpenBLAS_ROOT ${DORIS_THIRD_LIB_INSTALL_DIR}) |
| 16 | ++ |
| 17 | ++ # Check if libopenblas exists in DORIS_THIRD_LIB_INSTALL_DIR |
| 18 | ++ if(EXISTS "${DORIS_THIRD_LIB_INSTALL_DIR}/lib/libopenblas.a") |
| 19 | ++ set(OpenBLAS_LIB "${DORIS_THIRD_LIB_INSTALL_DIR}/lib/libopenblas.a") |
| 20 | ++ endif() |
| 21 | ++ # Terminate if OpenBLAS_LIB is not found |
| 22 | ++ if(NOT OpenBLAS_LIB) |
| 23 | ++ message(WARNING "OpenBLAS not found in DORIS_THIRD_LIB_INSTALL_DIR: ${DORIS_THIRD_LIB_INSTALL_DIR}") |
| 24 | ++ endif() |
| 25 | + |
| 26 | +- find_package(LAPACK REQUIRED) |
| 27 | +- target_link_libraries(faiss PRIVATE ${LAPACK_LIBRARIES}) |
| 28 | +- target_link_libraries(faiss_avx2 PRIVATE ${LAPACK_LIBRARIES}) |
| 29 | +- target_link_libraries(faiss_avx512 PRIVATE ${LAPACK_LIBRARIES}) |
| 30 | +- target_link_libraries(faiss_avx512_spr PRIVATE ${LAPACK_LIBRARIES}) |
| 31 | +- target_link_libraries(faiss_sve PRIVATE ${LAPACK_LIBRARIES}) |
| 32 | ++ if(OpenBLAS_LIB) |
| 33 | ++ set(OpenBLAS_LIBRARIES ${OpenBLAS_LIB}) |
| 34 | ++ set(OpenBLAS_FOUND TRUE) |
| 35 | ++ message(STATUS "Found OpenBLAS in DORIS_THIRD_LIB_INSTALL_DIR: ${OpenBLAS_LIB}") |
| 36 | ++ endif() |
| 37 | ++ else() |
| 38 | ++ message(WARNING "DORIS_THIRD_LIB_INSTALL_DIR is not defined. Please set it to the directory where OpenBLAS is installed.") |
| 39 | ++ endif() |
| 40 | ++ |
| 41 | ++ if(OpenBLAS_FOUND) |
| 42 | ++ message(STATUS "Using OpenBLAS: ${OpenBLAS_LIBRARIES}") |
| 43 | ++ target_link_libraries(faiss PRIVATE ${OpenBLAS_LIBRARIES}) |
| 44 | ++ target_link_libraries(faiss_avx2 PRIVATE ${OpenBLAS_LIBRARIES}) |
| 45 | ++ target_link_libraries(faiss_avx512 PRIVATE ${OpenBLAS_LIBRARIES}) |
| 46 | ++ target_link_libraries(faiss_avx512_spr PRIVATE ${OpenBLAS_LIBRARIES}) |
| 47 | ++ target_link_libraries(faiss_sve PRIVATE ${OpenBLAS_LIBRARIES}) |
| 48 | ++ else() |
| 49 | ++ # Fall back to separate BLAS and LAPACK if OpenBLAS is not found |
| 50 | ++ find_package(BLAS REQUIRED) |
| 51 | ++ target_link_libraries(faiss PRIVATE ${BLAS_LIBRARIES}) |
| 52 | ++ target_link_libraries(faiss_avx2 PRIVATE ${BLAS_LIBRARIES}) |
| 53 | ++ target_link_libraries(faiss_avx512 PRIVATE ${BLAS_LIBRARIES}) |
| 54 | ++ target_link_libraries(faiss_avx512_spr PRIVATE ${BLAS_LIBRARIES}) |
| 55 | ++ target_link_libraries(faiss_sve PRIVATE ${BLAS_LIBRARIES}) |
| 56 | ++ |
| 57 | ++ find_package(LAPACK REQUIRED) |
| 58 | ++ target_link_libraries(faiss PRIVATE ${LAPACK_LIBRARIES}) |
| 59 | ++ target_link_libraries(faiss_avx2 PRIVATE ${LAPACK_LIBRARIES}) |
| 60 | ++ target_link_libraries(faiss_avx512 PRIVATE ${LAPACK_LIBRARIES}) |
| 61 | ++ target_link_libraries(faiss_avx512_spr PRIVATE ${LAPACK_LIBRARIES}) |
| 62 | ++ target_link_libraries(faiss_sve PRIVATE ${LAPACK_LIBRARIES}) |
| 63 | ++ endif() |
| 64 | + endif() |
| 65 | + |
| 66 | + install(TARGETS faiss |
0 commit comments