mirror of
https://gitee.com/milvus-io/milvus.git
synced 2024-12-05 05:18:52 +08:00
Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-70: cmake: remove redundant libs in src See merge request megasearch/vecwise_engine!70 Former-commit-id: 15e5c8958db1776676cf0a5ee140afd2fc67fe7a
This commit is contained in:
commit
475f4d1ffc
@ -16,6 +16,7 @@ Please mark all change in change log and use the ticket from JIRA.
|
||||
- MS-52 - Return search score
|
||||
- MS-66 - Support time range query
|
||||
- MS-68 - Remove rocksdb from third-party
|
||||
- MS-70 - cmake: remove redundant libs in src
|
||||
|
||||
## Task
|
||||
|
||||
|
@ -54,33 +54,12 @@ set(get_sys_info_files
|
||||
license/GetSysInfo.cpp)
|
||||
|
||||
include_directories(/usr/include)
|
||||
include_directories(/usr/local/cuda/include)
|
||||
include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include")
|
||||
include_directories(thrift/gen-cpp)
|
||||
|
||||
|
||||
#target_link_libraries(megasearch boost_system_static)
|
||||
#target_link_libraries(megasearch boost_filesystem_static)
|
||||
#target_link_libraries(megasearch boost_serialization_static)
|
||||
#target_link_libraries(megasearch bzip2)
|
||||
#target_link_libraries(megasearch easyloggingpp)
|
||||
#target_link_libraries(megasearch faiss)
|
||||
#target_link_libraries(megasearch gtest)
|
||||
#target_link_libraries(megasearch lapack)
|
||||
#target_link_libraries(megasearch lz4)
|
||||
#target_link_libraries(megasearch openblas)
|
||||
#target_link_libraries(megasearch rocksdb)
|
||||
#target_link_libraries(megasearch snappy)
|
||||
#target_link_libraries(megasearch sqlite)
|
||||
#target_link_libraries(megasearch sqlite_orm)
|
||||
#target_link_libraries(megasearch thrift)
|
||||
#target_link_libraries(megasearch yaml-cpp)
|
||||
#target_link_libraries(megasearch zlib)
|
||||
#target_link_libraries(megasearch zstd)
|
||||
|
||||
set(third_party_libs
|
||||
easyloggingpp
|
||||
sqlite
|
||||
# sqlite_orm
|
||||
thrift
|
||||
yaml-cpp
|
||||
faiss
|
||||
@ -102,47 +81,31 @@ set(third_party_libs
|
||||
)
|
||||
|
||||
if (GPU_VERSION STREQUAL "ON")
|
||||
link_directories(/usr/local/cuda/lib64)
|
||||
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
|
||||
set(engine_libs
|
||||
pthread
|
||||
libfaiss.a
|
||||
libgpufaiss.a
|
||||
libgomp.a
|
||||
libopenblas.a
|
||||
libgfortran.a
|
||||
libquadmath.a
|
||||
cudart
|
||||
cublas
|
||||
libsqlite3.a
|
||||
libprometheus-cpp-push.a
|
||||
libprometheus-cpp-pull.a
|
||||
libprometheus-cpp-core.a
|
||||
${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs/libnvidia-ml.so
|
||||
)
|
||||
else()
|
||||
set(engine_libs
|
||||
pthread
|
||||
libfaiss.a
|
||||
libgomp.a
|
||||
libopenblas.a
|
||||
libgfortran.a
|
||||
libquadmath.a
|
||||
libsqlite3.a
|
||||
libprometheus-cpp-push.a
|
||||
libprometheus-cpp-pull.a
|
||||
libprometheus-cpp-core.a
|
||||
${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs/libnvidia-ml.so
|
||||
)
|
||||
endif ()
|
||||
|
||||
if (ENABLE_LICENSE STREQUAL "ON")
|
||||
link_directories(/usr/local/cuda/lib64/stubs)
|
||||
link_directories(/usr/local/cuda/lib64)
|
||||
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs")
|
||||
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
|
||||
set(license_libs
|
||||
nvidia-ml
|
||||
libboost_system.a
|
||||
libboost_filesystem.a
|
||||
libboost_serialization.a
|
||||
crypto
|
||||
cudart
|
||||
cublas
|
||||
@ -172,16 +135,7 @@ endif ()
|
||||
|
||||
set(server_libs
|
||||
vecwise_engine
|
||||
libthrift.a
|
||||
pthread
|
||||
libyaml-cpp.a
|
||||
libboost_system.a
|
||||
libboost_filesystem.a
|
||||
libsnappy.a
|
||||
libbz2.a
|
||||
libz.a
|
||||
libzstd.a
|
||||
liblz4.a
|
||||
dl
|
||||
metrics
|
||||
)
|
||||
|
@ -26,7 +26,6 @@ add_library(megasearch_sdk STATIC
|
||||
${service_files}
|
||||
)
|
||||
|
||||
link_directories(../../third_party/build/lib)
|
||||
target_link_libraries(megasearch_sdk
|
||||
${third_party_libs}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user