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
2019-07-09 17:33:41 +08:00 · 2019-07-09 17:33:41 +08:00 · fa4a2caead
parent 4fe9622be9 df26e649cd
commit fa4a2caead
8 changed files with 15 additions and 17 deletions
--- a/cpp/src/db/Factories.cpp
+++ b/cpp/src/db/Factories.cpp
@ -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 == "") {
--- a/cpp/unittest/db/CMakeLists.txt
+++ b/cpp/unittest/db/CMakeLists.txt
@ -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
        )
--- a/cpp/unittest/faiss_wrapper/CMakeLists.txt
+++ b/cpp/unittest/faiss_wrapper/CMakeLists.txt
@ -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
--- a/cpp/unittest/license/CMakeLists.txt
+++ b/cpp/unittest/license/CMakeLists.txt
@ -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})
--- a/cpp/unittest/metrics/CMakeLists.txt
+++ b/cpp/unittest/metrics/CMakeLists.txt
@ -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
--- a/cpp/unittest/server/CMakeLists.txt
+++ b/cpp/unittest/server/CMakeLists.txt
@ -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
--- a/cpp/unittest/storage/CMakeLists.txt
+++ b/cpp/unittest/storage/CMakeLists.txt
@ -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}
--- a/cpp/unittest/utils/CMakeLists.txt
+++ b/cpp/unittest/utils/CMakeLists.txt
@ -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)