diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 0b257f2a03b740e699d4af5b884adcb9cca61194..f9de15f20d83cfe738d441c05895c2d753d0593c 100644 --- a/cpp/CHANGELOG.md +++ b/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 diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 4645ffcbe60828f8ff0695ee0eb57d98e0168021..47d4d97bd1a380d361e881efea754f1c9d1a2b4f 100644 --- a/cpp/src/CMakeLists.txt +++ b/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}) - diff --git a/cpp/src/sdk/CMakeLists.txt b/cpp/src/sdk/CMakeLists.txt index 093e2243a93d2ac92316ed677731c85d040c3b9b..a43f0b85de0fcf237a1c5daac95622284c47707c 100644 --- a/cpp/src/sdk/CMakeLists.txt +++ b/cpp/src/sdk/CMakeLists.txt @@ -31,3 +31,5 @@ target_link_libraries(milvus_sdk ) add_subdirectory(examples) + +install(TARGETS milvus_sdk DESTINATION bin) diff --git a/cpp/src/sdk/examples/simple/CMakeLists.txt b/cpp/src/sdk/examples/simple/CMakeLists.txt index cad08d856c2cfb26068ed10f6da65296cf051196..a288965aa3a4a9c3f510120c5c47ccb005374054 100644 --- a/cpp/src/sdk/examples/simple/CMakeLists.txt +++ b/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) diff --git a/cpp/unittest/db/CMakeLists.txt b/cpp/unittest/db/CMakeLists.txt index 67ef5fccec0bc1cf6739d98a23db22e286e21c36..9367f53d67d0d7b4575246e5fa05651a470b358a 100644 --- a/cpp/unittest/db/CMakeLists.txt +++ b/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) \ No newline at end of file diff --git a/cpp/unittest/faiss_wrapper/CMakeLists.txt b/cpp/unittest/faiss_wrapper/CMakeLists.txt index b0830d5a87feee2ecc1a2f8049b5095b3e5d92e6..f044df8d8cf225ff8235896d6d8c8bd972dcefd7 100644 --- a/cpp/unittest/faiss_wrapper/CMakeLists.txt +++ b/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) diff --git a/cpp/unittest/main.cpp b/cpp/unittest/main.cpp index 930310fd93a37c99f9201fd34d12253e725a59ce..dac5bc7013259d5e6b1bebc75a9f7d29265c1479 100644 --- a/cpp/unittest/main.cpp +++ b/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(); } diff --git a/cpp/unittest/metrics/CMakeLists.txt b/cpp/unittest/metrics/CMakeLists.txt index 2f07cbed242a90e26c5f8e114c31d82f36de9cfb..b138dcecac132c94d8ba39127c775bfb761e217d 100644 --- a/cpp/unittest/metrics/CMakeLists.txt +++ b/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} - ) \ No newline at end of file + ) + +install(TARGETS metrics_test DESTINATION bin) \ No newline at end of file diff --git a/cpp/unittest/server/CMakeLists.txt b/cpp/unittest/server/CMakeLists.txt index 40677d23c9aabdfbdf12aa1a1ba6b6f28e92fcfd..d844b7a9a3daafd811837930120bdbcbf6c24b10 100644 --- a/cpp/unittest/server/CMakeLists.txt +++ b/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) diff --git a/cpp/unittest/storage/CMakeLists.txt b/cpp/unittest/storage/CMakeLists.txt index 019f3d363599414287e2b647611be7e17320b8d8..de55596f05f9f173760fab0a5afae2d3ac54feee 100644 --- a/cpp/unittest/storage/CMakeLists.txt +++ b/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) \ No newline at end of file diff --git a/cpp/unittest/storage/s3_client_test.cpp b/cpp/unittest/storage/S3ClientTest.cpp similarity index 100% rename from cpp/unittest/storage/s3_client_test.cpp rename to cpp/unittest/storage/S3ClientTest.cpp