From 8ce2e7b1223a8d4350eeeaccb535794dc55a0cf8 Mon Sep 17 00:00:00 2001 From: wangguibao Date: Tue, 26 Feb 2019 16:02:51 +0800 Subject: [PATCH] Replace public/configure with protobufs Change-Id: Idd4b74f44b6bfe014b232dbbd23648bef9d6c262 --- CMakeLists.txt | 2 +- {proto_configure => configure}/CMakeLists.txt | 8 +++---- .../include/configure_parser.h | 0 .../proto/inferencer_configure.proto | 0 .../proto/sdk_configure.proto | 0 .../proto/server_configure.proto | 0 .../src/configure_parser.cpp | 0 .../tests/test_configure.cpp | 0 inferencer-fluid-cpu/CMakeLists.txt | 2 +- predictor/CMakeLists.txt | 23 +++++++++---------- predictor/common/inner_common.h | 2 +- sdk-cpp/CMakeLists.txt | 20 ++++++++-------- 12 files changed, 28 insertions(+), 29 deletions(-) rename {proto_configure => configure}/CMakeLists.txt (67%) rename {proto_configure => configure}/include/configure_parser.h (100%) rename {proto_configure => configure}/proto/inferencer_configure.proto (100%) rename {proto_configure => configure}/proto/sdk_configure.proto (100%) rename {proto_configure => configure}/proto/server_configure.proto (100%) rename {proto_configure => configure}/src/configure_parser.cpp (100%) rename {proto_configure => configure}/tests/test_configure.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f45be29..d5aaba63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ endif() add_subdirectory(bsl) add_subdirectory(ullib) -add_subdirectory(proto_configure) +add_subdirectory(configure) add_subdirectory(mempool) add_subdirectory(predictor) add_subdirectory(inferencer-fluid-cpu) diff --git a/proto_configure/CMakeLists.txt b/configure/CMakeLists.txt similarity index 67% rename from proto_configure/CMakeLists.txt rename to configure/CMakeLists.txt index b67ae212..3b6e55db 100644 --- a/proto_configure/CMakeLists.txt +++ b/configure/CMakeLists.txt @@ -5,11 +5,11 @@ LIST(APPEND protofiles ) PROTOBUF_GENERATE_CPP(configure_proto_srcs configure_proto_hdrs ${protofiles}) -list(APPEND proto_configure_srcs ${configure_proto_srcs}) +list(APPEND configure_srcs ${configure_proto_srcs}) -list(APPEND proto_configure_srcs ${CMAKE_CURRENT_LIST_DIR}/src/configure_parser.cpp) +list(APPEND configure_srcs ${CMAKE_CURRENT_LIST_DIR}/src/configure_parser.cpp) -add_library(proto_configure ${proto_configure_srcs}) +add_library(configure ${configure_srcs}) add_executable(test_configure ${CMAKE_CURRENT_LIST_DIR}/tests/test_configure.cpp) @@ -17,4 +17,4 @@ target_include_directories(test_configure PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_LIST_DIR}/include ) -target_link_libraries(test_configure proto_configure protobuf) +target_link_libraries(test_configure configure protobuf) diff --git a/proto_configure/include/configure_parser.h b/configure/include/configure_parser.h similarity index 100% rename from proto_configure/include/configure_parser.h rename to configure/include/configure_parser.h diff --git a/proto_configure/proto/inferencer_configure.proto b/configure/proto/inferencer_configure.proto similarity index 100% rename from proto_configure/proto/inferencer_configure.proto rename to configure/proto/inferencer_configure.proto diff --git a/proto_configure/proto/sdk_configure.proto b/configure/proto/sdk_configure.proto similarity index 100% rename from proto_configure/proto/sdk_configure.proto rename to configure/proto/sdk_configure.proto diff --git a/proto_configure/proto/server_configure.proto b/configure/proto/server_configure.proto similarity index 100% rename from proto_configure/proto/server_configure.proto rename to configure/proto/server_configure.proto diff --git a/proto_configure/src/configure_parser.cpp b/configure/src/configure_parser.cpp similarity index 100% rename from proto_configure/src/configure_parser.cpp rename to configure/src/configure_parser.cpp diff --git a/proto_configure/tests/test_configure.cpp b/configure/tests/test_configure.cpp similarity index 100% rename from proto_configure/tests/test_configure.cpp rename to configure/tests/test_configure.cpp diff --git a/inferencer-fluid-cpu/CMakeLists.txt b/inferencer-fluid-cpu/CMakeLists.txt index b3805f14..64e4cddd 100644 --- a/inferencer-fluid-cpu/CMakeLists.txt +++ b/inferencer-fluid-cpu/CMakeLists.txt @@ -4,6 +4,6 @@ target_include_directories(fluid_cpu_engine PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ${PADDLE_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/Paddle/fluid_install_dir/) -add_dependencies(fluid_cpu_engine pdserving paddle_fluid proto_configure) +add_dependencies(fluid_cpu_engine pdserving paddle_fluid configure) target_link_libraries(fluid_cpu_engine pdserving -liomp5 -lmklml_intel -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) diff --git a/predictor/CMakeLists.txt b/predictor/CMakeLists.txt index 0e1b4d51..4214fb7e 100644 --- a/predictor/CMakeLists.txt +++ b/predictor/CMakeLists.txt @@ -17,18 +17,17 @@ set_source_files_properties( PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor") add_dependencies(pdserving protobuf boost brpc leveldb pdcodegen - proto_configure - ullib mempool) + configure ullib mempool) target_include_directories(pdserving PUBLIC ${CMAKE_CURRENT_LIST_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_BINARY_DIR}/../proto_configure - ${CMAKE_CURRENT_LIST_DIR}/../proto_configure/include + ${CMAKE_CURRENT_BINARY_DIR}/../configure + ${CMAKE_CURRENT_LIST_DIR}/../configure/include ${CMAKE_CURRENT_LIST_DIR}/../mempool ${CMAKE_CURRENT_LIST_DIR}/../ullib/include) target_link_libraries(pdserving - brpc protobuf boost leveldb proto_configure ullib + brpc protobuf boost leveldb configure ullib mempool -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) add_executable(pdserving_exe ${pdserving_srcs}) @@ -37,18 +36,18 @@ set_source_files_properties( PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor") add_dependencies(pdserving_exe - protobuf boost brpc leveldb pdcodegen proto_configure bsl + protobuf boost brpc leveldb pdcodegen configure bsl ullib mempool) target_include_directories(pdserving_exe PUBLIC ${CMAKE_CURRENT_LIST_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_BINARY_DIR}/../proto_configure - ${CMAKE_CURRENT_LIST_DIR}/../proto_configure/include + ${CMAKE_CURRENT_BINARY_DIR}/../configure + ${CMAKE_CURRENT_LIST_DIR}/../configure/include ${CMAKE_CURRENT_LIST_DIR}/../mempool ${CMAKE_CURRENT_LIST_DIR}/../ullib/include) target_link_libraries(pdserving_exe brpc protobuf leveldb bsl - proto_configure ullib mempool -lpthread -lcrypto -lm -lrt -lssl + configure ullib mempool -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) add_library(pdclient ${pdclient_srcs}) @@ -56,13 +55,13 @@ set_source_files_properties( ${pdclient_srcs} PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing -Wno-unused-variable -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor") -add_dependencies(pdclient protobuf boost brpc pdcodegen proto_configure) +add_dependencies(pdclient protobuf boost brpc pdcodegen configure) target_include_directories(pdclient PUBLIC ${CMAKE_CURRENT_LIST_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_BINARY_DIR}/../proto_configure - ${CMAKE_CURRENT_LIST_DIR}/../proto_configure/include + ${CMAKE_CURRENT_BINARY_DIR}/../configure + ${CMAKE_CURRENT_LIST_DIR}/../configure/include ${CMAKE_CURRENT_LIST_DIR}/../mempool ${CMAKE_CURRENT_LIST_DIR}/../ullib/include) target_link_libraries(pdclient protobuf boost brpc -lpthread -lcrypto -lm -lrt -lssl -ldl -lz) diff --git a/predictor/common/inner_common.h b/predictor/common/inner_common.h index 1bfcffb1..b91e1de3 100644 --- a/predictor/common/inner_common.h +++ b/predictor/common/inner_common.h @@ -27,7 +27,7 @@ #include #include -#include "configure.pb.h" +#include "server_configure.pb.h" #include "configure_parser.h" #include "common/utils.h" diff --git a/sdk-cpp/CMakeLists.txt b/sdk-cpp/CMakeLists.txt index 2015a5ff..d799f998 100644 --- a/sdk-cpp/CMakeLists.txt +++ b/sdk-cpp/CMakeLists.txt @@ -1,23 +1,23 @@ include(src/CMakeLists.txt) include(proto/CMakeLists.txt) add_library(sdk-cpp ${sdk_cpp_srcs}) -add_dependencies(sdk-cpp pdcodegen proto_configure) +add_dependencies(sdk-cpp pdcodegen configure) target_include_directories(sdk-cpp PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ${CMKAE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_BINARY_DIR}/../proto_configure - ${CMAKE_CURRENT_LIST_DIR}/../proto_configure/include + ${CMAKE_CURRENT_BINARY_DIR}/../configure + ${CMAKE_CURRENT_LIST_DIR}/../configure/include ${CMAKE_CURRENT_LIST_DIR}/../ullib/include ${CMAKE_CURRENT_BINARY_DIR}/../bsl/include ) -target_link_libraries(sdk-cpp brpc proto_configure protobuf leveldb) +target_link_libraries(sdk-cpp brpc configure protobuf leveldb) add_executable(ximage ${CMAKE_CURRENT_LIST_DIR}/demo/ximage.cpp) target_include_directories(ximage PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../proto_configure - ${CMAKE_CURRENT_LIST_DIR}/../proto_configure/include + ${CMAKE_CURRENT_BINARY_DIR}/../configure + ${CMAKE_CURRENT_LIST_DIR}/../configure/include ${CMAKE_CURRENT_LIST_DIR}/../ullib/include ${CMAKE_CURRENT_BINARY_DIR}/../bsl/include) target_link_libraries(ximage sdk-cpp -lpthread -lcrypto -lm -lrt -lssl -ldl @@ -27,8 +27,8 @@ add_executable(mapcnn_dense ${CMAKE_CURRENT_LIST_DIR}/demo/mapcnn_dense.cpp) target_include_directories(mapcnn_dense PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_BINARY_DIR}/../proto_configure - ${CMAKE_CURRENT_LIST_DIR}/../proto_configure/include + ${CMAKE_CURRENT_BINARY_DIR}/../configure + ${CMAKE_CURRENT_LIST_DIR}/../configure/include ${CMAKE_CURRENT_LIST_DIR}/../ullib/include ${CMAKE_CURRENT_BINARY_DIR}/../bsl/include) target_link_libraries(mapcnn_dense sdk-cpp -lpthread -lcrypto -lm -lrt -lssl @@ -38,8 +38,8 @@ add_executable(mapcnn_sparse ${CMAKE_CURRENT_LIST_DIR}/demo/mapcnn_sparse.cpp) target_include_directories(mapcnn_sparse PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_BINARY_DIR}/../proto_configure - ${CMAKE_CURRENT_LIST_DIR}/../proto_configure/include + ${CMAKE_CURRENT_BINARY_DIR}/../configure + ${CMAKE_CURRENT_LIST_DIR}/../configure/include ${CMAKE_CURRENT_LIST_DIR}/../ullib/include ${CMAKE_CURRENT_BINARY_DIR}/../bsl/include) target_link_libraries(mapcnn_sparse sdk-cpp -lpthread -lcrypto -lm -lrt -lssl -- GitLab