admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-06 19:02:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

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

See merge request megasearch/milvus!176

Former-commit-id: 27f889cd658c55c9b3c13266dfd5a9319e8d5398
This commit is contained in:
peng.xu 2019-07-09 17:33:41 +08:00
commit fa4a2caead
8 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/src/db/Factories.cpp
View File

@ -26,8 +26,6 @@ namespace zilliz {
namespace milvus { namespace milvus {
namespace engine { namespace engine {
#define USE_NEW_MEM_MANAGER 1
DBMetaOptions DBMetaOptionsFactory::Build(const std::string& path) { DBMetaOptions DBMetaOptionsFactory::Build(const std::string& path) {
auto p = path; auto p = path;
if(p == "") { if(p == "") {

4
cpp/unittest/db/CMakeLists.txt
View File

@ -40,8 +40,8 @@ cuda_add_executable(db_test ${db_test_src})
set(db_libs set(db_libs
sqlite sqlite
boost_system boost_system_static
boost_filesystem boost_filesystem_static
lz4 lz4
mysqlpp mysqlpp
) )

6
cpp/unittest/faiss_wrapper/CMakeLists.txt
View File

@ -22,13 +22,13 @@ add_executable(wrapper_test ${wrapper_test_src})
set(wrapper_libs set(wrapper_libs
stdc++ stdc++
boost_system boost_system_static
boost_filesystem boost_filesystem_static
libgpufaiss.a libgpufaiss.a
faiss faiss
cudart cudart
cublas cublas
sqlite3 sqlite
snappy snappy
bz2 bz2
z z

6
cpp/unittest/license/CMakeLists.txt
View File

@ -33,11 +33,11 @@ set(db_libs
nvidia-ml nvidia-ml
cudart cudart
cublas cublas
boost_system boost_system_static
boost_filesystem boost_filesystem_static
lz4 lz4
crypto crypto
boost_serialization boost_serialization_static
) )
target_link_libraries(license_test ${db_libs} ${unittest_libs}) target_link_libraries(license_test ${db_libs} ${unittest_libs})

4
cpp/unittest/metrics/CMakeLists.txt
View File

@ -78,8 +78,8 @@ target_link_libraries(metrics_test
cudart cudart
cublas cublas
sqlite sqlite
boost_system boost_system_static
boost_filesystem boost_filesystem_static
lz4 lz4
metrics metrics
gtest gtest

6
cpp/unittest/server/CMakeLists.txt
View File

@ -39,9 +39,9 @@ set(require_libs
stdc++ stdc++
cudart cudart
cublas cublas
sqlite3 sqlite
boost_system boost_system_static
boost_filesystem boost_filesystem_static
snappy snappy
z z
bz2 bz2

2
cpp/unittest/storage/CMakeLists.txt
View File

@ -25,7 +25,7 @@ set(s3_client_libs
stdc++ stdc++
aws-cpp-sdk-s3 aws-cpp-sdk-s3
aws-cpp-sdk-core aws-cpp-sdk-core
boost_filesystem boost_filesystem_static
) )
target_link_libraries(s3_test target_link_libraries(s3_test
${s3_client_libs} ${s3_client_libs}

2
cpp/unittest/utils/CMakeLists.txt
View File

@ -25,6 +25,6 @@ add_executable(valication_util_test
target_link_libraries(valication_util_test target_link_libraries(valication_util_test
${unittest_libs} ${unittest_libs}
boost_filesystem) boost_filesystem_static)
install(TARGETS valication_util_test DESTINATION bin) install(TARGETS valication_util_test DESTINATION bin)