From 0dd895d2288fc1c8180860d077439e4839d1a4ee Mon Sep 17 00:00:00 2001 From: zhaocaibei123 <48509226+zhaocaibei123@users.noreply.github.com> Date: Thu, 11 Aug 2022 15:12:14 +0800 Subject: [PATCH] Refine cpups cmake (#45055) * first refine * second refine * remove some code unuseful --- .../distributed/ps/service/CMakeLists.txt | 57 +++++++------------ .../ps/service/communicator/CMakeLists.txt | 10 ---- .../fluid/distributed/ps/table/CMakeLists.txt | 42 +++++--------- paddle/fluid/distributed/test/CMakeLists.txt | 46 +++------------ paddle/fluid/pybind/CMakeLists.txt | 3 +- 5 files changed, 45 insertions(+), 113 deletions(-) delete mode 100755 paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt diff --git a/paddle/fluid/distributed/ps/service/CMakeLists.txt b/paddle/fluid/distributed/ps/service/CMakeLists.txt index 9d87e885314..a727cd299eb 100755 --- a/paddle/fluid/distributed/ps/service/CMakeLists.txt +++ b/paddle/fluid/distributed/ps/service/CMakeLists.txt @@ -82,38 +82,35 @@ set_source_files_properties( set_source_files_properties( coordinator_client.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) +set_source_files_properties( + ps_service/graph_py_service.cc PROPERTIES COMPILE_FLAGS + ${DISTRIBUTE_COMPILE_FLAGS}) cc_library( brpc_utils SRCS brpc_utils.cc DEPS tensor device_context ${COMMON_DEPS} ${RPC_DEPS}) -cc_library( - downpour_server - SRCS graph_brpc_server.cc brpc_ps_server.cc - DEPS eigen3 table brpc_utils simple_threadpool ${RPC_DEPS}) -cc_library( - downpour_client - SRCS graph_brpc_client.cc brpc_ps_client.cc ps_local_client.cc - coordinator_client.cc - DEPS eigen3 table brpc_utils simple_threadpool ${RPC_DEPS}) - -cc_library( - client - SRCS ps_client.cc - DEPS downpour_client ${RPC_DEPS}) -cc_library( - server - SRCS server.cc - DEPS downpour_server ${RPC_DEPS}) - -cc_library( - communicator - SRCS communicator/communicator.cc - DEPS scope client table math_function selected_rows_functor ${RPC_DEPS}) cc_library( ps_service - SRCS ps_service/service.cc - DEPS communicator client server ${RPC_DEPS}) + SRCS graph_brpc_server.cc + brpc_ps_server.cc + server.cc + graph_brpc_client.cc + brpc_ps_client.cc + ps_local_client.cc + coordinator_client.cc + ps_client.cc + communicator/communicator.cc + ps_service/service.cc + ps_service/graph_py_service.cc + DEPS eigen3 + table + brpc_utils + simple_threadpool + scope + math_function + selected_rows_functor + ${RPC_DEPS}) cc_library( heter_client @@ -123,13 +120,3 @@ cc_library( heter_server SRCS heter_server.cc DEPS heter_client brpc_utils ${COMMON_DEPS} ${RPC_DEPS}) - -set_source_files_properties( - ps_service/graph_py_service.cc PROPERTIES COMPILE_FLAGS - ${DISTRIBUTE_COMPILE_FLAGS}) -cc_library( - graph_py_service - SRCS ps_service/graph_py_service.cc - DEPS ps_service) - -#add_subdirectory(communicator) diff --git a/paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt b/paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt deleted file mode 100755 index d6ef2970963..00000000000 --- a/paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS) - -set(DISTRIBUTE_COMPILE_FLAGS "${DISTRIBUTE_COMPILE_FLAGS} -faligned-new") -set_source_files_properties( - communicator.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) - -cc_library( - communicator - SRCS communicator.cc - DEPS scope client table math_function selected_rows_functor ${RPC_DEPS}) diff --git a/paddle/fluid/distributed/ps/table/CMakeLists.txt b/paddle/fluid/distributed/ps/table/CMakeLists.txt index 983e8172f18..4b233a8b27f 100644 --- a/paddle/fluid/distributed/ps/table/CMakeLists.txt +++ b/paddle/fluid/distributed/ps/table/CMakeLists.txt @@ -53,10 +53,6 @@ cc_library( set_source_files_properties( tensor_accessor.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) -cc_library( - tensor_accessor - SRCS tensor_accessor.cc - DEPS ${TABLE_DEPS} eigen3 ps_framework_proto device_context) cc_library( tensor_table SRCS @@ -89,36 +85,28 @@ set_source_files_properties( ${DISTRIBUTE_COMPILE_FLAGS}) cc_library( - sparse_sgd_rule + table SRCS sparse_sgd_rule.cc - DEPS ${TABLE_DEPS} ps_framework_proto) -cc_library( - ctr_accessor - SRCS ctr_accessor.cc ctr_double_accessor.cc sparse_accessor.cc + ctr_accessor.cc + ctr_double_accessor.cc + sparse_accessor.cc ctr_dymf_accessor.cc - DEPS ${TABLE_DEPS} ps_framework_proto sparse_sgd_rule) -cc_library( - sparse_table - SRCS memory_sparse_table.cc ssd_sparse_table.cc memory_sparse_geo_table.cc - DEPS ps_framework_proto - ${TABLE_DEPS} - fs - afs_wrapper - ctr_accessor - common_table - rocksdb) - -cc_library( - table - SRCS table.cc - DEPS sparse_table + tensor_accessor.cc + memory_sparse_table.cc + ssd_sparse_table.cc + memory_sparse_geo_table.cc + table.cc + DEPS ${TABLE_DEPS} common_table - tensor_accessor tensor_table ps_framework_proto string_helper device_context gflags - glog) + glog + fs + afs_wrapper + rocksdb + eigen3) target_link_libraries(table -fopenmp) diff --git a/paddle/fluid/distributed/test/CMakeLists.txt b/paddle/fluid/distributed/test/CMakeLists.txt index 16681ea77bb..579b407495d 100644 --- a/paddle/fluid/distributed/test/CMakeLists.txt +++ b/paddle/fluid/distributed/test/CMakeLists.txt @@ -3,23 +3,21 @@ set_source_files_properties( cc_test( table_test SRCS table_test.cc - DEPS common_table table tensor_accessor ps_framework_proto ${COMMON_DEPS} - ${RPC_DEPS}) + DEPS common_table table ps_framework_proto ${COMMON_DEPS} ${RPC_DEPS}) set_source_files_properties( dense_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) cc_test( dense_table_test SRCS dense_table_test.cc - DEPS common_table table tensor_accessor ps_framework_proto ${COMMON_DEPS} - ${RPC_DEPS}) + DEPS common_table table ps_framework_proto ${COMMON_DEPS} ${RPC_DEPS}) set_source_files_properties( barrier_table_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) cc_test( barrier_table_test SRCS barrier_table_test.cc - DEPS common_table table tensor_accessor ps_framework_proto ${COMMON_DEPS}) + DEPS common_table table ps_framework_proto ${COMMON_DEPS}) set_source_files_properties( brpc_service_dense_sgd_test.cc PROPERTIES COMPILE_FLAGS @@ -27,14 +25,7 @@ set_source_files_properties( cc_test( brpc_service_dense_sgd_test SRCS brpc_service_dense_sgd_test.cc - DEPS scope - server - client - communicator - ps_service - table - ps_framework_proto - ${COMMON_DEPS}) + DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS}) set_source_files_properties( brpc_service_sparse_sgd_test.cc PROPERTIES COMPILE_FLAGS @@ -42,14 +33,7 @@ set_source_files_properties( cc_test( brpc_service_sparse_sgd_test SRCS brpc_service_sparse_sgd_test.cc - DEPS scope - server - client - communicator - ps_service - table - ps_framework_proto - ${COMMON_DEPS}) + DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS}) set_source_files_properties( brpc_utils_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) @@ -63,30 +47,14 @@ set_source_files_properties( cc_test( graph_node_test SRCS graph_node_test.cc - DEPS graph_py_service - scope - server - client - communicator - ps_service - table - ps_framework_proto - ${COMMON_DEPS}) + DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS}) set_source_files_properties( graph_node_split_test.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) cc_test( graph_node_split_test SRCS graph_node_split_test.cc - DEPS graph_py_service - scope - server - client - communicator - ps_service - table - ps_framework_proto - ${COMMON_DEPS}) + DEPS scope ps_service table ps_framework_proto ${COMMON_DEPS}) set_source_files_properties( graph_table_sample_test.cc PROPERTIES COMPILE_FLAGS diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt index e198287abce..e6634ab3749 100755 --- a/paddle/fluid/pybind/CMakeLists.txt +++ b/paddle/fluid/pybind/CMakeLists.txt @@ -44,7 +44,6 @@ set(PYBIND_DEPS if(WITH_PSCORE) set(PYBIND_DEPS ${PYBIND_DEPS} ps_service) - set(PYBIND_DEPS ${PYBIND_DEPS} graph_py_service) if(WITH_HETERPS) set(PYBIND_DEPS ${PYBIND_DEPS} graph_gpu_wrapper) endif() @@ -200,7 +199,7 @@ if(WITH_PSCORE) endif() set_source_files_properties( fleet_py.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) - list(APPEND PYBIND_DEPS fleet communicator index_wrapper index_sampler) + list(APPEND PYBIND_DEPS fleet index_wrapper index_sampler) list(APPEND PYBIND_SRCS) set(PYBIND_SRCS fleet_py.cc ${PYBIND_SRCS}) endif() -- GitLab