mirror of
https://gitee.com/milvus-io/milvus.git
synced 2026-02-02 01:06:41 +08:00
Apart src/CMKLists to dir server/CMKLists (#3081)
* change cmake minmum version requires to 3.14 Signed-off-by: yangxuan <xuan.yang@zilliz.com> * apart server/CMKLists Signed-off-by: yangxuan <xuan.yang@zilliz.com> Co-authored-by: yangxuan <xuan.yang@zilliz.com> Co-authored-by: Wang XiangYu <xy.wang@zilliz.com>
This commit is contained in:
XuanYang-cn
GitHub
parent
d0b3c74f9a
commit
a85660bef8
@ -11,7 +11,7 @@
|
||||
# or implied. See the License for the specific language governing permissions and limitations under the License.
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
cmake_minimum_required( VERSION 3.12 )
|
||||
cmake_minimum_required( VERSION 3.14 )
|
||||
message( STATUS "Building using CMake version: ${CMAKE_VERSION}" )
|
||||
|
||||
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
|
||||
|
||||
@ -26,12 +26,6 @@ foreach (DIR ${INDEX_INCLUDE_DIRS})
|
||||
include_directories(${DIR})
|
||||
endforeach ()
|
||||
|
||||
set( GRPC_SERVICE_FILES ${MILVUS_ENGINE_SRC}/grpc/gen-milvus/milvus.grpc.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-milvus/milvus.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-status/status.grpc.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-status/status.pb.cc
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/scheduler SCHEDULER_MAIN_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/scheduler/action SCHEDULER_ACTION_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/scheduler/event SCHEDULER_EVENT_FILES )
|
||||
@ -49,48 +43,6 @@ set( SCHEDULER_FILES ${SCHEDULER_MAIN_FILES}
|
||||
${SCHEDULER_TASK_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server SERVER_SERVICE_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/init SERVER_INIT_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery/request DELIVERY_REQUEST_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery/strategy DELIVERY_STRATEGY_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery DELIVERY_FILES )
|
||||
|
||||
set( SERVER_FILES ${SERVER_INIT_FILES}
|
||||
${SERVER_SERVICE_FILES}
|
||||
${SERVER_INIT_FILES}
|
||||
${DELIVERY_REQUEST_FILES}
|
||||
${DELIVERY_STRATEGY_FILES}
|
||||
${DELIVERY_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/grpc_impl GRPC_IMPL_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/grpc_impl/interceptor GRPC_INTERCEPTOR_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/context SERVER_CONTEXT_FILES )
|
||||
|
||||
set( GRPC_SERVER_FILES ${GRPC_REQUEST_FILES}
|
||||
${GRPC_IMPL_FILES}
|
||||
${GRPC_INTERCEPTOR_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/handler WEB_HANDLER_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/component WEB_CONPONENT_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/controller WEB_CONTROLLER_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/dto WEB_DTO_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/utils WEB_UTILS_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl WEB_IMPL_FILES )
|
||||
|
||||
set( WEB_SERVER_FILES ${WEB_HANDLER_FILES}
|
||||
${WEB_CONPONENT_FILES}
|
||||
${WEB_CONTROLLER_FILES}
|
||||
${WEB_DTO_FILES}
|
||||
${WEB_UTILS_FILES}
|
||||
${WEB_IMPL_FILES}
|
||||
)
|
||||
|
||||
set(S3_CLIENT_LIB aws-cpp-sdk-s3
|
||||
aws-cpp-sdk-core
|
||||
)
|
||||
|
||||
add_subdirectory( utils )
|
||||
add_subdirectory( metrics )
|
||||
add_subdirectory( config )
|
||||
@ -98,6 +50,23 @@ add_subdirectory( tracing )
|
||||
add_subdirectory( query )
|
||||
add_subdirectory( db ) # target milvus_engine
|
||||
add_subdirectory( log )
|
||||
add_subdirectory( server )
|
||||
|
||||
target_link_libraries( server
|
||||
PUBLIC milvus_engine
|
||||
config
|
||||
metrics
|
||||
tracing
|
||||
log
|
||||
oatpp
|
||||
query
|
||||
utils
|
||||
# dependency prometheus
|
||||
prometheus-cpp-push
|
||||
prometheus-cpp-pull
|
||||
prometheus-cpp-core
|
||||
curl
|
||||
)
|
||||
|
||||
# **************************** Get&Print Include Directories ****************************
|
||||
get_property( dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES )
|
||||
@ -106,28 +75,14 @@ foreach ( dir ${dirs} )
|
||||
message( STATUS "Current Include DIRS: "${dir} )
|
||||
endforeach ()
|
||||
|
||||
set( SERVER_LIBS milvus_engine
|
||||
config
|
||||
metrics
|
||||
tracing
|
||||
log
|
||||
oatpp
|
||||
query
|
||||
utils
|
||||
)
|
||||
set( SERVER_LIBS server )
|
||||
|
||||
|
||||
add_executable( milvus_server ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
|
||||
${CONTEXT_FILES}
|
||||
${SCHEDULER_FILES}
|
||||
${SERVER_FILES}
|
||||
${GRPC_SERVER_FILES}
|
||||
${GRPC_SERVICE_FILES}
|
||||
${WEB_SERVER_FILES}
|
||||
${SERVER_CONTEXT_FILES}
|
||||
)
|
||||
|
||||
target_link_libraries( milvus_server ${SERVER_LIBS} )
|
||||
target_link_libraries( milvus_server PRIVATE ${SERVER_LIBS} )
|
||||
install( TARGETS milvus_server DESTINATION bin )
|
||||
|
||||
install( FILES
|
||||
|
||||
65
core/src/server/CMakeLists.txt
Normal file
65
core/src/server/CMakeLists.txt
Normal file
@ -0,0 +1,65 @@
|
||||
#-------------------------------------------------------------------------------
|
||||
# Copyright (C) 2019-2020 Zilliz. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software distributed under the License
|
||||
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
|
||||
# or implied. See the License for the specific language governing permissions and limitations under the License.
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
set( GRPC_SERVICE_FILES ${MILVUS_ENGINE_SRC}/grpc/gen-milvus/milvus.grpc.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-milvus/milvus.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-status/status.grpc.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-status/status.pb.cc
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server SERVER_SERVICE_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/init SERVER_INIT_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery/request DELIVERY_REQUEST_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery/strategy DELIVERY_STRATEGY_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery DELIVERY_FILES )
|
||||
|
||||
set( SERVER_FILES ${SERVER_INIT_FILES}
|
||||
${SERVER_SERVICE_FILES}
|
||||
${SERVER_INIT_FILES}
|
||||
${DELIVERY_REQUEST_FILES}
|
||||
${DELIVERY_STRATEGY_FILES}
|
||||
${DELIVERY_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/grpc_impl GRPC_IMPL_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/grpc_impl/interceptor GRPC_INTERCEPTOR_FILES )
|
||||
|
||||
set( GRPC_SERVER_FILES ${GRPC_IMPL_FILES}
|
||||
${GRPC_INTERCEPTOR_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/handler WEB_HANDLER_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/component WEB_CONPONENT_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/controller WEB_CONTROLLER_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/dto WEB_DTO_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/utils WEB_UTILS_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl WEB_IMPL_FILES )
|
||||
|
||||
set( WEB_SERVER_FILES ${WEB_HANDLER_FILES}
|
||||
${WEB_CONPONENT_FILES}
|
||||
${WEB_CONTROLLER_FILES}
|
||||
${WEB_DTO_FILES}
|
||||
${WEB_UTILS_FILES}
|
||||
${WEB_IMPL_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/context SERVER_CONTEXT_FILES )
|
||||
|
||||
add_library( server STATIC )
|
||||
target_sources( server
|
||||
PRIVATE ${GRPC_SERVER_FILES}
|
||||
${GRPC_SERVICE_FILES}
|
||||
${SERVER_FILES}
|
||||
${WEB_SERVER_FILES}
|
||||
${SERVER_CONTEXT_FILES}
|
||||
)
|
||||
@ -23,17 +23,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status)
|
||||
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)
|
||||
|
||||
aux_source_directory(${MILVUS_ENGINE_SRC}/cache cache_files)
|
||||
|
||||
aux_source_directory(${MILVUS_ENGINE_SRC}/search search_files)
|
||||
|
||||
set( GRPC_SERVICE_FILES ${MILVUS_ENGINE_SRC}/grpc/gen-milvus/milvus.grpc.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-milvus/milvus.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-status/status.grpc.pb.cc
|
||||
${MILVUS_ENGINE_SRC}/grpc/gen-status/status.pb.cc
|
||||
)
|
||||
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/scheduler SCHEDULER_MAIN_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/scheduler/action SCHEDULER_ACTION_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/scheduler/event SCHEDULER_EVENT_FILES )
|
||||
@ -51,45 +40,6 @@ set( SCHEDULER_FILES ${SCHEDULER_MAIN_FILES}
|
||||
${SCHEDULER_TASK_FILES}
|
||||
)
|
||||
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server SERVER_SERVICE_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/init SERVER_INIT_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery/request DELIVERY_REQUEST_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery/strategy DELIVERY_STRATEGY_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/delivery DELIVERY_FILES )
|
||||
|
||||
set( SERVER_FILES ${SERVER_INIT_FILES}
|
||||
${SERVER_SERVICE_FILES}
|
||||
${SERVER_INIT_FILES}
|
||||
${DELIVERY_REQUEST_FILES}
|
||||
${DELIVERY_STRATEGY_FILES}
|
||||
${DELIVERY_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/grpc_impl GRPC_IMPL_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/grpc_impl/interceptor GRPC_INTERCEPTOR_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/context SERVER_CONTEXT_FILES )
|
||||
|
||||
set( GRPC_SERVER_FILES ${GRPC_REQUEST_FILES}
|
||||
${GRPC_IMPL_FILES}
|
||||
${GRPC_INTERCEPTOR_FILES}
|
||||
)
|
||||
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/handler WEB_HANDLER_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/component WEB_CONPONENT_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/controller WEB_CONTROLLER_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/dto WEB_DTO_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl/utils WEB_UTILS_FILES )
|
||||
aux_source_directory( ${MILVUS_ENGINE_SRC}/server/web_impl WEB_IMPL_FILES )
|
||||
|
||||
set( WEB_SERVER_FILES ${WEB_HANDLER_FILES}
|
||||
${WEB_CONPONENT_FILES}
|
||||
${WEB_CONTROLLER_FILES}
|
||||
${WEB_DTO_FILES}
|
||||
${WEB_UTILS_FILES}
|
||||
${WEB_IMPL_FILES}
|
||||
)
|
||||
|
||||
set( ENTRY_FILE ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp )
|
||||
|
||||
set( UNITTEST_LIBS sqlite
|
||||
|
||||
@ -23,7 +23,6 @@ set( TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/utils.cpp
|
||||
|
||||
add_executable( test_db
|
||||
${SCHEDULER_FILES}
|
||||
${SERVER_CONTEXT_FILES}
|
||||
${TEST_FILES}
|
||||
# ${grpc_server_files}
|
||||
# ${grpc_service_files}
|
||||
@ -34,14 +33,15 @@ add_executable( test_db
|
||||
)
|
||||
|
||||
target_link_libraries( test_db ${UNITTEST_LIBS}
|
||||
milvus_engine
|
||||
metrics
|
||||
config
|
||||
stdc++
|
||||
utils
|
||||
tracing
|
||||
query
|
||||
log
|
||||
server
|
||||
# milvus_engine
|
||||
# metrics
|
||||
# config
|
||||
# stdc++
|
||||
# utils
|
||||
# tracing
|
||||
# query
|
||||
# log
|
||||
)
|
||||
|
||||
install( TARGETS test_db DESTINATION unittest )
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user