m53297601
/
Paddle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix brpc compilation. (#15417)

Browse Source
inference-pre-release-gpu
gongweibao 6 years ago committed by GitHub
parent 9a9c690e71
commit 7ab4af2716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File

8
paddle/fluid/operators/distributed/CMakeLists.txt
Unescape View File

@ -29,11 +29,9 @@ if(WITH_GRPC)
DEPS ${RPC_DEPS} scope profiler math_function SERIAL) DEPS ${RPC_DEPS} scope profiler math_function SERIAL)
else() else()
set_source_files_properties(brpc_server.cc parameter_prefetch.cc brpc_client.cc rpc_server_test.cc brpc_serde_test.cc 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_variable_response.cc brpc_sendrecvop_utils.cc brpc_rdma_pool.cc collective_server.cc collective_server_test.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})
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 brpc_library(sendrecvop_rpc SRCS sendrecvop_utils.cc
request_handler_impl.cc rpc_client.cc rpc_server.cc request_handler_impl.cc rpc_client.cc rpc_server.cc
variable_response.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) cc_library(parameter_prefetch SRCS parameter_prefetch.cc DEPS sendrecvop_rpc memory)
if(WITH_GPU) if(WITH_GPU)
cc_test(collective_server_test SRCS collective_server_test.cc 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) selected_rows_functor scope math_function SERIAL)
endif() endif()

3
paddle/fluid/operators/distributed/collective_server_test.cc
Unescape View File

@ -82,8 +82,7 @@ void Gather(const std::vector<distributed::RemoteVar>& vars,
std::cout << "dst:" << distributed::GetSelectedRowsInfo(*dst[0]); std::cout << "dst:" << distributed::GetSelectedRowsInfo(*dst[0]);
} }
TEST(PREFETCH, GPU) { TEST(CollectiveServer, GPU) {
setenv("FLAGS_max_body_size", "2147483647", 1);
platform::CUDAPlace place; platform::CUDAPlace place;
platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance(); platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
auto& ctx = *pool.Get(place); auto& ctx = *pool.Get(place);

6
paddle/testing/paddle_gtest_main.cc
Unescape View File

@ -32,7 +32,11 @@ int main(int argc, char** argv) {
std::vector<std::string> envs; std::vector<std::string> envs;
std::vector<std::string> undefok; std::vector<std::string> undefok;
#if defined(PADDLE_WITH_DISTRIBUTE) && !defined(PADDLE_WITH_GRPC) #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 #endif
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP) #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)

Write Preview
Loading…
Cancel
Save