提交 fa4a2cae 编写于 作者: P peng.xu

Merge branch 'mem-0.3.1' into 'branch-0.3.1'

MS-190:  use env variable to switch mem manager and fix cmake

See merge request megasearch/milvus!176

Former-commit-id: 27f889cd658c55c9b3c13266dfd5a9319e8d5398
......@@ -26,8 +26,6 @@ namespace zilliz {
namespace milvus {
namespace engine {
#define USE_NEW_MEM_MANAGER 1
DBMetaOptions DBMetaOptionsFactory::Build(const std::string& path) {
auto p = path;
if(p == "") {
......
......@@ -40,8 +40,8 @@ cuda_add_executable(db_test ${db_test_src})
set(db_libs
sqlite
boost_system
boost_filesystem
boost_system_static
boost_filesystem_static
lz4
mysqlpp
)
......
......@@ -22,13 +22,13 @@ add_executable(wrapper_test ${wrapper_test_src})
set(wrapper_libs
stdc++
boost_system
boost_filesystem
boost_system_static
boost_filesystem_static
libgpufaiss.a
faiss
cudart
cublas
sqlite3
sqlite
snappy
bz2
z
......
......@@ -33,11 +33,11 @@ set(db_libs
nvidia-ml
cudart
cublas
boost_system
boost_filesystem
boost_system_static
boost_filesystem_static
lz4
crypto
boost_serialization
boost_serialization_static
)
target_link_libraries(license_test ${db_libs} ${unittest_libs})
......@@ -78,8 +78,8 @@ target_link_libraries(metrics_test
cudart
cublas
sqlite
boost_system
boost_filesystem
boost_system_static
boost_filesystem_static
lz4
metrics
gtest
......
......@@ -39,9 +39,9 @@ set(require_libs
stdc++
cudart
cublas
sqlite3
boost_system
boost_filesystem
sqlite
boost_system_static
boost_filesystem_static
snappy
z
bz2
......
......@@ -25,7 +25,7 @@ set(s3_client_libs
stdc++
aws-cpp-sdk-s3
aws-cpp-sdk-core
boost_filesystem
boost_filesystem_static
)
target_link_libraries(s3_test
${s3_client_libs}
......
......@@ -25,6 +25,6 @@ add_executable(valication_util_test
target_link_libraries(valication_util_test
${unittest_libs}
boost_filesystem)
boost_filesystem_static)
install(TARGETS valication_util_test DESTINATION bin)
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册