Merge branch 'branch-0.3.0' into 'branch-0.3.0'

MS-98 Install unit test to installation directory

See merge request megasearch/vecwise_engine!104

Former-commit-id: 75a1694a50e48ec1510ef8e5f8b26e3871fb4b6b

cpp/CHANGELOG.md

@@ -15,6 +15,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-77 - Performance issue of post-search action
 - MS-22 - Enhancement for MemVector size control 
 - MS-92 - Unify behavior of debug and release build
+- MS-98 - Install all unit test to installation directory
 
 ## New Feature
 

cpp/src/CMakeLists.txt

@@ -152,7 +152,6 @@ add_executable(milvus_server
         ${utils_files}
         ${service_files}
         ${metrics_files}
-        #${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc
         )
 
 if (ENABLE_LICENSE STREQUAL "ON")
@@ -175,11 +174,3 @@ endif ()
 install(TARGETS milvus_server DESTINATION bin)
 
 add_subdirectory(sdk)
-#target_link_libraries(
-#        libprometheus-cpp-push.a
-#        libprometheus-cpp-pull.a
-#        libprometheus-cpp-core.a
-#        pthread
-#        z
-#        ${CURL_LIBRARIES})
-

cpp/src/sdk/CMakeLists.txt

@@ -31,3 +31,5 @@ target_link_libraries(milvus_sdk
         )
 
 add_subdirectory(examples)
+
+install(TARGETS milvus_sdk DESTINATION bin)

cpp/src/sdk/examples/simple/CMakeLists.txt

@@ -20,3 +20,5 @@ target_link_libraries(sdk_simple
         milvus_sdk
         pthread
         )
+
+install(TARGETS sdk_simple DESTINATION bin)

cpp/unittest/db/CMakeLists.txt

@@ -29,7 +29,7 @@ set(db_test_src
 cuda_add_executable(db_test ${db_test_src})
 
 set(db_libs
-        gpufaiss
+        libgpufaiss.a
         faiss
         cudart
         cublas
@@ -40,3 +40,5 @@ set(db_libs
         )
 
 target_link_libraries(db_test ${db_libs} ${unittest_libs})
+
+install(TARGETS db_test DESTINATION bin)

cpp/unittest/faiss_wrapper/CMakeLists.txt

@@ -24,7 +24,7 @@ set(wrapper_libs
         stdc++
         boost_system
         boost_filesystem
-        gpufaiss
+        libgpufaiss.a
         faiss
         cudart
         cublas
@@ -41,5 +41,4 @@ set(topk_test_src
         topk_test.cpp
         ${CMAKE_SOURCE_DIR}/src/wrapper/gpu/Topk.cu)
 
-#cuda_add_executable(topk_test ${topk_test_src})
-#target_link_libraries(topk_test ${unittest_libs} ${faiss_libs})
+install(TARGETS wrapper_test DESTINATION bin)

cpp/unittest/main.cpp

@@ -15,12 +15,6 @@ INITIALIZE_EASYLOGGINGPP
 using namespace zilliz::milvus;
 
 int main(int argc, char **argv) {
-    std::string exe_path = server::CommonUtil::GetExePath();
-    std::string config_filename = exe_path + "/../../../conf/server_config.yaml";
-    zilliz::milvus::server::ServerConfig& config = zilliz::milvus::server::ServerConfig::GetInstance();
-    config.LoadConfigFile(config_filename);
-    std::cout << "Load config file form: " << config_filename << std::endl;
-
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }

cpp/unittest/metrics/CMakeLists.txt

@@ -55,7 +55,7 @@ set(count_test_src
 add_executable(metrics_test ${count_test_src} ${require_files} )
 
 target_link_libraries(metrics_test
-        gpufaiss
+        libgpufaiss.a
         faiss
         cudart
         cublas
@@ -65,10 +65,9 @@ target_link_libraries(metrics_test
         lz4
         metrics
         gtest
-#        prometheus-cpp-pull
-#        prometheus-cpp-push
-#        prometheus-cpp-core
         pthread
         z
         ${unittest_libs}
-        )
+        )
+
+install(TARGETS metrics_test DESTINATION bin)

cpp/unittest/server/CMakeLists.txt

@@ -31,7 +31,7 @@ cuda_add_executable(server_test
 
 set(require_libs
         stdc++
-        gpufaiss
+        libgpufaiss.a
         faiss
         cudart
         cublas
@@ -51,3 +51,5 @@ target_link_libraries(server_test
         ${cuda_library}
         ${unittest_libs}
         )
+
+install(TARGETS server_test DESTINATION bin)

cpp/unittest/storage/CMakeLists.txt

@@ -13,7 +13,7 @@ set(s3_client_test_src
         ${unittest_srcs}
         ${s3_client_src}
         ${require_files}
-        s3_client_test.cpp
+        S3ClientTest.cpp
         ${MILVUS_ENGINE_SRC}/db/Status.cpp
         )
 
@@ -35,3 +35,5 @@ target_link_libraries(s3_test
         ${unittest_libs}
         curl
         crypto)
+
+install(TARGETS s3_test DESTINATION bin)