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

Merge branch 'branch-0.4.0' into 'branch-0.4.0'

Browse Source 
rename milvus_grpc_server to milvus_server

See merge request megasearch/milvus!339

Former-commit-id: ad8fc2817951dafcb4d54fba7f601042022185f0
This commit is contained in:
peng.xu 2019-08-13 17:39:40 +08:00
commit ae88adeee7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/scripts/start_server.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
../bin/milvus_grpc_server -c ../conf/server_config.yaml -l ../conf/log_config.conf
../bin/milvus_server -c ../conf/server_config.yaml -l ../conf/log_config.conf

8
cpp/src/CMakeLists.txt
View File

@ -209,7 +209,7 @@ if (MILVUS_WITH_THRIFT STREQUAL "ON")
${metrics_files}
)
else()
add_executable(milvus_grpc_server
add_executable(milvus_server
${config_files}
${server_files}
${grpcserver_files}
@ -229,21 +229,21 @@ if (ENABLE_LICENSE STREQUAL "ON")
if(MILVUS_WITH_THRIFT STREQUAL "ON")
target_link_libraries(milvus_thrift_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
else()
target_link_libraries(milvus_grpc_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
target_link_libraries(milvus_server ${server_libs} license_check ${knowhere_libs} ${third_party_libs})
endif()
else ()
if(MILVUS_WITH_THRIFT STREQUAL "ON")
target_link_libraries(milvus_thrift_server ${server_libs} ${knowhere_libs} ${third_party_libs})
else()
target_link_libraries(milvus_grpc_server ${server_libs} ${knowhere_libs} ${third_party_libs})
target_link_libraries(milvus_server ${server_libs} ${knowhere_libs} ${third_party_libs})
endif()
endif()
if (MILVUS_WITH_THRIFT STREQUAL "ON")
install(TARGETS milvus_thrift_server DESTINATION bin)
else()
install(TARGETS milvus_grpc_server DESTINATION bin)
install(TARGETS milvus_server DESTINATION bin)
endif()
install(FILES

2
cpp/start_server.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
./cmake_build/src/milvus_grpc_server -c ./conf/server_config.yaml -l ./conf/log_config.conf &
./cmake_build/src/milvus_server -c ./conf/server_config.yaml -l ./conf/log_config.conf &