From 2bf9b8445c6b83669443699312a4ea750c3a5ac3 Mon Sep 17 00:00:00 2001 From: yaoxuefeng Date: Tue, 25 Jan 2022 23:45:49 +0800 Subject: [PATCH] reconstruct directory of ps (#39191) --- paddle/fluid/distributed/CMakeLists.txt | 12 +-------- paddle/fluid/distributed/ps/CMakeLists.txt | 4 +++ .../{ => ps}/service/CMakeLists.txt | 16 ++++++----- .../{ => ps}/service/brpc_ps_client.cc | 2 +- .../{ => ps}/service/brpc_ps_client.h | 4 +-- .../{ => ps}/service/brpc_ps_server.cc | 6 ++--- .../{ => ps}/service/brpc_ps_server.h | 4 +-- .../{ => ps}/service/brpc_utils.cc | 2 +- .../distributed/{ => ps}/service/brpc_utils.h | 2 +- .../ps/service/communicator/CMakeLists.txt | 8 ++++++ .../service/communicator}/communicator.cc | 4 +-- .../service/communicator}/communicator.h | 4 +-- .../communicator}/communicator_common.h | 0 .../fluid/distributed/{ => ps}/service/env.cc | 2 +- .../fluid/distributed/{ => ps}/service/env.h | 0 .../{ => ps}/service/graph_brpc_client.cc | 6 ++--- .../{ => ps}/service/graph_brpc_client.h | 8 +++--- .../{ => ps}/service/graph_brpc_server.cc | 6 ++--- .../{ => ps}/service/graph_brpc_server.h | 8 +++--- .../{ => ps}/service/heter_client.cc | 2 +- .../{ => ps}/service/heter_client.h | 6 ++--- .../{ => ps}/service/heter_server.cc | 2 +- .../{ => ps}/service/heter_server.h | 4 +-- .../distributed/{ => ps}/service/ps_client.cc | 10 +++---- .../distributed/{ => ps}/service/ps_client.h | 8 +++--- .../{ => ps}/service/ps_local_client.cc | 4 +-- .../{ => ps}/service/ps_local_client.h | 2 +- .../{ => ps}/service/ps_local_server.h | 2 +- .../service/ps_service}/graph_py_service.cc | 4 +-- .../service/ps_service}/graph_py_service.h | 10 +++---- .../service/ps_service}/service.cc | 4 +-- .../service/ps_service}/service.h | 6 ++--- .../{ => ps}/service/sendrecv.proto | 0 .../distributed/{ => ps}/service/server.cc | 10 +++---- .../distributed/{ => ps}/service/server.h | 4 +-- .../distributed/{ => ps}/table/CMakeLists.txt | 0 .../distributed/{ => ps}/table/accessor.h | 0 .../{ => ps}/table/barrier_table.cc | 2 +- .../{ => ps}/table/common_dense_table.cc | 2 +- .../{ => ps}/table/common_dense_table.h | 8 +++--- .../{ => ps}/table/common_graph_table.cc | 4 +-- .../{ => ps}/table/common_graph_table.h | 7 +++-- .../{ => ps}/table/common_sparse_table.cc | 2 +- .../{ => ps}/table/common_sparse_table.h | 10 +++---- .../distributed/{ => ps}/table/common_table.h | 2 +- .../{ => ps}/table/ctr_accessor.cc | 2 +- .../distributed/{ => ps}/table/ctr_accessor.h | 4 +-- .../{ => ps}/table/depends/dense.h | 0 .../{ => ps}/table/depends/feature_value.h | 0 .../{ => ps}/table/depends/geo_recorder.h | 0 .../{ => ps}/table/depends/initializers.h | 0 .../{ => ps}/table/depends/large_scale_kv.h | 4 +-- .../{ => ps}/table/depends/rocksdb_warpper.h | 0 .../{ => ps}/table/depends/sparse.h | 2 +- .../{ => ps}/table/depends/sparse_utils.h | 0 .../{ => ps}/table/graph/graph_edge.cc | 2 +- .../{ => ps}/table/graph/graph_edge.h | 0 .../{ => ps}/table/graph/graph_node.cc | 2 +- .../{ => ps}/table/graph/graph_node.h | 2 +- .../table/graph/graph_weighted_sampler.cc | 2 +- .../table/graph/graph_weighted_sampler.h | 2 +- .../{ => ps}/table/memory_sparse_table.cc | 2 +- .../{ => ps}/table/memory_sparse_table.h | 6 ++--- .../{ => ps}/table/sparse_geo_table.cc | 2 +- .../{ => ps}/table/sparse_geo_table.h | 14 +++++----- .../{ => ps}/table/sparse_sgd_rule.cc | 2 +- .../{ => ps}/table/sparse_sgd_rule.h | 0 .../{ => ps}/table/ssd_sparse_table.cc | 2 +- .../{ => ps}/table/ssd_sparse_table.h | 4 +-- .../fluid/distributed/{ => ps}/table/table.cc | 27 ++++++++++--------- .../fluid/distributed/{ => ps}/table/table.h | 6 ++--- .../{ => ps}/table/tensor_accessor.cc | 2 +- .../{ => ps}/table/tensor_accessor.h | 2 +- .../{ => ps}/table/tensor_table.cc | 2 +- .../distributed/{ => ps}/table/tensor_table.h | 2 +- .../{ => ps}/thirdparty/round_robin.h | 0 .../distributed/ps/wrapper/CMakeLists.txt | 9 +++++++ .../distributed/{ => ps/wrapper}/fleet.cc | 6 ++--- .../distributed/{ => ps/wrapper}/fleet.h | 4 +-- .../distributed/test/barrier_table_test.cc | 4 +-- .../test/brpc_service_dense_sgd_test.cc | 4 +-- .../test/brpc_service_sparse_sgd_test.cc | 6 ++--- .../fluid/distributed/test/brpc_utils_test.cc | 2 +- .../distributed/test/ctr_accessor_test.cc | 4 +-- .../distributed/test/dense_table_test.cc | 2 +- .../distributed/test/feature_value_test.cc | 2 +- .../fluid/distributed/test/geo_table_test.cc | 10 +++---- .../distributed/test/graph_node_split_test.cc | 20 +++++++------- .../fluid/distributed/test/graph_node_test.cc | 20 +++++++------- .../distributed/test/large_scale_test.cc | 6 ++--- .../test/memory_sparse_table_test.cc | 4 +-- .../distributed/test/sparse_sgd_rule_test.cc | 2 +- .../distributed/test/sparse_table_test.cc | 8 +++--- paddle/fluid/distributed/test/table_test.cc | 4 +-- paddle/fluid/framework/data_set.cc | 2 +- .../details/async_ssa_graph_executor.cc | 2 +- .../details/threaded_ssa_graph_executor.cc | 2 +- paddle/fluid/framework/fleet/heter_context.h | 4 +-- .../framework/fleet/heter_ps/hashtable.h | 2 +- paddle/fluid/framework/fleet/ps_gpu_wrapper.h | 4 +-- .../fluid/framework/heter_pipeline_trainer.cc | 2 +- .../fluid/framework/heter_section_worker.cc | 2 +- paddle/fluid/framework/hogwild_worker.cc | 2 +- paddle/fluid/framework/multi_trainer.cc | 2 +- .../pscore/distributed_lookup_table_op.h | 4 +-- .../pscore/distributed_push_sparse_op.h | 4 +-- .../pscore/heter_listen_and_serv_op.h | 6 ++--- .../pscore/heter_listen_and_server_test.cc | 4 +-- .../operators/pscore/heter_server_test.cc | 4 +-- .../operators/pscore/send_and_recv_op.cc | 2 +- .../pscore/send_and_recv_op_cpu_test.cc | 4 +-- .../pscore/send_and_recv_op_gpu_test.cc | 4 +-- .../fluid/operators/pscore/send_barrier_op.cc | 2 +- paddle/fluid/operators/pscore/send_op.cc | 4 +-- paddle/fluid/pybind/communicator_py.cc | 2 +- paddle/fluid/pybind/fleet_py.cc | 14 +++++----- 116 files changed, 258 insertions(+), 245 deletions(-) rename paddle/fluid/distributed/{ => ps}/service/CMakeLists.txt (73%) rename paddle/fluid/distributed/{ => ps}/service/brpc_ps_client.cc (99%) rename paddle/fluid/distributed/{ => ps}/service/brpc_ps_client.h (98%) rename paddle/fluid/distributed/{ => ps}/service/brpc_ps_server.cc (99%) rename paddle/fluid/distributed/{ => ps}/service/brpc_ps_server.h (98%) rename paddle/fluid/distributed/{ => ps}/service/brpc_utils.cc (99%) rename paddle/fluid/distributed/{ => ps}/service/brpc_utils.h (98%) create mode 100644 paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt rename paddle/fluid/distributed/{service => ps/service/communicator}/communicator.cc (99%) rename paddle/fluid/distributed/{service => ps/service/communicator}/communicator.h (99%) rename paddle/fluid/distributed/{ => ps/service/communicator}/communicator_common.h (100%) rename paddle/fluid/distributed/{ => ps}/service/env.cc (93%) rename paddle/fluid/distributed/{ => ps}/service/env.h (100%) rename paddle/fluid/distributed/{ => ps}/service/graph_brpc_client.cc (99%) rename paddle/fluid/distributed/{ => ps}/service/graph_brpc_client.h (95%) rename paddle/fluid/distributed/{ => ps}/service/graph_brpc_server.cc (99%) rename paddle/fluid/distributed/{ => ps}/service/graph_brpc_server.h (96%) rename paddle/fluid/distributed/{ => ps}/service/heter_client.cc (99%) rename paddle/fluid/distributed/{ => ps}/service/heter_client.h (95%) rename paddle/fluid/distributed/{ => ps}/service/heter_server.cc (98%) rename paddle/fluid/distributed/{ => ps}/service/heter_server.h (99%) rename paddle/fluid/distributed/{ => ps}/service/ps_client.cc (90%) rename paddle/fluid/distributed/{ => ps}/service/ps_client.h (97%) rename paddle/fluid/distributed/{ => ps}/service/ps_local_client.cc (98%) rename paddle/fluid/distributed/{ => ps}/service/ps_local_client.h (99%) rename paddle/fluid/distributed/{ => ps}/service/ps_local_server.h (95%) rename paddle/fluid/distributed/{service => ps/service/ps_service}/graph_py_service.cc (99%) rename paddle/fluid/distributed/{service => ps/service/ps_service}/graph_py_service.h (95%) rename paddle/fluid/distributed/{service => ps/service/ps_service}/service.cc (96%) rename paddle/fluid/distributed/{service => ps/service/ps_service}/service.h (93%) rename paddle/fluid/distributed/{ => ps}/service/sendrecv.proto (100%) rename paddle/fluid/distributed/{ => ps}/service/server.cc (92%) rename paddle/fluid/distributed/{ => ps}/service/server.h (97%) rename paddle/fluid/distributed/{ => ps}/table/CMakeLists.txt (100%) rename paddle/fluid/distributed/{ => ps}/table/accessor.h (100%) rename paddle/fluid/distributed/{ => ps}/table/barrier_table.cc (97%) rename paddle/fluid/distributed/{ => ps}/table/common_dense_table.cc (99%) rename paddle/fluid/distributed/{ => ps}/table/common_dense_table.h (91%) rename paddle/fluid/distributed/{ => ps}/table/common_graph_table.cc (99%) rename paddle/fluid/distributed/{ => ps}/table/common_graph_table.h (98%) rename paddle/fluid/distributed/{ => ps}/table/common_sparse_table.cc (99%) rename paddle/fluid/distributed/{ => ps}/table/common_sparse_table.h (95%) rename paddle/fluid/distributed/{ => ps}/table/common_table.h (98%) rename paddle/fluid/distributed/{ => ps}/table/ctr_accessor.cc (99%) rename paddle/fluid/distributed/{ => ps}/table/ctr_accessor.h (98%) rename paddle/fluid/distributed/{ => ps}/table/depends/dense.h (100%) rename paddle/fluid/distributed/{ => ps}/table/depends/feature_value.h (100%) rename paddle/fluid/distributed/{ => ps}/table/depends/geo_recorder.h (100%) rename paddle/fluid/distributed/{ => ps}/table/depends/initializers.h (100%) rename paddle/fluid/distributed/{ => ps}/table/depends/large_scale_kv.h (98%) rename paddle/fluid/distributed/{ => ps}/table/depends/rocksdb_warpper.h (100%) rename paddle/fluid/distributed/{ => ps}/table/depends/sparse.h (99%) rename paddle/fluid/distributed/{ => ps}/table/depends/sparse_utils.h (100%) rename paddle/fluid/distributed/{ => ps}/table/graph/graph_edge.cc (93%) rename paddle/fluid/distributed/{ => ps}/table/graph/graph_edge.h (100%) rename paddle/fluid/distributed/{ => ps}/table/graph/graph_node.cc (98%) rename paddle/fluid/distributed/{ => ps}/table/graph/graph_node.h (98%) rename paddle/fluid/distributed/{ => ps}/table/graph/graph_weighted_sampler.cc (98%) rename paddle/fluid/distributed/{ => ps}/table/graph/graph_weighted_sampler.h (96%) rename paddle/fluid/distributed/{ => ps}/table/memory_sparse_table.cc (99%) rename paddle/fluid/distributed/{ => ps}/table/memory_sparse_table.h (94%) rename paddle/fluid/distributed/{ => ps}/table/sparse_geo_table.cc (97%) rename paddle/fluid/distributed/{ => ps}/table/sparse_geo_table.h (79%) rename paddle/fluid/distributed/{ => ps}/table/sparse_sgd_rule.cc (99%) rename paddle/fluid/distributed/{ => ps}/table/sparse_sgd_rule.h (100%) rename paddle/fluid/distributed/{ => ps}/table/ssd_sparse_table.cc (99%) rename paddle/fluid/distributed/{ => ps}/table/ssd_sparse_table.h (93%) rename paddle/fluid/distributed/{ => ps}/table/table.cc (80%) rename paddle/fluid/distributed/{ => ps}/table/table.h (96%) rename paddle/fluid/distributed/{ => ps}/table/tensor_accessor.cc (98%) rename paddle/fluid/distributed/{ => ps}/table/tensor_accessor.h (98%) rename paddle/fluid/distributed/{ => ps}/table/tensor_table.cc (98%) rename paddle/fluid/distributed/{ => ps}/table/tensor_table.h (99%) rename paddle/fluid/distributed/{ => ps}/thirdparty/round_robin.h (100%) create mode 100644 paddle/fluid/distributed/ps/wrapper/CMakeLists.txt rename paddle/fluid/distributed/{ => ps/wrapper}/fleet.cc (99%) rename paddle/fluid/distributed/{ => ps/wrapper}/fleet.h (98%) diff --git a/paddle/fluid/distributed/CMakeLists.txt b/paddle/fluid/distributed/CMakeLists.txt index 24923d7268..5ae2e26e87 100644 --- a/paddle/fluid/distributed/CMakeLists.txt +++ b/paddle/fluid/distributed/CMakeLists.txt @@ -13,17 +13,7 @@ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) endif() add_subdirectory(common) -add_subdirectory(service) -add_subdirectory(table) +add_subdirectory(ps) add_subdirectory(test) add_subdirectory(index_dataset) add_subdirectory(fleet_executor) - -get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS) - -set_source_files_properties(fleet.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) -cc_library(fleet - SRCS fleet.cc - DEPS framework_proto ps_framework_proto ps_service variable_helper scope op_registry fs shell ${RPC_DEPS}) - -target_link_libraries(fleet z) diff --git a/paddle/fluid/distributed/ps/CMakeLists.txt b/paddle/fluid/distributed/ps/CMakeLists.txt index e69de29bb2..e97c9db1a5 100644 --- a/paddle/fluid/distributed/ps/CMakeLists.txt +++ b/paddle/fluid/distributed/ps/CMakeLists.txt @@ -0,0 +1,4 @@ +set_property(GLOBAL PROPERTY RPC_DEPS sendrecv_rpc ${BRPC_DEPS} string_helper) +add_subdirectory(table) +add_subdirectory(service) +add_subdirectory(wrapper) diff --git a/paddle/fluid/distributed/service/CMakeLists.txt b/paddle/fluid/distributed/ps/service/CMakeLists.txt similarity index 73% rename from paddle/fluid/distributed/service/CMakeLists.txt rename to paddle/fluid/distributed/ps/service/CMakeLists.txt index d1f04e26ad..ab6c2e2600 100644 --- a/paddle/fluid/distributed/service/CMakeLists.txt +++ b/paddle/fluid/distributed/ps/service/CMakeLists.txt @@ -8,12 +8,12 @@ brpc_library(sendrecv_rpc SRCS PROTO sendrecv.proto DEPS ${BRPC_DEPS} ) -set_property(GLOBAL PROPERTY RPC_DEPS sendrecv_rpc ${BRPC_DEPS} string_helper) +#set_property(GLOBAL PROPERTY RPC_DEPS sendrecv_rpc ${BRPC_DEPS} string_helper) get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS) -set_source_files_properties(communicator.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) -set_source_files_properties(service.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) +set_source_files_properties(communicator/communicator.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) +set_source_files_properties(ps_service/service.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) set_source_files_properties(brpc_ps_server.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) set_source_files_properties(brpc_ps_client.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) set_source_files_properties(ps_local_client.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) @@ -36,11 +36,13 @@ ps_local_client.cc DEPS boost eigen3 table brpc_utils simple_threadpool ${RPC_DE cc_library(client SRCS ps_client.cc DEPS downpour_client boost ${RPC_DEPS}) cc_library(server SRCS server.cc DEPS downpour_server boost ${RPC_DEPS}) -cc_library(communicator SRCS communicator.cc DEPS scope client boost table math_function selected_rows_functor ${RPC_DEPS}) -cc_library(ps_service SRCS service.cc DEPS communicator client server boost ${RPC_DEPS}) +cc_library(communicator SRCS communicator/communicator.cc DEPS scope client boost table math_function selected_rows_functor ${RPC_DEPS}) +cc_library(ps_service SRCS ps_service/service.cc DEPS communicator client server boost ${RPC_DEPS}) cc_library(heter_server SRCS heter_server.cc DEPS brpc_utils ${COMMON_DEPS} ${RPC_DEPS}) cc_library(heter_client SRCS heter_client.cc DEPS brpc_utils ${COMMON_DEPS} ${RPC_DEPS}) -set_source_files_properties(graph_py_service.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) -cc_library(graph_py_service SRCS graph_py_service.cc DEPS ps_service) +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/service/brpc_ps_client.cc b/paddle/fluid/distributed/ps/service/brpc_ps_client.cc similarity index 99% rename from paddle/fluid/distributed/service/brpc_ps_client.cc rename to paddle/fluid/distributed/ps/service/brpc_ps_client.cc index db1dd2ced8..e855fcbd02 100644 --- a/paddle/fluid/distributed/service/brpc_ps_client.cc +++ b/paddle/fluid/distributed/ps/service/brpc_ps_client.cc @@ -16,7 +16,7 @@ #include #include -#include "paddle/fluid/distributed/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" #include "paddle/fluid/framework/archive.h" static const int max_port = 65535; diff --git a/paddle/fluid/distributed/service/brpc_ps_client.h b/paddle/fluid/distributed/ps/service/brpc_ps_client.h similarity index 98% rename from paddle/fluid/distributed/service/brpc_ps_client.h rename to paddle/fluid/distributed/ps/service/brpc_ps_client.h index d5388a5cd0..70f406ee24 100644 --- a/paddle/fluid/distributed/service/brpc_ps_client.h +++ b/paddle/fluid/distributed/ps/service/brpc_ps_client.h @@ -22,8 +22,8 @@ #include "brpc/channel.h" #include "brpc/controller.h" #include "brpc/server.h" -#include "paddle/fluid/distributed/service/brpc_utils.h" -#include "paddle/fluid/distributed/service/ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_utils.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" #include "paddle/fluid/framework/channel.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/scope.h" diff --git a/paddle/fluid/distributed/service/brpc_ps_server.cc b/paddle/fluid/distributed/ps/service/brpc_ps_server.cc similarity index 99% rename from paddle/fluid/distributed/service/brpc_ps_server.cc rename to paddle/fluid/distributed/ps/service/brpc_ps_server.cc index dd7072be7d..58ce52552c 100644 --- a/paddle/fluid/distributed/service/brpc_ps_server.cc +++ b/paddle/fluid/distributed/ps/service/brpc_ps_server.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" #include // NOLINT #include "butil/object_pool.h" #include "paddle/fluid/distributed/common/cost_timer.h" -#include "paddle/fluid/distributed/table/depends/sparse_utils.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/depends/sparse_utils.h" +#include "paddle/fluid/distributed/ps/table/table.h" #include "paddle/fluid/framework/archive.h" #include "paddle/fluid/platform/profiler.h" diff --git a/paddle/fluid/distributed/service/brpc_ps_server.h b/paddle/fluid/distributed/ps/service/brpc_ps_server.h similarity index 98% rename from paddle/fluid/distributed/service/brpc_ps_server.h rename to paddle/fluid/distributed/ps/service/brpc_ps_server.h index bf228a5d1b..4310c24743 100644 --- a/paddle/fluid/distributed/service/brpc_ps_server.h +++ b/paddle/fluid/distributed/ps/service/brpc_ps_server.h @@ -17,8 +17,8 @@ #include "brpc/channel.h" #include "brpc/controller.h" #include "brpc/server.h" -#include "paddle/fluid/distributed/service/brpc_utils.h" -#include "paddle/fluid/distributed/service/server.h" +#include "paddle/fluid/distributed/ps/service/brpc_utils.h" +#include "paddle/fluid/distributed/ps/service/server.h" namespace brpc { class Controller; diff --git a/paddle/fluid/distributed/service/brpc_utils.cc b/paddle/fluid/distributed/ps/service/brpc_utils.cc similarity index 99% rename from paddle/fluid/distributed/service/brpc_utils.cc rename to paddle/fluid/distributed/ps/service/brpc_utils.cc index bce3e46a2b..23b2f5545f 100644 --- a/paddle/fluid/distributed/service/brpc_utils.cc +++ b/paddle/fluid/distributed/ps/service/brpc_utils.cc @@ -12,7 +12,7 @@ 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. */ -#include "paddle/fluid/distributed/service/brpc_utils.h" +#include "paddle/fluid/distributed/ps/service/brpc_utils.h" #include #include #include "paddle/fluid/platform/enforce.h" diff --git a/paddle/fluid/distributed/service/brpc_utils.h b/paddle/fluid/distributed/ps/service/brpc_utils.h similarity index 98% rename from paddle/fluid/distributed/service/brpc_utils.h rename to paddle/fluid/distributed/ps/service/brpc_utils.h index ebae710acc..b241f7f801 100644 --- a/paddle/fluid/distributed/service/brpc_utils.h +++ b/paddle/fluid/distributed/ps/service/brpc_utils.h @@ -20,7 +20,7 @@ limitations under the License. */ #include #include "brpc/channel.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/scope.h" diff --git a/paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt b/paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt new file mode 100644 index 0000000000..3610729d74 --- /dev/null +++ b/paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt @@ -0,0 +1,8 @@ + + +get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS) + +set_source_files_properties(communicator.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) + + +cc_library(communicator SRCS communicator.cc DEPS scope client boost table math_function selected_rows_functor ${RPC_DEPS}) diff --git a/paddle/fluid/distributed/service/communicator.cc b/paddle/fluid/distributed/ps/service/communicator/communicator.cc similarity index 99% rename from paddle/fluid/distributed/service/communicator.cc rename to paddle/fluid/distributed/ps/service/communicator/communicator.cc index 2e37442e02..a73f87c1d8 100644 --- a/paddle/fluid/distributed/service/communicator.cc +++ b/paddle/fluid/distributed/ps/service/communicator/communicator.cc @@ -12,12 +12,12 @@ 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. */ -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #include #include "gflags/gflags.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" #include "paddle/fluid/platform/profiler.h" #include "paddle/fluid/string/string_helper.h" diff --git a/paddle/fluid/distributed/service/communicator.h b/paddle/fluid/distributed/ps/service/communicator/communicator.h similarity index 99% rename from paddle/fluid/distributed/service/communicator.h rename to paddle/fluid/distributed/ps/service/communicator/communicator.h index 8a90537797..570e668d9d 100644 --- a/paddle/fluid/distributed/service/communicator.h +++ b/paddle/fluid/distributed/ps/service/communicator/communicator.h @@ -29,7 +29,7 @@ limitations under the License. */ #include #include "gflags/gflags.h" -#include "paddle/fluid/distributed/communicator_common.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator_common.h" #include "paddle/fluid/framework/scope.h" #include "paddle/fluid/framework/variable.h" #include "paddle/fluid/framework/variable_helper.h" @@ -41,7 +41,7 @@ limitations under the License. */ #include "paddle/fluid/platform/place.h" #include "paddle/fluid/string/split.h" -#include "paddle/fluid/distributed/service/ps_client.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/communicator_common.h b/paddle/fluid/distributed/ps/service/communicator/communicator_common.h similarity index 100% rename from paddle/fluid/distributed/communicator_common.h rename to paddle/fluid/distributed/ps/service/communicator/communicator_common.h diff --git a/paddle/fluid/distributed/service/env.cc b/paddle/fluid/distributed/ps/service/env.cc similarity index 93% rename from paddle/fluid/distributed/service/env.cc rename to paddle/fluid/distributed/ps/service/env.cc index 25bc2cc366..15bd31ce95 100644 --- a/paddle/fluid/distributed/service/env.cc +++ b/paddle/fluid/distributed/ps/service/env.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/env.h" +#include "paddle/fluid/distributed/ps/service/env.h" namespace paddle { namespace distributed {} // namespace distributed diff --git a/paddle/fluid/distributed/service/env.h b/paddle/fluid/distributed/ps/service/env.h similarity index 100% rename from paddle/fluid/distributed/service/env.h rename to paddle/fluid/distributed/ps/service/env.h diff --git a/paddle/fluid/distributed/service/graph_brpc_client.cc b/paddle/fluid/distributed/ps/service/graph_brpc_client.cc similarity index 99% rename from paddle/fluid/distributed/service/graph_brpc_client.cc rename to paddle/fluid/distributed/ps/service/graph_brpc_client.cc index a9682d6a6e..301708f6b7 100644 --- a/paddle/fluid/distributed/service/graph_brpc_client.cc +++ b/paddle/fluid/distributed/ps/service/graph_brpc_client.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/graph_brpc_client.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_client.h" #include #include #include @@ -20,8 +20,8 @@ #include #include #include "Eigen/Dense" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/table/table.h" #include "paddle/fluid/framework/archive.h" #include "paddle/fluid/string/string_helper.h" namespace paddle { diff --git a/paddle/fluid/distributed/service/graph_brpc_client.h b/paddle/fluid/distributed/ps/service/graph_brpc_client.h similarity index 95% rename from paddle/fluid/distributed/service/graph_brpc_client.h rename to paddle/fluid/distributed/ps/service/graph_brpc_client.h index 2e5d5b6ee9..06e753d028 100644 --- a/paddle/fluid/distributed/service/graph_brpc_client.h +++ b/paddle/fluid/distributed/ps/service/graph_brpc_client.h @@ -24,10 +24,10 @@ #include "brpc/channel.h" #include "brpc/controller.h" #include "brpc/server.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/service/graph_brpc_server.h" -#include "paddle/fluid/distributed/service/ps_client.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_server.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" +#include "paddle/fluid/distributed/ps/table/table.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/scope.h" #include "paddle/fluid/framework/tensor_util.h" diff --git a/paddle/fluid/distributed/service/graph_brpc_server.cc b/paddle/fluid/distributed/ps/service/graph_brpc_server.cc similarity index 99% rename from paddle/fluid/distributed/service/graph_brpc_server.cc rename to paddle/fluid/distributed/ps/service/graph_brpc_server.cc index c1348e4804..441f489fb3 100644 --- a/paddle/fluid/distributed/service/graph_brpc_server.cc +++ b/paddle/fluid/distributed/ps/service/graph_brpc_server.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/graph_brpc_server.h" -#include "paddle/fluid/distributed/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_server.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" #include // NOLINT #include #include "butil/endpoint.h" #include "iomanip" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" #include "paddle/fluid/framework/archive.h" #include "paddle/fluid/platform/profiler.h" namespace paddle { diff --git a/paddle/fluid/distributed/service/graph_brpc_server.h b/paddle/fluid/distributed/ps/service/graph_brpc_server.h similarity index 96% rename from paddle/fluid/distributed/service/graph_brpc_server.h rename to paddle/fluid/distributed/ps/service/graph_brpc_server.h index ecd78d28ca..aee0190850 100644 --- a/paddle/fluid/distributed/service/graph_brpc_server.h +++ b/paddle/fluid/distributed/ps/service/graph_brpc_server.h @@ -20,10 +20,10 @@ #include #include -#include "paddle/fluid/distributed/service/brpc_ps_server.h" -#include "paddle/fluid/distributed/service/server.h" -#include "paddle/fluid/distributed/table/common_graph_table.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/server.h" +#include "paddle/fluid/distributed/ps/table/common_graph_table.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { class GraphBrpcServer : public PSServer { diff --git a/paddle/fluid/distributed/service/heter_client.cc b/paddle/fluid/distributed/ps/service/heter_client.cc similarity index 99% rename from paddle/fluid/distributed/service/heter_client.cc rename to paddle/fluid/distributed/ps/service/heter_client.cc index 95023704f9..e9e3ec1d9d 100644 --- a/paddle/fluid/distributed/service/heter_client.cc +++ b/paddle/fluid/distributed/ps/service/heter_client.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/heter_client.h" #include "paddle/fluid/platform/profiler.h" #include "paddle/fluid/string/split.h" diff --git a/paddle/fluid/distributed/service/heter_client.h b/paddle/fluid/distributed/ps/service/heter_client.h similarity index 95% rename from paddle/fluid/distributed/service/heter_client.h rename to paddle/fluid/distributed/ps/service/heter_client.h index 7ba47ad9a5..4f27ef75ea 100644 --- a/paddle/fluid/distributed/service/heter_client.h +++ b/paddle/fluid/distributed/ps/service/heter_client.h @@ -25,9 +25,9 @@ limitations under the License. */ #include "brpc/channel.h" #include "brpc/controller.h" #include "brpc/server.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/service/brpc_utils.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_utils.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" #include "paddle/fluid/framework/scope.h" #include "paddle/fluid/framework/tensor.h" #include "paddle/fluid/framework/variable_helper.h" diff --git a/paddle/fluid/distributed/service/heter_server.cc b/paddle/fluid/distributed/ps/service/heter_server.cc similarity index 98% rename from paddle/fluid/distributed/service/heter_server.cc rename to paddle/fluid/distributed/ps/service/heter_server.cc index fee3081f03..01afed3f12 100644 --- a/paddle/fluid/distributed/service/heter_server.cc +++ b/paddle/fluid/distributed/ps/service/heter_server.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" #include "paddle/fluid/string/split.h" namespace paddle { diff --git a/paddle/fluid/distributed/service/heter_server.h b/paddle/fluid/distributed/ps/service/heter_server.h similarity index 99% rename from paddle/fluid/distributed/service/heter_server.h rename to paddle/fluid/distributed/ps/service/heter_server.h index 094ee60364..86f83cb1fc 100644 --- a/paddle/fluid/distributed/service/heter_server.h +++ b/paddle/fluid/distributed/ps/service/heter_server.h @@ -25,8 +25,8 @@ limitations under the License. */ #include "brpc/channel.h" #include "brpc/controller.h" #include "brpc/server.h" -#include "paddle/fluid/distributed/service/brpc_utils.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/service/brpc_utils.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" #include "paddle/fluid/framework/blocking_queue.h" #include "paddle/fluid/framework/executor.h" #include "paddle/fluid/framework/program_desc.h" diff --git a/paddle/fluid/distributed/service/ps_client.cc b/paddle/fluid/distributed/ps/service/ps_client.cc similarity index 90% rename from paddle/fluid/distributed/service/ps_client.cc rename to paddle/fluid/distributed/ps/service/ps_client.cc index d45f41a0f5..fd956b758d 100644 --- a/paddle/fluid/distributed/service/ps_client.cc +++ b/paddle/fluid/distributed/ps/service/ps_client.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/ps_client.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" #include "glog/logging.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/service/graph_brpc_client.h" -#include "paddle/fluid/distributed/service/ps_local_client.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_client.h" +#include "paddle/fluid/distributed/ps/service/ps_local_client.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/service/ps_client.h b/paddle/fluid/distributed/ps/service/ps_client.h similarity index 97% rename from paddle/fluid/distributed/service/ps_client.h rename to paddle/fluid/distributed/ps/service/ps_client.h index a408a0cc24..7db8b0c124 100644 --- a/paddle/fluid/distributed/service/ps_client.h +++ b/paddle/fluid/distributed/ps/service/ps_client.h @@ -22,10 +22,10 @@ #include #include "paddle/fluid/distributed/common/cost_timer.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/service/env.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/graph/graph_node.h" +#include "paddle/fluid/distributed/ps/service/env.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_node.h" #include "paddle/fluid/platform/timer.h" namespace paddle { diff --git a/paddle/fluid/distributed/service/ps_local_client.cc b/paddle/fluid/distributed/ps/service/ps_local_client.cc similarity index 98% rename from paddle/fluid/distributed/service/ps_local_client.cc rename to paddle/fluid/distributed/ps/service/ps_local_client.cc index e949b21b02..972cce135f 100644 --- a/paddle/fluid/distributed/service/ps_local_client.cc +++ b/paddle/fluid/distributed/ps/service/ps_local_client.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/ps_local_client.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/service/ps_local_client.h" +#include "paddle/fluid/distributed/ps/table/table.h" //#define pslib_debug_dense_compress diff --git a/paddle/fluid/distributed/service/ps_local_client.h b/paddle/fluid/distributed/ps/service/ps_local_client.h similarity index 99% rename from paddle/fluid/distributed/service/ps_local_client.h rename to paddle/fluid/distributed/ps/service/ps_local_client.h index 9d2b01a45f..e73974ac56 100644 --- a/paddle/fluid/distributed/service/ps_local_client.h +++ b/paddle/fluid/distributed/ps/service/ps_local_client.h @@ -15,7 +15,7 @@ #include "brpc/channel.h" #include "brpc/controller.h" #include "brpc/server.h" -#include "paddle/fluid/distributed/service/ps_client.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/service/ps_local_server.h b/paddle/fluid/distributed/ps/service/ps_local_server.h similarity index 95% rename from paddle/fluid/distributed/service/ps_local_server.h rename to paddle/fluid/distributed/ps/service/ps_local_server.h index 33b0b5fa79..91f8bc4c91 100644 --- a/paddle/fluid/distributed/service/ps_local_server.h +++ b/paddle/fluid/distributed/ps/service/ps_local_server.h @@ -16,7 +16,7 @@ #include #include -#include "paddle/fluid/distributed/service/server.h" +#include "paddle/fluid/distributed/ps/service/server.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/service/graph_py_service.cc b/paddle/fluid/distributed/ps/service/ps_service/graph_py_service.cc similarity index 99% rename from paddle/fluid/distributed/service/graph_py_service.cc rename to paddle/fluid/distributed/ps/service/ps_service/graph_py_service.cc index 8d7a822321..b2aece9807 100644 --- a/paddle/fluid/distributed/service/graph_py_service.cc +++ b/paddle/fluid/distributed/ps/service/ps_service/graph_py_service.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/graph_py_service.h" +#include "paddle/fluid/distributed/ps/service/ps_service/graph_py_service.h" #include // NOLINT #include "butil/endpoint.h" #include "iomanip" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/table.h" #include "paddle/fluid/framework/archive.h" #include "paddle/fluid/platform/profiler.h" namespace paddle { diff --git a/paddle/fluid/distributed/service/graph_py_service.h b/paddle/fluid/distributed/ps/service/ps_service/graph_py_service.h similarity index 95% rename from paddle/fluid/distributed/service/graph_py_service.h rename to paddle/fluid/distributed/ps/service/ps_service/graph_py_service.h index a860d1f58d..71b44f36d0 100644 --- a/paddle/fluid/distributed/service/graph_py_service.h +++ b/paddle/fluid/distributed/ps/service/ps_service/graph_py_service.h @@ -32,11 +32,11 @@ #include "paddle/fluid/framework/variable.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/service/env.h" -#include "paddle/fluid/distributed/service/graph_brpc_client.h" -#include "paddle/fluid/distributed/service/graph_brpc_server.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" -#include "paddle/fluid/distributed/service/service.h" +#include "paddle/fluid/distributed/ps/service/env.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_client.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_server.h" +#include "paddle/fluid/distributed/ps/service/ps_service/service.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/operators/math/math_function.h" #include "paddle/fluid/platform/place.h" diff --git a/paddle/fluid/distributed/service/service.cc b/paddle/fluid/distributed/ps/service/ps_service/service.cc similarity index 96% rename from paddle/fluid/distributed/service/service.cc rename to paddle/fluid/distributed/ps/service/ps_service/service.cc index 698ceb1578..73793d2f9b 100644 --- a/paddle/fluid/distributed/service/service.cc +++ b/paddle/fluid/distributed/ps/service/ps_service/service.cc @@ -12,13 +12,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -#include "paddle/fluid/distributed/service/service.h" +#include "paddle/fluid/distributed/ps/service/ps_service/service.h" #include #include #include #include -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #include "paddle/fluid/string/string_helper.h" using namespace std; // NOLINT diff --git a/paddle/fluid/distributed/service/service.h b/paddle/fluid/distributed/ps/service/ps_service/service.h similarity index 93% rename from paddle/fluid/distributed/service/service.h rename to paddle/fluid/distributed/ps/service/ps_service/service.h index 5c987267f9..202c2407f1 100644 --- a/paddle/fluid/distributed/service/service.h +++ b/paddle/fluid/distributed/ps/service/ps_service/service.h @@ -20,9 +20,9 @@ limitations under the License. */ #include #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/service/ps_client.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" -#include "paddle/fluid/distributed/service/server.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/service/server.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/service/sendrecv.proto b/paddle/fluid/distributed/ps/service/sendrecv.proto similarity index 100% rename from paddle/fluid/distributed/service/sendrecv.proto rename to paddle/fluid/distributed/ps/service/sendrecv.proto diff --git a/paddle/fluid/distributed/service/server.cc b/paddle/fluid/distributed/ps/service/server.cc similarity index 92% rename from paddle/fluid/distributed/service/server.cc rename to paddle/fluid/distributed/ps/service/server.cc index e44876e3d2..5f1974e3e6 100644 --- a/paddle/fluid/distributed/service/server.cc +++ b/paddle/fluid/distributed/ps/service/server.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/service/server.h" +#include "paddle/fluid/distributed/ps/service/server.h" #include "glog/logging.h" -#include "paddle/fluid/distributed/service/brpc_ps_server.h" -#include "paddle/fluid/distributed/service/graph_brpc_server.h" -#include "paddle/fluid/distributed/service/ps_local_server.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_server.h" +#include "paddle/fluid/distributed/ps/service/ps_local_server.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/service/server.h b/paddle/fluid/distributed/ps/service/server.h similarity index 97% rename from paddle/fluid/distributed/service/server.h rename to paddle/fluid/distributed/ps/service/server.h index ebebedc80e..160d4a6128 100644 --- a/paddle/fluid/distributed/service/server.h +++ b/paddle/fluid/distributed/ps/service/server.h @@ -24,8 +24,8 @@ #include "google/protobuf/service.h" #include "paddle/fluid/distributed/common/registerer.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/service/env.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/service/env.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" #include "paddle/fluid/framework/channel.h" #include "paddle/fluid/framework/scope.h" #include "paddle/fluid/platform/device_context.h" diff --git a/paddle/fluid/distributed/table/CMakeLists.txt b/paddle/fluid/distributed/ps/table/CMakeLists.txt similarity index 100% rename from paddle/fluid/distributed/table/CMakeLists.txt rename to paddle/fluid/distributed/ps/table/CMakeLists.txt diff --git a/paddle/fluid/distributed/table/accessor.h b/paddle/fluid/distributed/ps/table/accessor.h similarity index 100% rename from paddle/fluid/distributed/table/accessor.h rename to paddle/fluid/distributed/ps/table/accessor.h diff --git a/paddle/fluid/distributed/table/barrier_table.cc b/paddle/fluid/distributed/ps/table/barrier_table.cc similarity index 97% rename from paddle/fluid/distributed/table/barrier_table.cc rename to paddle/fluid/distributed/ps/table/barrier_table.cc index 72394d15c5..25838e7ac2 100644 --- a/paddle/fluid/distributed/table/barrier_table.cc +++ b/paddle/fluid/distributed/ps/table/barrier_table.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/common_table.h" +#include "paddle/fluid/distributed/ps/table/common_table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/common_dense_table.cc b/paddle/fluid/distributed/ps/table/common_dense_table.cc similarity index 99% rename from paddle/fluid/distributed/table/common_dense_table.cc rename to paddle/fluid/distributed/ps/table/common_dense_table.cc index b34b143a3c..607469e2f7 100644 --- a/paddle/fluid/distributed/table/common_dense_table.cc +++ b/paddle/fluid/distributed/ps/table/common_dense_table.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/common_dense_table.h" +#include "paddle/fluid/distributed/ps/table/common_dense_table.h" #include "paddle/fluid/platform/enforce.h" diff --git a/paddle/fluid/distributed/table/common_dense_table.h b/paddle/fluid/distributed/ps/table/common_dense_table.h similarity index 91% rename from paddle/fluid/distributed/table/common_dense_table.h rename to paddle/fluid/distributed/ps/table/common_dense_table.h index c8813dc330..a4c0f29ddb 100644 --- a/paddle/fluid/distributed/table/common_dense_table.h +++ b/paddle/fluid/distributed/ps/table/common_dense_table.h @@ -19,10 +19,10 @@ #include #include #include "Eigen/Dense" -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/common_table.h" -#include "paddle/fluid/distributed/table/depends/dense.h" -#include "paddle/fluid/distributed/table/depends/initializers.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/common_table.h" +#include "paddle/fluid/distributed/ps/table/depends/dense.h" +#include "paddle/fluid/distributed/ps/table/depends/initializers.h" #include "paddle/fluid/string/string_helper.h" namespace paddle { diff --git a/paddle/fluid/distributed/table/common_graph_table.cc b/paddle/fluid/distributed/ps/table/common_graph_table.cc similarity index 99% rename from paddle/fluid/distributed/table/common_graph_table.cc rename to paddle/fluid/distributed/ps/table/common_graph_table.cc index 042a4dee62..54b98cb96c 100644 --- a/paddle/fluid/distributed/table/common_graph_table.cc +++ b/paddle/fluid/distributed/ps/table/common_graph_table.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/common_graph_table.h" +#include "paddle/fluid/distributed/ps/table/common_graph_table.h" #include #include #include #include #include #include "paddle/fluid/distributed/common/utils.h" -#include "paddle/fluid/distributed/table/graph/graph_node.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_node.h" #include "paddle/fluid/framework/generator.h" #include "paddle/fluid/string/printf.h" #include "paddle/fluid/string/string_helper.h" diff --git a/paddle/fluid/distributed/table/common_graph_table.h b/paddle/fluid/distributed/ps/table/common_graph_table.h similarity index 98% rename from paddle/fluid/distributed/table/common_graph_table.h rename to paddle/fluid/distributed/ps/table/common_graph_table.h index bdc3bee2ea..4fc5b5ab63 100644 --- a/paddle/fluid/distributed/table/common_graph_table.h +++ b/paddle/fluid/distributed/ps/table/common_graph_table.h @@ -36,11 +36,10 @@ #include #include #include -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/common_table.h" -#include "paddle/fluid/distributed/table/graph/graph_node.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/common_table.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_node.h" #include "paddle/fluid/string/string_helper.h" - #include "paddle/pten/core/utils/rw_lock.h" namespace paddle { diff --git a/paddle/fluid/distributed/table/common_sparse_table.cc b/paddle/fluid/distributed/ps/table/common_sparse_table.cc similarity index 99% rename from paddle/fluid/distributed/table/common_sparse_table.cc rename to paddle/fluid/distributed/ps/table/common_sparse_table.cc index 143b24cf32..b44d08b937 100644 --- a/paddle/fluid/distributed/table/common_sparse_table.cc +++ b/paddle/fluid/distributed/ps/table/common_sparse_table.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" #include #include "glog/logging.h" diff --git a/paddle/fluid/distributed/table/common_sparse_table.h b/paddle/fluid/distributed/ps/table/common_sparse_table.h similarity index 95% rename from paddle/fluid/distributed/table/common_sparse_table.h rename to paddle/fluid/distributed/ps/table/common_sparse_table.h index 1dc9ffba91..2e02d13e7e 100644 --- a/paddle/fluid/distributed/table/common_sparse_table.h +++ b/paddle/fluid/distributed/ps/table/common_sparse_table.h @@ -24,11 +24,11 @@ #include #include #include "Eigen/Dense" -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/common_table.h" -#include "paddle/fluid/distributed/table/depends/initializers.h" -#include "paddle/fluid/distributed/table/depends/large_scale_kv.h" -#include "paddle/fluid/distributed/table/depends/sparse.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/common_table.h" +#include "paddle/fluid/distributed/ps/table/depends/initializers.h" +#include "paddle/fluid/distributed/ps/table/depends/large_scale_kv.h" +#include "paddle/fluid/distributed/ps/table/depends/sparse.h" #include "paddle/fluid/string/string_helper.h" #include "paddle/pten/core/utils/rw_lock.h" diff --git a/paddle/fluid/distributed/table/common_table.h b/paddle/fluid/distributed/ps/table/common_table.h similarity index 98% rename from paddle/fluid/distributed/table/common_table.h rename to paddle/fluid/distributed/ps/table/common_table.h index bc7f17f5f2..bac826dfe0 100644 --- a/paddle/fluid/distributed/table/common_table.h +++ b/paddle/fluid/distributed/ps/table/common_table.h @@ -19,7 +19,7 @@ #include // NOLINT #include -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/table.h" #include "paddle/fluid/distributed/common/utils.h" diff --git a/paddle/fluid/distributed/table/ctr_accessor.cc b/paddle/fluid/distributed/ps/table/ctr_accessor.cc similarity index 99% rename from paddle/fluid/distributed/table/ctr_accessor.cc rename to paddle/fluid/distributed/ps/table/ctr_accessor.cc index 23144f39ad..866bd8114c 100644 --- a/paddle/fluid/distributed/table/ctr_accessor.cc +++ b/paddle/fluid/distributed/ps/table/ctr_accessor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/ctr_accessor.h" +#include "paddle/fluid/distributed/ps/table/ctr_accessor.h" #include #include "glog/logging.h" #include "paddle/fluid/string/string_helper.h" diff --git a/paddle/fluid/distributed/table/ctr_accessor.h b/paddle/fluid/distributed/ps/table/ctr_accessor.h similarity index 98% rename from paddle/fluid/distributed/table/ctr_accessor.h rename to paddle/fluid/distributed/ps/table/ctr_accessor.h index 8be672e8e0..1e31fec046 100644 --- a/paddle/fluid/distributed/table/ctr_accessor.h +++ b/paddle/fluid/distributed/ps/table/ctr_accessor.h @@ -18,8 +18,8 @@ #include #include "paddle/fluid/distributed/common/registerer.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/sparse_sgd_rule.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/sparse_sgd_rule.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/depends/dense.h b/paddle/fluid/distributed/ps/table/depends/dense.h similarity index 100% rename from paddle/fluid/distributed/table/depends/dense.h rename to paddle/fluid/distributed/ps/table/depends/dense.h diff --git a/paddle/fluid/distributed/table/depends/feature_value.h b/paddle/fluid/distributed/ps/table/depends/feature_value.h similarity index 100% rename from paddle/fluid/distributed/table/depends/feature_value.h rename to paddle/fluid/distributed/ps/table/depends/feature_value.h diff --git a/paddle/fluid/distributed/table/depends/geo_recorder.h b/paddle/fluid/distributed/ps/table/depends/geo_recorder.h similarity index 100% rename from paddle/fluid/distributed/table/depends/geo_recorder.h rename to paddle/fluid/distributed/ps/table/depends/geo_recorder.h diff --git a/paddle/fluid/distributed/table/depends/initializers.h b/paddle/fluid/distributed/ps/table/depends/initializers.h similarity index 100% rename from paddle/fluid/distributed/table/depends/initializers.h rename to paddle/fluid/distributed/ps/table/depends/initializers.h diff --git a/paddle/fluid/distributed/table/depends/large_scale_kv.h b/paddle/fluid/distributed/ps/table/depends/large_scale_kv.h similarity index 98% rename from paddle/fluid/distributed/table/depends/large_scale_kv.h rename to paddle/fluid/distributed/ps/table/depends/large_scale_kv.h index 9a327f3f42..dc7766c7ce 100644 --- a/paddle/fluid/distributed/table/depends/large_scale_kv.h +++ b/paddle/fluid/distributed/ps/table/depends/large_scale_kv.h @@ -28,8 +28,8 @@ #include "butil/object_pool.h" #include "paddle/fluid/distributed/common/utils.h" -#include "paddle/fluid/distributed/table/depends/initializers.h" -#include "paddle/fluid/distributed/thirdparty/round_robin.h" +#include "paddle/fluid/distributed/ps/table/depends/initializers.h" +#include "paddle/fluid/distributed/ps/thirdparty/round_robin.h" #include "paddle/fluid/framework/generator.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/selected_rows_utils.h" diff --git a/paddle/fluid/distributed/table/depends/rocksdb_warpper.h b/paddle/fluid/distributed/ps/table/depends/rocksdb_warpper.h similarity index 100% rename from paddle/fluid/distributed/table/depends/rocksdb_warpper.h rename to paddle/fluid/distributed/ps/table/depends/rocksdb_warpper.h diff --git a/paddle/fluid/distributed/table/depends/sparse.h b/paddle/fluid/distributed/ps/table/depends/sparse.h similarity index 99% rename from paddle/fluid/distributed/table/depends/sparse.h rename to paddle/fluid/distributed/ps/table/depends/sparse.h index 0e1d7ef03c..d4ea7829e4 100644 --- a/paddle/fluid/distributed/table/depends/sparse.h +++ b/paddle/fluid/distributed/ps/table/depends/sparse.h @@ -24,7 +24,7 @@ #include "gflags/gflags.h" #include "paddle/fluid/distributed/common/utils.h" -#include "paddle/fluid/distributed/table/depends/large_scale_kv.h" +#include "paddle/fluid/distributed/ps/table/depends/large_scale_kv.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/depends/sparse_utils.h b/paddle/fluid/distributed/ps/table/depends/sparse_utils.h similarity index 100% rename from paddle/fluid/distributed/table/depends/sparse_utils.h rename to paddle/fluid/distributed/ps/table/depends/sparse_utils.h diff --git a/paddle/fluid/distributed/table/graph/graph_edge.cc b/paddle/fluid/distributed/ps/table/graph/graph_edge.cc similarity index 93% rename from paddle/fluid/distributed/table/graph/graph_edge.cc rename to paddle/fluid/distributed/ps/table/graph/graph_edge.cc index 0ab0d5a76d..d1961b655d 100644 --- a/paddle/fluid/distributed/table/graph/graph_edge.cc +++ b/paddle/fluid/distributed/ps/table/graph/graph_edge.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/graph/graph_edge.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_edge.h" #include namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/graph/graph_edge.h b/paddle/fluid/distributed/ps/table/graph/graph_edge.h similarity index 100% rename from paddle/fluid/distributed/table/graph/graph_edge.h rename to paddle/fluid/distributed/ps/table/graph/graph_edge.h diff --git a/paddle/fluid/distributed/table/graph/graph_node.cc b/paddle/fluid/distributed/ps/table/graph/graph_node.cc similarity index 98% rename from paddle/fluid/distributed/table/graph/graph_node.cc rename to paddle/fluid/distributed/ps/table/graph/graph_node.cc index 52c708be88..366e607261 100644 --- a/paddle/fluid/distributed/table/graph/graph_node.cc +++ b/paddle/fluid/distributed/ps/table/graph/graph_node.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/graph/graph_node.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_node.h" #include namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/graph/graph_node.h b/paddle/fluid/distributed/ps/table/graph/graph_node.h similarity index 98% rename from paddle/fluid/distributed/table/graph/graph_node.h rename to paddle/fluid/distributed/ps/table/graph/graph_node.h index b7a564ef7b..b838c2c125 100644 --- a/paddle/fluid/distributed/table/graph/graph_node.h +++ b/paddle/fluid/distributed/ps/table/graph/graph_node.h @@ -18,7 +18,7 @@ #include #include #include -#include "paddle/fluid/distributed/table/graph/graph_weighted_sampler.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/graph/graph_weighted_sampler.cc b/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.cc similarity index 98% rename from paddle/fluid/distributed/table/graph/graph_weighted_sampler.cc rename to paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.cc index 7a46433e3d..8186acec1b 100644 --- a/paddle/fluid/distributed/table/graph/graph_weighted_sampler.cc +++ b/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/graph/graph_weighted_sampler.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h" #include #include #include diff --git a/paddle/fluid/distributed/table/graph/graph_weighted_sampler.h b/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h similarity index 96% rename from paddle/fluid/distributed/table/graph/graph_weighted_sampler.h rename to paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h index 4a75a11269..c10617022d 100644 --- a/paddle/fluid/distributed/table/graph/graph_weighted_sampler.h +++ b/paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h @@ -18,7 +18,7 @@ #include #include #include -#include "paddle/fluid/distributed/table/graph/graph_edge.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_edge.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/memory_sparse_table.cc b/paddle/fluid/distributed/ps/table/memory_sparse_table.cc similarity index 99% rename from paddle/fluid/distributed/table/memory_sparse_table.cc rename to paddle/fluid/distributed/ps/table/memory_sparse_table.cc index 086ddcafeb..7ce6e9005c 100644 --- a/paddle/fluid/distributed/table/memory_sparse_table.cc +++ b/paddle/fluid/distributed/ps/table/memory_sparse_table.cc @@ -16,7 +16,7 @@ #include #include "paddle/fluid/distributed/common/cost_timer.h" -#include "paddle/fluid/distributed/table/memory_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/memory_sparse_table.h" #include "paddle/fluid/framework/io/fs.h" #include "boost/lexical_cast.hpp" diff --git a/paddle/fluid/distributed/table/memory_sparse_table.h b/paddle/fluid/distributed/ps/table/memory_sparse_table.h similarity index 94% rename from paddle/fluid/distributed/table/memory_sparse_table.h rename to paddle/fluid/distributed/ps/table/memory_sparse_table.h index cb552beab1..5770f25f8f 100644 --- a/paddle/fluid/distributed/table/memory_sparse_table.h +++ b/paddle/fluid/distributed/ps/table/memory_sparse_table.h @@ -24,9 +24,9 @@ #include #include #include "Eigen/Dense" -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/common_table.h" -#include "paddle/fluid/distributed/table/depends/feature_value.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/common_table.h" +#include "paddle/fluid/distributed/ps/table/depends/feature_value.h" #include "paddle/fluid/string/string_helper.h" #define PSERVER_SAVE_SUFFIX ".shard" diff --git a/paddle/fluid/distributed/table/sparse_geo_table.cc b/paddle/fluid/distributed/ps/table/sparse_geo_table.cc similarity index 97% rename from paddle/fluid/distributed/table/sparse_geo_table.cc rename to paddle/fluid/distributed/ps/table/sparse_geo_table.cc index 655c478415..6ef4330113 100644 --- a/paddle/fluid/distributed/table/sparse_geo_table.cc +++ b/paddle/fluid/distributed/ps/table/sparse_geo_table.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/sparse_geo_table.h" +#include "paddle/fluid/distributed/ps/table/sparse_geo_table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/sparse_geo_table.h b/paddle/fluid/distributed/ps/table/sparse_geo_table.h similarity index 79% rename from paddle/fluid/distributed/table/sparse_geo_table.h rename to paddle/fluid/distributed/ps/table/sparse_geo_table.h index 8031117f20..6eb913a02b 100644 --- a/paddle/fluid/distributed/table/sparse_geo_table.h +++ b/paddle/fluid/distributed/ps/table/sparse_geo_table.h @@ -24,13 +24,13 @@ #include #include "Eigen/Dense" -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/common_sparse_table.h" -#include "paddle/fluid/distributed/table/common_table.h" -#include "paddle/fluid/distributed/table/depends/geo_recorder.h" -#include "paddle/fluid/distributed/table/depends/initializers.h" -#include "paddle/fluid/distributed/table/depends/large_scale_kv.h" -#include "paddle/fluid/distributed/table/depends/sparse.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/common_table.h" +#include "paddle/fluid/distributed/ps/table/depends/geo_recorder.h" +#include "paddle/fluid/distributed/ps/table/depends/initializers.h" +#include "paddle/fluid/distributed/ps/table/depends/large_scale_kv.h" +#include "paddle/fluid/distributed/ps/table/depends/sparse.h" #include "paddle/fluid/string/string_helper.h" #include "paddle/pten/core/utils/rw_lock.h" diff --git a/paddle/fluid/distributed/table/sparse_sgd_rule.cc b/paddle/fluid/distributed/ps/table/sparse_sgd_rule.cc similarity index 99% rename from paddle/fluid/distributed/table/sparse_sgd_rule.cc rename to paddle/fluid/distributed/ps/table/sparse_sgd_rule.cc index 614656a5a8..3e39d6f976 100644 --- a/paddle/fluid/distributed/table/sparse_sgd_rule.cc +++ b/paddle/fluid/distributed/ps/table/sparse_sgd_rule.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/sparse_sgd_rule.h" +#include "paddle/fluid/distributed/ps/table/sparse_sgd_rule.h" #include #include "glog/logging.h" diff --git a/paddle/fluid/distributed/table/sparse_sgd_rule.h b/paddle/fluid/distributed/ps/table/sparse_sgd_rule.h similarity index 100% rename from paddle/fluid/distributed/table/sparse_sgd_rule.h rename to paddle/fluid/distributed/ps/table/sparse_sgd_rule.h diff --git a/paddle/fluid/distributed/table/ssd_sparse_table.cc b/paddle/fluid/distributed/ps/table/ssd_sparse_table.cc similarity index 99% rename from paddle/fluid/distributed/table/ssd_sparse_table.cc rename to paddle/fluid/distributed/ps/table/ssd_sparse_table.cc index 41eca72cf8..60514b4e19 100644 --- a/paddle/fluid/distributed/table/ssd_sparse_table.cc +++ b/paddle/fluid/distributed/ps/table/ssd_sparse_table.cc @@ -13,7 +13,7 @@ // limitations under the License. #ifdef PADDLE_WITH_HETERPS -#include "paddle/fluid/distributed/table/ssd_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/ssd_sparse_table.h" DEFINE_string(rocksdb_path, "database", "path of sparse table rocksdb file"); diff --git a/paddle/fluid/distributed/table/ssd_sparse_table.h b/paddle/fluid/distributed/ps/table/ssd_sparse_table.h similarity index 93% rename from paddle/fluid/distributed/table/ssd_sparse_table.h rename to paddle/fluid/distributed/ps/table/ssd_sparse_table.h index 5e85fa3ce5..f5e8a7067e 100644 --- a/paddle/fluid/distributed/table/ssd_sparse_table.h +++ b/paddle/fluid/distributed/ps/table/ssd_sparse_table.h @@ -13,8 +13,8 @@ // limitations under the License. #pragma once -#include "paddle/fluid/distributed/table/common_sparse_table.h" -#include "paddle/fluid/distributed/table/depends/rocksdb_warpper.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/depends/rocksdb_warpper.h" #ifdef PADDLE_WITH_HETERPS namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/table.cc b/paddle/fluid/distributed/ps/table/table.cc similarity index 80% rename from paddle/fluid/distributed/table/table.cc rename to paddle/fluid/distributed/ps/table/table.cc index ac026184b8..b9b5ff12fc 100644 --- a/paddle/fluid/distributed/table/table.cc +++ b/paddle/fluid/distributed/ps/table/table.cc @@ -12,22 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/table.h" #include "glog/logging.h" #include "paddle/fluid/distributed/common/registerer.h" -#include "paddle/fluid/distributed/table/common_dense_table.h" -#include "paddle/fluid/distributed/table/common_graph_table.h" -#include "paddle/fluid/distributed/table/common_sparse_table.h" -#include "paddle/fluid/distributed/table/sparse_geo_table.h" +#include "paddle/fluid/distributed/ps/table/common_dense_table.h" +#include "paddle/fluid/distributed/ps/table/common_graph_table.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/sparse_geo_table.h" #ifdef PADDLE_WITH_HETERPS -#include "paddle/fluid/distributed/table/ssd_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/ssd_sparse_table.h" #endif -#include "paddle/fluid/distributed/table/ctr_accessor.h" -#include "paddle/fluid/distributed/table/memory_sparse_table.h" -#include "paddle/fluid/distributed/table/tensor_accessor.h" -#include "paddle/fluid/distributed/table/tensor_table.h" +#include "paddle/fluid/distributed/ps/table/ctr_accessor.h" +#include "paddle/fluid/distributed/ps/table/memory_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/tensor_accessor.h" +#include "paddle/fluid/distributed/ps/table/tensor_table.h" namespace paddle { namespace distributed { @@ -83,9 +83,10 @@ int32_t Table::initialize_accessor() { LOG(INFO) << "accessor initializing: table_id: " << _config.table_id() << ", accessor_name: " << _config.accessor().accessor_class(); - auto *accessor = CREATE_PSCORE_CLASS( - ValueAccessor, - _config.accessor().accessor_class()) if (accessor == NULL) { + auto *accessor = + CREATE_PSCORE_CLASS(ValueAccessor, _config.accessor().accessor_class()); + + if (accessor == NULL) { LOG(ERROR) << "accessor is unregisteg, table_id:" << _config.table_id() << ", accessor_name:" << _config.accessor().accessor_class(); return -1; diff --git a/paddle/fluid/distributed/table/table.h b/paddle/fluid/distributed/ps/table/table.h similarity index 96% rename from paddle/fluid/distributed/table/table.h rename to paddle/fluid/distributed/ps/table/table.h index f6568b4336..da1bb668cc 100644 --- a/paddle/fluid/distributed/table/table.h +++ b/paddle/fluid/distributed/ps/table/table.h @@ -21,9 +21,9 @@ #include #include #include "paddle/fluid/distributed/common/afs_warpper.h" -#include "paddle/fluid/distributed/table/accessor.h" -#include "paddle/fluid/distributed/table/depends/sparse_utils.h" -#include "paddle/fluid/distributed/table/graph/graph_node.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/depends/sparse_utils.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_node.h" #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/framework/scope.h" #include "paddle/fluid/platform/device_context.h" diff --git a/paddle/fluid/distributed/table/tensor_accessor.cc b/paddle/fluid/distributed/ps/table/tensor_accessor.cc similarity index 98% rename from paddle/fluid/distributed/table/tensor_accessor.cc rename to paddle/fluid/distributed/ps/table/tensor_accessor.cc index b1ece52c13..70a580c1e5 100644 --- a/paddle/fluid/distributed/table/tensor_accessor.cc +++ b/paddle/fluid/distributed/ps/table/tensor_accessor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/tensor_accessor.h" +#include "paddle/fluid/distributed/ps/table/tensor_accessor.h" #include "Eigen/Dense" namespace paddle { diff --git a/paddle/fluid/distributed/table/tensor_accessor.h b/paddle/fluid/distributed/ps/table/tensor_accessor.h similarity index 98% rename from paddle/fluid/distributed/table/tensor_accessor.h rename to paddle/fluid/distributed/ps/table/tensor_accessor.h index 9f4e2bc0de..5041b8fdf8 100644 --- a/paddle/fluid/distributed/table/tensor_accessor.h +++ b/paddle/fluid/distributed/ps/table/tensor_accessor.h @@ -20,7 +20,7 @@ #include "paddle/fluid/distributed/common/registerer.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/accessor.h" +#include "paddle/fluid/distributed/ps/table/accessor.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/table/tensor_table.cc b/paddle/fluid/distributed/ps/table/tensor_table.cc similarity index 98% rename from paddle/fluid/distributed/table/tensor_table.cc rename to paddle/fluid/distributed/ps/table/tensor_table.cc index 0199f0528a..dfe778fa61 100644 --- a/paddle/fluid/distributed/table/tensor_table.cc +++ b/paddle/fluid/distributed/ps/table/tensor_table.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/table/tensor_table.h" +#include "paddle/fluid/distributed/ps/table/tensor_table.h" DECLARE_double(eager_delete_tensor_gb); namespace paddle { diff --git a/paddle/fluid/distributed/table/tensor_table.h b/paddle/fluid/distributed/ps/table/tensor_table.h similarity index 99% rename from paddle/fluid/distributed/table/tensor_table.h rename to paddle/fluid/distributed/ps/table/tensor_table.h index 080682d131..64d81327ac 100644 --- a/paddle/fluid/distributed/table/tensor_table.h +++ b/paddle/fluid/distributed/ps/table/tensor_table.h @@ -24,7 +24,7 @@ #include #include "paddle/fluid/distributed/common/utils.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/table.h" #include "paddle/fluid/framework/executor.h" #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/platform/device_context.h" diff --git a/paddle/fluid/distributed/thirdparty/round_robin.h b/paddle/fluid/distributed/ps/thirdparty/round_robin.h similarity index 100% rename from paddle/fluid/distributed/thirdparty/round_robin.h rename to paddle/fluid/distributed/ps/thirdparty/round_robin.h diff --git a/paddle/fluid/distributed/ps/wrapper/CMakeLists.txt b/paddle/fluid/distributed/ps/wrapper/CMakeLists.txt new file mode 100644 index 0000000000..6279b6aa95 --- /dev/null +++ b/paddle/fluid/distributed/ps/wrapper/CMakeLists.txt @@ -0,0 +1,9 @@ + +get_property(RPC_DEPS GLOBAL PROPERTY RPC_DEPS) + +set_source_files_properties(fleet.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) +cc_library(fleet + SRCS fleet.cc + DEPS framework_proto ps_framework_proto ps_service variable_helper scope op_registry fs shell ${RPC_DEPS}) + +target_link_libraries(fleet z) diff --git a/paddle/fluid/distributed/fleet.cc b/paddle/fluid/distributed/ps/wrapper/fleet.cc similarity index 99% rename from paddle/fluid/distributed/fleet.cc rename to paddle/fluid/distributed/ps/wrapper/fleet.cc index 5caeab832a..0588dbdf0f 100644 --- a/paddle/fluid/distributed/fleet.cc +++ b/paddle/fluid/distributed/ps/wrapper/fleet.cc @@ -12,9 +12,9 @@ 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. */ -#include "paddle/fluid/distributed/fleet.h" -#include "paddle/fluid/distributed/service/communicator.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/wrapper/fleet.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/fleet.h b/paddle/fluid/distributed/ps/wrapper/fleet.h similarity index 98% rename from paddle/fluid/distributed/fleet.h rename to paddle/fluid/distributed/ps/wrapper/fleet.h index 3d2ba75d47..1ec580c4d9 100644 --- a/paddle/fluid/distributed/fleet.h +++ b/paddle/fluid/distributed/ps/wrapper/fleet.h @@ -23,8 +23,8 @@ limitations under the License. */ #include #include -#include "paddle/fluid/distributed/communicator_common.h" -#include "paddle/fluid/distributed/service/service.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator_common.h" +#include "paddle/fluid/distributed/ps/service/ps_service/service.h" #include "paddle/fluid/framework/archive.h" #include "paddle/fluid/framework/io/fs.h" #include "paddle/fluid/framework/io/shell.h" diff --git a/paddle/fluid/distributed/test/barrier_table_test.cc b/paddle/fluid/distributed/test/barrier_table_test.cc index 8dc2aa2299..0715f777fa 100644 --- a/paddle/fluid/distributed/test/barrier_table_test.cc +++ b/paddle/fluid/distributed/test/barrier_table_test.cc @@ -17,8 +17,8 @@ limitations under the License. */ #include #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/common_table.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/common_table.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc b/paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc index f83c7bdb15..d7d9d1ed1b 100644 --- a/paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc +++ b/paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc @@ -17,8 +17,8 @@ limitations under the License. */ #include // NOLINT #include "gtest/gtest.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/framework/scope.h" #include "paddle/fluid/operators/math/math_function.h" diff --git a/paddle/fluid/distributed/test/brpc_service_sparse_sgd_test.cc b/paddle/fluid/distributed/test/brpc_service_sparse_sgd_test.cc index f9c2b55eb4..4f7b608c8b 100644 --- a/paddle/fluid/distributed/test/brpc_service_sparse_sgd_test.cc +++ b/paddle/fluid/distributed/test/brpc_service_sparse_sgd_test.cc @@ -18,9 +18,9 @@ limitations under the License. */ #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/service/brpc_ps_server.h" -#include "paddle/fluid/distributed/service/env.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/env.h" #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/operators/math/math_function.h" #include "paddle/fluid/platform/place.h" diff --git a/paddle/fluid/distributed/test/brpc_utils_test.cc b/paddle/fluid/distributed/test/brpc_utils_test.cc index e939df7681..608f647d14 100644 --- a/paddle/fluid/distributed/test/brpc_utils_test.cc +++ b/paddle/fluid/distributed/test/brpc_utils_test.cc @@ -16,7 +16,7 @@ limitations under the License. */ #include "gtest/gtest.h" -#include "paddle/fluid/distributed/service/brpc_utils.h" +#include "paddle/fluid/distributed/ps/service/brpc_utils.h" #include "paddle/fluid/operators/math/math_function.h" namespace paddle { diff --git a/paddle/fluid/distributed/test/ctr_accessor_test.cc b/paddle/fluid/distributed/test/ctr_accessor_test.cc index 8c667cad60..835b1a3615 100644 --- a/paddle/fluid/distributed/test/ctr_accessor_test.cc +++ b/paddle/fluid/distributed/test/ctr_accessor_test.cc @@ -12,13 +12,13 @@ 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. */ -#include "paddle/fluid/distributed/table/ctr_accessor.h" +#include "paddle/fluid/distributed/ps/table/ctr_accessor.h" #include #include #include "gtest/gtest.h" #include "paddle/fluid/distributed/common/registerer.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/sparse_sgd_rule.h" +#include "paddle/fluid/distributed/ps/table/sparse_sgd_rule.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/test/dense_table_test.cc b/paddle/fluid/distributed/test/dense_table_test.cc index 2e48b791dc..c9a038e000 100644 --- a/paddle/fluid/distributed/test/dense_table_test.cc +++ b/paddle/fluid/distributed/test/dense_table_test.cc @@ -16,7 +16,7 @@ limitations under the License. */ #include #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/common_dense_table.h" +#include "paddle/fluid/distributed/ps/table/common_dense_table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/test/feature_value_test.cc b/paddle/fluid/distributed/test/feature_value_test.cc index 9bd00dcc56..32e3944d35 100644 --- a/paddle/fluid/distributed/test/feature_value_test.cc +++ b/paddle/fluid/distributed/test/feature_value_test.cc @@ -12,7 +12,7 @@ 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. */ -#include "paddle/fluid/distributed/table/depends/feature_value.h" +#include "paddle/fluid/distributed/ps/table/depends/feature_value.h" #include #include "gtest/gtest.h" diff --git a/paddle/fluid/distributed/test/geo_table_test.cc b/paddle/fluid/distributed/test/geo_table_test.cc index c9f15db3f7..b148c32f49 100644 --- a/paddle/fluid/distributed/test/geo_table_test.cc +++ b/paddle/fluid/distributed/test/geo_table_test.cc @@ -21,11 +21,11 @@ limitations under the License. */ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/common_dense_table.h" -#include "paddle/fluid/distributed/table/common_sparse_table.h" -#include "paddle/fluid/distributed/table/depends/sparse_utils.h" -#include "paddle/fluid/distributed/table/sparse_geo_table.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/common_dense_table.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/depends/sparse_utils.h" +#include "paddle/fluid/distributed/ps/table/sparse_geo_table.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/test/graph_node_split_test.cc b/paddle/fluid/distributed/test/graph_node_split_test.cc index 714fbb1e4a..e808d2a815 100644 --- a/paddle/fluid/distributed/test/graph_node_split_test.cc +++ b/paddle/fluid/distributed/test/graph_node_split_test.cc @@ -21,16 +21,16 @@ limitations under the License. */ #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/service/brpc_ps_server.h" -#include "paddle/fluid/distributed/service/env.h" -#include "paddle/fluid/distributed/service/graph_brpc_client.h" -#include "paddle/fluid/distributed/service/graph_brpc_server.h" -#include "paddle/fluid/distributed/service/graph_py_service.h" -#include "paddle/fluid/distributed/service/ps_client.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" -#include "paddle/fluid/distributed/service/service.h" -#include "paddle/fluid/distributed/table/graph/graph_node.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/env.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_client.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_server.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" +#include "paddle/fluid/distributed/ps/service/ps_service/graph_py_service.h" +#include "paddle/fluid/distributed/ps/service/ps_service/service.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_node.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/framework/scope.h" diff --git a/paddle/fluid/distributed/test/graph_node_test.cc b/paddle/fluid/distributed/test/graph_node_test.cc index 3a430d7a51..3243ebc389 100644 --- a/paddle/fluid/distributed/test/graph_node_test.cc +++ b/paddle/fluid/distributed/test/graph_node_test.cc @@ -21,16 +21,16 @@ limitations under the License. */ #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/service/brpc_ps_client.h" -#include "paddle/fluid/distributed/service/brpc_ps_server.h" -#include "paddle/fluid/distributed/service/env.h" -#include "paddle/fluid/distributed/service/graph_brpc_client.h" -#include "paddle/fluid/distributed/service/graph_brpc_server.h" -#include "paddle/fluid/distributed/service/graph_py_service.h" -#include "paddle/fluid/distributed/service/ps_client.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" -#include "paddle/fluid/distributed/service/service.h" -#include "paddle/fluid/distributed/table/graph/graph_node.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_client.h" +#include "paddle/fluid/distributed/ps/service/brpc_ps_server.h" +#include "paddle/fluid/distributed/ps/service/env.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_client.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_server.h" +#include "paddle/fluid/distributed/ps/service/ps_client.h" +#include "paddle/fluid/distributed/ps/service/ps_service/graph_py_service.h" +#include "paddle/fluid/distributed/ps/service/ps_service/service.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/table/graph/graph_node.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/framework/scope.h" diff --git a/paddle/fluid/distributed/test/large_scale_test.cc b/paddle/fluid/distributed/test/large_scale_test.cc index 6ce8723abe..13c1d13212 100644 --- a/paddle/fluid/distributed/test/large_scale_test.cc +++ b/paddle/fluid/distributed/test/large_scale_test.cc @@ -21,9 +21,9 @@ limitations under the License. */ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/common_sparse_table.h" -#include "paddle/fluid/distributed/table/depends/large_scale_kv.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/depends/large_scale_kv.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/test/memory_sparse_table_test.cc b/paddle/fluid/distributed/test/memory_sparse_table_test.cc index 30a1107d64..62992c74bf 100644 --- a/paddle/fluid/distributed/test/memory_sparse_table_test.cc +++ b/paddle/fluid/distributed/test/memory_sparse_table_test.cc @@ -21,8 +21,8 @@ limitations under the License. */ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/memory_sparse_table.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/memory_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/test/sparse_sgd_rule_test.cc b/paddle/fluid/distributed/test/sparse_sgd_rule_test.cc index e86234f1bd..c895231d93 100644 --- a/paddle/fluid/distributed/test/sparse_sgd_rule_test.cc +++ b/paddle/fluid/distributed/test/sparse_sgd_rule_test.cc @@ -12,7 +12,7 @@ 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. */ -#include "paddle/fluid/distributed/table/sparse_sgd_rule.h" +#include "paddle/fluid/distributed/ps/table/sparse_sgd_rule.h" #include #include #include "gtest/gtest.h" diff --git a/paddle/fluid/distributed/test/sparse_table_test.cc b/paddle/fluid/distributed/test/sparse_table_test.cc index 26bede392d..f13bab078a 100644 --- a/paddle/fluid/distributed/test/sparse_table_test.cc +++ b/paddle/fluid/distributed/test/sparse_table_test.cc @@ -21,10 +21,10 @@ limitations under the License. */ #include "google/protobuf/text_format.h" #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/common_dense_table.h" -#include "paddle/fluid/distributed/table/common_sparse_table.h" -#include "paddle/fluid/distributed/table/sparse_geo_table.h" -#include "paddle/fluid/distributed/table/table.h" +#include "paddle/fluid/distributed/ps/table/common_dense_table.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/sparse_geo_table.h" +#include "paddle/fluid/distributed/ps/table/table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/test/table_test.cc b/paddle/fluid/distributed/test/table_test.cc index 9b12717f73..6a29781158 100644 --- a/paddle/fluid/distributed/test/table_test.cc +++ b/paddle/fluid/distributed/test/table_test.cc @@ -14,8 +14,8 @@ limitations under the License. */ #include "gtest/gtest.h" #include "paddle/fluid/distributed/ps.pb.h" -#include "paddle/fluid/distributed/table/common_sparse_table.h" -#include "paddle/fluid/distributed/table/sparse_geo_table.h" +#include "paddle/fluid/distributed/ps/table/common_sparse_table.h" +#include "paddle/fluid/distributed/ps/table/sparse_geo_table.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/framework/data_set.cc b/paddle/fluid/framework/data_set.cc index 1b5db83805..df1840794a 100644 --- a/paddle/fluid/framework/data_set.cc +++ b/paddle/fluid/framework/data_set.cc @@ -24,7 +24,7 @@ #include "paddle/fluid/platform/timer.h" #ifdef PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/fleet.h" +#include "paddle/fluid/distributed/ps/wrapper/fleet.h" #endif #if defined _WIN32 || defined __APPLE__ diff --git a/paddle/fluid/framework/details/async_ssa_graph_executor.cc b/paddle/fluid/framework/details/async_ssa_graph_executor.cc index 052860cd0a..4511578f34 100644 --- a/paddle/fluid/framework/details/async_ssa_graph_executor.cc +++ b/paddle/fluid/framework/details/async_ssa_graph_executor.cc @@ -17,7 +17,7 @@ #include "paddle/fluid/framework/variable_helper.h" #if defined PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #endif namespace paddle { diff --git a/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc b/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc index 265e346a9d..c8a6cd25f0 100644 --- a/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc +++ b/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc @@ -18,7 +18,7 @@ #include "paddle/fluid/platform/profiler.h" #if defined PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #endif namespace paddle { diff --git a/paddle/fluid/framework/fleet/heter_context.h b/paddle/fluid/framework/fleet/heter_context.h index 3e8b0cfbc3..a88ffbe3d9 100644 --- a/paddle/fluid/framework/fleet/heter_context.h +++ b/paddle/fluid/framework/fleet/heter_context.h @@ -26,10 +26,10 @@ limitations under the License. */ #endif #ifdef PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/table/depends/large_scale_kv.h" +#include "paddle/fluid/distributed/ps/table/depends/large_scale_kv.h" #endif -#include "paddle/fluid/distributed/thirdparty/round_robin.h" +#include "paddle/fluid/distributed/ps/thirdparty/round_robin.h" #include "paddle/fluid/framework/fleet/heter_ps/feature_value.h" #include "paddle/fluid/framework/scope.h" diff --git a/paddle/fluid/framework/fleet/heter_ps/hashtable.h b/paddle/fluid/framework/fleet/heter_ps/hashtable.h index 05f6ddda29..b3173a1386 100644 --- a/paddle/fluid/framework/fleet/heter_ps/hashtable.h +++ b/paddle/fluid/framework/fleet/heter_ps/hashtable.h @@ -21,7 +21,7 @@ limitations under the License. */ #include "common_value.h" // NOLINT #endif #ifdef PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/table/depends/large_scale_kv.h" +#include "paddle/fluid/distributed/ps/table/depends/large_scale_kv.h" #endif #include "paddle/pten/core/utils/rw_lock.h" #include "thrust/pair.h" diff --git a/paddle/fluid/framework/fleet/ps_gpu_wrapper.h b/paddle/fluid/framework/fleet/ps_gpu_wrapper.h index aa01c5f769..ef5cd8466f 100644 --- a/paddle/fluid/framework/fleet/ps_gpu_wrapper.h +++ b/paddle/fluid/framework/fleet/ps_gpu_wrapper.h @@ -29,7 +29,7 @@ limitations under the License. */ #include #include "paddle/fluid/framework/fleet/gloo_wrapper.h" #endif -#include "paddle/fluid/distributed/thirdparty/round_robin.h" +#include "paddle/fluid/distributed/ps/thirdparty/round_robin.h" #include "paddle/fluid/framework/data_set.h" #include "paddle/fluid/framework/fleet/heter_context.h" #include "paddle/fluid/framework/fleet/heter_ps/heter_ps_base.h" @@ -43,7 +43,7 @@ limitations under the License. */ #include "paddle/fluid/platform/macros.h" // for DISABLE_COPY_AND_ASSIGN #include "paddle/fluid/platform/place.h" #ifdef PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #endif namespace paddle { diff --git a/paddle/fluid/framework/heter_pipeline_trainer.cc b/paddle/fluid/framework/heter_pipeline_trainer.cc index cb939f38ff..13eb78874c 100644 --- a/paddle/fluid/framework/heter_pipeline_trainer.cc +++ b/paddle/fluid/framework/heter_pipeline_trainer.cc @@ -13,7 +13,7 @@ // limitations under the License. #if defined(PADDLE_WITH_PSCORE) -#include "paddle/fluid/distributed/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" #include "paddle/fluid/framework/data_feed_factory.h" #include "paddle/fluid/framework/device_worker_factory.h" #include "paddle/fluid/framework/trainer.h" diff --git a/paddle/fluid/framework/heter_section_worker.cc b/paddle/fluid/framework/heter_section_worker.cc index a4e582c8fe..8e94bb1d0e 100644 --- a/paddle/fluid/framework/heter_section_worker.cc +++ b/paddle/fluid/framework/heter_section_worker.cc @@ -11,7 +11,7 @@ limitations under the License. */ #if defined(PADDLE_WITH_PSCORE) #include -#include "paddle/fluid/distributed/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" #include "paddle/fluid/framework/device_worker.h" #include "paddle/fluid/framework/executor_gc_helper.h" #include "paddle/fluid/platform/cpu_helper.h" diff --git a/paddle/fluid/framework/hogwild_worker.cc b/paddle/fluid/framework/hogwild_worker.cc index f4660751b5..0b4c8f4a71 100644 --- a/paddle/fluid/framework/hogwild_worker.cc +++ b/paddle/fluid/framework/hogwild_worker.cc @@ -20,7 +20,7 @@ limitations under the License. */ #include "paddle/fluid/platform/lodtensor_printer.h" #if defined PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #endif namespace paddle { diff --git a/paddle/fluid/framework/multi_trainer.cc b/paddle/fluid/framework/multi_trainer.cc index de1a66057a..32d3cdef45 100644 --- a/paddle/fluid/framework/multi_trainer.cc +++ b/paddle/fluid/framework/multi_trainer.cc @@ -18,7 +18,7 @@ limitations under the License. */ #include "paddle/fluid/platform/lodtensor_printer.h" #if defined PADDLE_WITH_PSCORE -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #endif namespace paddle { diff --git a/paddle/fluid/operators/pscore/distributed_lookup_table_op.h b/paddle/fluid/operators/pscore/distributed_lookup_table_op.h index 763f67360e..d715bf34a4 100644 --- a/paddle/fluid/operators/pscore/distributed_lookup_table_op.h +++ b/paddle/fluid/operators/pscore/distributed_lookup_table_op.h @@ -13,8 +13,8 @@ #include #include #include -#include "paddle/fluid/distributed/fleet.h" -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" +#include "paddle/fluid/distributed/ps/wrapper/fleet.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/op_registry.h" #include "paddle/fluid/framework/tensor_util.h" diff --git a/paddle/fluid/operators/pscore/distributed_push_sparse_op.h b/paddle/fluid/operators/pscore/distributed_push_sparse_op.h index a232d52dec..f19ba5f2e4 100644 --- a/paddle/fluid/operators/pscore/distributed_push_sparse_op.h +++ b/paddle/fluid/operators/pscore/distributed_push_sparse_op.h @@ -13,8 +13,8 @@ #include #include #include -#include "paddle/fluid/distributed/fleet.h" -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" +#include "paddle/fluid/distributed/ps/wrapper/fleet.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/op_registry.h" #include "paddle/fluid/framework/tensor_util.h" diff --git a/paddle/fluid/operators/pscore/heter_listen_and_serv_op.h b/paddle/fluid/operators/pscore/heter_listen_and_serv_op.h index 77c755581f..2d2d8abe70 100644 --- a/paddle/fluid/operators/pscore/heter_listen_and_serv_op.h +++ b/paddle/fluid/operators/pscore/heter_listen_and_serv_op.h @@ -23,9 +23,9 @@ limitations under the License. */ #include #include -#include "paddle/fluid/distributed/service/brpc_utils.h" -#include "paddle/fluid/distributed/service/heter_server.h" -#include "paddle/fluid/distributed/service/sendrecv.pb.h" +#include "paddle/fluid/distributed/ps/service/brpc_utils.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/sendrecv.pb.h" #include "paddle/fluid/framework/executor.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/op_registry.h" diff --git a/paddle/fluid/operators/pscore/heter_listen_and_server_test.cc b/paddle/fluid/operators/pscore/heter_listen_and_server_test.cc index c870e758e9..a195b8dee3 100644 --- a/paddle/fluid/operators/pscore/heter_listen_and_server_test.cc +++ b/paddle/fluid/operators/pscore/heter_listen_and_server_test.cc @@ -18,8 +18,8 @@ limitations under the License. */ #include // NOLINT #include "gtest/gtest.h" -#include "paddle/fluid/distributed/service/heter_client.h" -#include "paddle/fluid/distributed/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" #include "paddle/fluid/framework/block_desc.h" #include "paddle/fluid/framework/executor.h" #include "paddle/fluid/framework/op_registry.h" diff --git a/paddle/fluid/operators/pscore/heter_server_test.cc b/paddle/fluid/operators/pscore/heter_server_test.cc index a1e29ed3e3..7914e9d9a1 100644 --- a/paddle/fluid/operators/pscore/heter_server_test.cc +++ b/paddle/fluid/operators/pscore/heter_server_test.cc @@ -18,8 +18,8 @@ limitations under the License. */ #include // NOLINT #include "gtest/gtest.h" -#include "paddle/fluid/distributed/service/heter_client.h" -#include "paddle/fluid/distributed/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" #include "paddle/fluid/framework/op_registry.h" namespace framework = paddle::framework; diff --git a/paddle/fluid/operators/pscore/send_and_recv_op.cc b/paddle/fluid/operators/pscore/send_and_recv_op.cc index 46f22bcc8b..980351e12a 100644 --- a/paddle/fluid/operators/pscore/send_and_recv_op.cc +++ b/paddle/fluid/operators/pscore/send_and_recv_op.cc @@ -15,7 +15,7 @@ limitations under the License. */ #include // NOLINT #include -#include "paddle/fluid/distributed/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/heter_client.h" #include "paddle/fluid/framework/blocking_queue.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/lod_tensor.h" diff --git a/paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc b/paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc index c2e4407f66..07fe44601c 100644 --- a/paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc +++ b/paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc @@ -19,8 +19,8 @@ limitations under the License. */ #include // NOLINT #include "gtest/gtest.h" -#include "paddle/fluid/distributed/service/heter_client.h" -#include "paddle/fluid/distributed/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" #include "paddle/fluid/framework/op_registry.h" #include "paddle/fluid/framework/op_version_registry.h" diff --git a/paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc b/paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc index 42eea54ce7..21f21cdc95 100644 --- a/paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc +++ b/paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc @@ -20,8 +20,8 @@ limitations under the License. */ #include // NOLINT #include "gtest/gtest.h" -#include "paddle/fluid/distributed/service/heter_client.h" -#include "paddle/fluid/distributed/service/heter_server.h" +#include "paddle/fluid/distributed/ps/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/heter_server.h" #include "paddle/fluid/framework/op_registry.h" #include "paddle/fluid/framework/op_version_registry.h" #include "paddle/fluid/memory/memcpy.h" diff --git a/paddle/fluid/operators/pscore/send_barrier_op.cc b/paddle/fluid/operators/pscore/send_barrier_op.cc index 1def919ffd..fe850bb25d 100644 --- a/paddle/fluid/operators/pscore/send_barrier_op.cc +++ b/paddle/fluid/operators/pscore/send_barrier_op.cc @@ -12,7 +12,7 @@ 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. */ -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" #include "paddle/fluid/framework/op_registry.h" namespace paddle { diff --git a/paddle/fluid/operators/pscore/send_op.cc b/paddle/fluid/operators/pscore/send_op.cc index 482c6ba60d..bbb3c76bec 100644 --- a/paddle/fluid/operators/pscore/send_op.cc +++ b/paddle/fluid/operators/pscore/send_op.cc @@ -12,8 +12,8 @@ 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. */ -#include "paddle/fluid/distributed/fleet.h" -#include "paddle/fluid/distributed/service/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" +#include "paddle/fluid/distributed/ps/wrapper/fleet.h" #include "paddle/fluid/framework/op_registry.h" namespace paddle { diff --git a/paddle/fluid/pybind/communicator_py.cc b/paddle/fluid/pybind/communicator_py.cc index 07ba706167..723d7f3197 100644 --- a/paddle/fluid/pybind/communicator_py.cc +++ b/paddle/fluid/pybind/communicator_py.cc @@ -23,8 +23,8 @@ limitations under the License. */ #include "pybind11/pybind11.h" #include "paddle/fluid/operators/distributed/communicator.h" -#include "paddle/fluid/operators/distributed/communicator_common.h" #include "paddle/fluid/operators/distributed/large_scale_kv.h" +#include "paddle/fluid/operators/distributed/ps/service/communicator/communicator_common.h" namespace py = pybind11; diff --git a/paddle/fluid/pybind/fleet_py.cc b/paddle/fluid/pybind/fleet_py.cc index aeb4f533f4..73c8f362d1 100644 --- a/paddle/fluid/pybind/fleet_py.cc +++ b/paddle/fluid/pybind/fleet_py.cc @@ -29,15 +29,15 @@ limitations under the License. */ #include #include "paddle/fluid/distributed/common/sparse_sharding_merge.h" -#include "paddle/fluid/distributed/communicator_common.h" -#include "paddle/fluid/distributed/fleet.h" #include "paddle/fluid/distributed/index_dataset/index_sampler.h" #include "paddle/fluid/distributed/index_dataset/index_wrapper.h" -#include "paddle/fluid/distributed/service/communicator.h" -#include "paddle/fluid/distributed/service/env.h" -#include "paddle/fluid/distributed/service/graph_brpc_client.h" -#include "paddle/fluid/distributed/service/graph_py_service.h" -#include "paddle/fluid/distributed/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator.h" +#include "paddle/fluid/distributed/ps/service/communicator/communicator_common.h" +#include "paddle/fluid/distributed/ps/service/env.h" +#include "paddle/fluid/distributed/ps/service/graph_brpc_client.h" +#include "paddle/fluid/distributed/ps/service/heter_client.h" +#include "paddle/fluid/distributed/ps/service/ps_service/graph_py_service.h" +#include "paddle/fluid/distributed/ps/wrapper/fleet.h" namespace py = pybind11; using paddle::distributed::CommContext; -- GitLab