Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the issue of symbols defined in omp not found #53

Merged
merged 2 commits into from
Oct 9, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix compile error
Signed-off-by: jinjiabao.jjb <jinjiabao.jjb@antgroup.com>
  • Loading branch information
jinjiabao.jjb committed Oct 8, 2024
commit 67c92541506ca95db0088371d58a5e626cadf948
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -39,12 +39,12 @@ option (ENABLE_FRAME_POINTER "Whether to build with -fno-omit-frame-pointer" ON)
option (ENABLE_THIN_LTO "Whether to build with thin lto -flto=thin" OFF)
option (ENABLE_CCACHE "Whether to open ccache" OFF)
option (ENABLE_COVERAGE "Enable gcov (debug, Linux builds only)" OFF)
option (ENABLE_INTEL_MKL "Enable intel-mkl (x86 platform only)" OFF)
option (ENABLE_INTEL_MKL "Enable intel-mkl (x86 platform only)" ON)
option (ENABLE_CXX11_ABI "Use CXX11 ABI" ON)
option (ENABLE_LIBCXX "Use libc++ instead of libstdc++" ON)
option (ENABLE_TOOLS "Whether compile vsag tools" ON)
option (DISABLE_SSE_FORCE "Force disable sse and higher instructions" OFF)
option (DISABLE_AVX_FORCE "Force disable avx and higher instructions" ON)
option (DISABLE_AVX_FORCE "Force disable avx and higher instructions" OFF)
option (DISABLE_AVX2_FORCE "Force disable avx2 and higher instructions" OFF)
option (DISABLE_AVX512_FORCE "Force disable avx512 instructions" OFF)

10 changes: 6 additions & 4 deletions extern/mkl/mkl.cmake
Original file line number Diff line number Diff line change
@@ -59,9 +59,11 @@ if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" AND ENABLE_INTEL_MKL)
endforeach()
message ("enable intel-mkl as blas backend")
else ()
set (BLAS_LIBRARIES
gomp
libopenblas.a
)
set(BLAS_LIBRARIES libopenblas.a)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
list(PREPEND BLAS_LIBRARIES omp)
else()
list(PREPEND BLAS_LIBRARIES gomp)
endif()
message ("enable openblas as blas backend")
endif ()
4 changes: 1 addition & 3 deletions extern/roaringbitmap/roaringbitmap.cmake
Original file line number Diff line number Diff line change
@@ -22,12 +22,10 @@ if (DISABLE_AVX512_FORCE OR NOT COMPILER_AVX512_SUPPORTED)
set (ROARING_DISABLE_AVX512 ON)
endif ()

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")

# exclude roaringbitmap in vsag installation
FetchContent_GetProperties(roaringbitmap)
if(NOT roaringbitmap_POPULATED)
FetchContent_Populate(roaringbitmap)
add_subdirectory(${roaringbitmap_SOURCE_DIR} ${roaringbitmap_BINARY_DIR} EXCLUDE_FROM_ALL)
target_compile_options(roaring PRIVATE -Wno-unused-function)
endif()