From 7ab4af27160f692711b3f793e800af8d9eb36409 Mon Sep 17 00:00:00 2001 From: gongweibao Date: Mon, 21 Jan 2019 10:12:01 +0800 Subject: [PATCH] Fix brpc compilation. (#15417) --- paddle/fluid/operators/distributed/CMakeLists.txt | 8 +++----- .../fluid/operators/distributed/collective_server_test.cc | 3 +-- paddle/testing/paddle_gtest_main.cc | 6 +++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/paddle/fluid/operators/distributed/CMakeLists.txt b/paddle/fluid/operators/distributed/CMakeLists.txt index 7fcbf85f187..6a61a8d7861 100644 --- a/paddle/fluid/operators/distributed/CMakeLists.txt +++ b/paddle/fluid/operators/distributed/CMakeLists.txt @@ -29,11 +29,9 @@ if(WITH_GRPC) DEPS ${RPC_DEPS} scope profiler math_function SERIAL) else() - set_source_files_properties(brpc_server.cc parameter_prefetch.cc brpc_client.cc rpc_server_test.cc brpc_serde_test.cc - brpc_variable_response.cc brpc_sendrecvop_utils.cc brpc_rdma_pool.cc collective_server.cc collective_server_test.cc - collective_client.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) + set(BRPC_SRCS brpc/brpc_client.cc brpc/brpc_server.cc brpc/brpc_sendrecvop_utils.cc brpc/brpc_variable_response.cc brpc/brpc_rdma_pool.cc) + set_source_files_properties(${BRPC_SRCS} parameter_prefetch.cc rpc_server_test.cc brpc/brpc_serde_test.cc collective_server.cc collective_server_test.cc collective_client.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) - set(BRPC_SRCS brpc/brpc_client.cc brpc/brpc/server.cc brpc/brpc_sendrecvop_utils.cc brpc/brpc_variable_response.cc brpc/brpc_rdma_pool.cc) brpc_library(sendrecvop_rpc SRCS sendrecvop_utils.cc request_handler_impl.cc rpc_client.cc rpc_server.cc variable_response.cc @@ -54,6 +52,6 @@ cc_test(varhandle_test SRCS varhandle_test.cc DEPS profiler) cc_library(parameter_prefetch SRCS parameter_prefetch.cc DEPS sendrecvop_rpc memory) if(WITH_GPU) cc_test(collective_server_test SRCS collective_server_test.cc - DEPS sendrecvop_rpc grpc++_unsecure grpc_unsecure gpr cares zlib protobuf executor + DEPS sendrecvop_rpc executor ${RPC_DEPS} selected_rows_functor scope math_function SERIAL) endif() diff --git a/paddle/fluid/operators/distributed/collective_server_test.cc b/paddle/fluid/operators/distributed/collective_server_test.cc index 46c761000c3..5009058422b 100644 --- a/paddle/fluid/operators/distributed/collective_server_test.cc +++ b/paddle/fluid/operators/distributed/collective_server_test.cc @@ -82,8 +82,7 @@ void Gather(const std::vector& vars, std::cout << "dst:" << distributed::GetSelectedRowsInfo(*dst[0]); } -TEST(PREFETCH, GPU) { - setenv("FLAGS_max_body_size", "2147483647", 1); +TEST(CollectiveServer, GPU) { platform::CUDAPlace place; platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance(); auto& ctx = *pool.Get(place); diff --git a/paddle/testing/paddle_gtest_main.cc b/paddle/testing/paddle_gtest_main.cc index 47c5248b57d..e91fa929243 100644 --- a/paddle/testing/paddle_gtest_main.cc +++ b/paddle/testing/paddle_gtest_main.cc @@ -32,7 +32,11 @@ int main(int argc, char** argv) { std::vector envs; std::vector undefok; #if defined(PADDLE_WITH_DISTRIBUTE) && !defined(PADDLE_WITH_GRPC) - envs.push_back("max_body_size"); + std::string str_max_body_size; + if (google::GetCommandLineOption("max_body_size", &str_max_body_size)) { + setenv("FLAGS_max_body_size", "2147483647", 1); + envs.push_back("max_body_size"); + } #endif #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) -- GitLab