diff --git a/paddle/fluid/distributed/CMakeLists.txt b/paddle/fluid/distributed/CMakeLists.txt index 24923d72681869348ec7db816349bdef010c973d..5ae2e26e87c7b33a75325f5b585ca115bd3b6308 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e97c9db1a5199175507884e29c2f53e8a5bae07a 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 d1f04e26ade7289bcb10988d02de01962a1889ab..ab6c2e26002743fc129c4a7d0e532a63aa1d610b 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 db1dd2ced84e53aee8a57f70a3d11301fc00b4eb..e855fcbd02553ac1ea2e753239deaa8371661b32 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 d5388a5cd07c9e1d982f7e08d7a0c1c361af1d0d..70f406ee248dc3d39777297d8387b4749439cf82 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 dd7072be7de63ba90c55e176671c63ba1d444e09..58ce52552c9d22c56b314dfe0bccbb8a564edb5d 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 bf228a5d1b0ae58669e5f555d2f99200d6099661..4310c247438ceb9bff541fdd21e00ff70ff7b4fd 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 bce3e46a2b0261c74901c646fb85407eb35f7dff..23b2f5545ffc2ae8939dba26e602505aa8197139 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 ebae710acc28b58a503bc9c0b455ef7c5ca10cff..b241f7f80121cc6920720e3d24332d3be129bd77 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 0000000000000000000000000000000000000000..3610729d74d939b47fbd6f8e7b58219934021bca --- /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 2e37442e02c69a08516bbf2745b757f7f313f15e..a73f87c1d88965ce2e1b522ac79422f94ef0ea98 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 8a905377974c072d2091c7b2ea43c202b7bae952..570e668d9d5d2b40d280ef905b12fcb0e4ada09b 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 25bc2cc366aaacba32c22a5225d344f8618767d9..15bd31ce958685643c26af044cdc948725589105 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 a9682d6a6efcc9db33e33c3e4fef1ec60f5bedf3..301708f6b7bb3d465d8dcbd2b94bbc4c217fcc77 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 2e5d5b6ee93cbe606ed87a4c947d993ecccfc59a..06e753d028baa2d9c0002620dc445d4204046180 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 c1348e4804e2badcfc02c61dbbb0f83892cedefb..441f489fb3097cda51fc62dc35e93264a1f7caef 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 ecd78d28ca812a1e4c3b1429e891b3d0b7d5dd95..aee0190850753786ce0f083257458caf50a63d26 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 95023704f9d51522386eaadee0f5c6fc01d1764d..e9e3ec1d9df471db2c8e54e5c0eaf71f9b0e9bd3 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 7ba47ad9a5df58a75cfe736a0c16a82f43ec9576..4f27ef75ea954dece5cd734108c64813b681c6f6 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 fee3081f0329a92bb4903d8540dcadb73d663154..01afed3f1237515cf5c5e4ad01d329b424b5079e 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 094ee6036413d5f5469e5ab4bee14913d39aad97..86f83cb1fc4fe5ef881dbb2e8f88bd6d1bc67bc5 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 d45f41a0f58de36bb1575c1b51663f8899fb215d..fd956b758de1ae00155b37bb4d2c9e8134da09e4 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 a408a0cc24fb51de041ecd4098b5434e9c5d91ca..7db8b0c1244594ba4483101536995f9e414382ab 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 e949b21b02e6d9842ffae377a17610757a65ae75..972cce135f189bee6dbba9e0b89baa288816827b 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 9d2b01a45fe929097c06fb264f470974410e7f4e..e73974ac562861d86e679ddbc213335d10731281 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 33b0b5fa796d7571e16a0f79fc6ce4de21b1e7a8..91f8bc4c9127115c9b5595270973d011778c6262 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 8d7a822321a2b34aae12035c549ca23f21ad16a0..b2aece98071c146b23e897900b9c7f9736c2f2de 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 a860d1f58d3a23e79ca3d3a380b6067c13e76371..71b44f36d0107fa57b3beb51f29e7509d967f995 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 698ceb1578f47eec83d0ae1efb3bbac6149de210..73793d2f9bd0ec8c5b485830059a730bb8d8559a 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 5c987267f9d2e581f0340afca1ec803a14ab6962..202c2407f15ae9fbf5087b55a65f6acd2957ddc5 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 e44876e3d2b789580152626ea8c290db0d369509..5f1974e3e610c6772457514759bff83db944bf52 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 ebebedc80efb83f88a7e366b39a20e93961d0087..160d4a612829531d619c69a0cd5e9cd091f94868 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 72394d15c54af5b346c70359b4dcde0ad2cd063c..25838e7ac2f047d9ff7bf20705459c6b1d60d26f 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 b34b143a3ce37ef9a61c41143a2dfcb1fc614eaa..607469e2f7b0d5df79d4cb7477e0eaa3f4a8323a 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 c8813dc33053f0c8a42a1090b262c7fde79f5ed5..a4c0f29ddb8770c8adc0d6885929aaac8a028e90 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 042a4dee62bda6f80ba94d16eba8abab150aa0bc..54b98cb96ce5196bb5133f777b2571f4d3d43c6e 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 bdc3bee2ea579b47868cf5de9585059f760d5298..4fc5b5ab633f9e0815461413829eeef7071b5718 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 143b24cf3264774c8852307f4071cd03a41010d1..b44d08b937a96c806142f5d7f1ba2ae0bcdb0f5e 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 1dc9ffba91cb3b04fad95d923127e4f148a7e3de..2e02d13e7e5aec928468dcfbde1cff5e0b9c514a 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 bc7f17f5f245794cebf96a8a4bc69e0dce8ac997..bac826dfe0e20b42d5cc47467356bc5614383a44 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 23144f39ade396613ff91b033dca364dd05a1a77..866bd8114ccea329123e16585c33366e759d5df8 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 8be672e8e0d15e124d8babfb7dbc30b3d38f491f..1e31fec04649b19882269fa9cce5f5d7fb4978c1 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 9a327f3f4277551159b3366ff3f1f856a922bfe6..dc7766c7ceb06eb0f57094af1f4e11df72da18aa 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 0e1d7ef03c129c2dc6f72d6e56fafb143d879bd4..d4ea7829e45f8326fdbe33ebb1c7c9cfa3d35f6f 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 0ab0d5a76d6715401dd55ce7487634b72d452ddf..d1961b655d8829716b392c24ad6f1139089eb80d 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 52c708be88488465b9f7c7abac27b6ddc3b991c1..366e607261f0c350c5097fc76e7bcc87b04ee878 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 b7a564ef7b0bb6a9f8b307edbb674ab6a32c7404..b838c2c1258d84fec8c4a25f5855209d5b428d4c 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 7a46433e3defbd51b68ed9f25e9e92f64b6d1afa..8186acec1be3da2abc18775e519ab38dac9f6dfd 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 4a75a112697d322a2eb49a57d379889d34b6009f..c10617022decb2eaf3c8a9684fd3265e88722e76 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 086ddcafeb48d82b576cf525df4451fce8e77c10..7ce6e9005cf56ca295a6620a209551e303c112f3 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 cb552beab13717c270c4a8495a6794c9dc912b08..5770f25f8f41dec286993d6b586959c8c0d3a0c0 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 655c4784156e84e7071b738adac8c24ade6bd08e..6ef4330113e8fee3d2cb0d3e541194ca7b600a82 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 8031117f20c12f34095c2c7087127084f96590e6..6eb913a02bc475a148ccb24797618339867f1121 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 614656a5a85d3029b82b8452b403253043bbc846..3e39d6f976d129903283060fb5111bd9eea03afc 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 41eca72cf80717cb5f0ad731d19a9da79009ec96..60514b4e19ffaf63f285e25f1355660fabe58d48 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 5e85fa3ce59d13c1f996f00a4b5b7dd9114ed764..f5e8a7067e0e041f9913bef8e43ad8b35bdb2783 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 ac026184b8864ddb4c0b8f9ac2dfa2cc7c4c0dc3..b9b5ff12fc97a74dc4ce7b835ba981d73ca86104 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 f6568b4336fbbdee10236d4d8642cd6d1e28b2d9..da1bb668ccfa3c5f1a4f876a396847b6b3853772 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 b1ece52c133a7169273d1a2f62da4d34a01cb029..70a580c1e53a931dc2affd29db01b72691c68a39 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 9f4e2bc0def4faf9b750e663bfda99e51b1a2347..5041b8fdf8733eff676b5fce1a972e39182df48e 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 0199f0528a9098b521ca11af522c6d189cc5169a..dfe778fa61e9e003ac1b3de48bf837be1d88ea22 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 080682d131420b5b57ce470b6b570fe24a1925b3..64d81327acc55ba0655bfc33efaa0d9d9f59649e 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 0000000000000000000000000000000000000000..6279b6aa95412cb282cbe6ad3e5edb7b33adf289 --- /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 5caeab832a3e746720dae2104e6f91d325e101fd..0588dbdf0fc61298d33eeb6db5b3de91a6de8256 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 3d2ba75d47327aa12fb1abc37643b37722cc0f76..1ec580c4d920d45b3bf43981494fde460095bcae 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 8dc2aa2299be7d72e07e98dae0352a9d791d3f99..0715f777fa5cb286ff393190a3d94dd86e74518a 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 f83c7bdb15fa1cad53a033f0444a6854910475e1..d7d9d1ed1bafd95e9d6db75c1e848693a3de55b1 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 f9c2b55eb4fee2e9bbaa49183b23192d04e61733..4f7b608c8bfb9366e010abda8fc72e68d72fa4e3 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 e939df7681774be43d338c5ab8bf30eb4c29da30..608f647d148e4243c6e683e5e600424dd79d8192 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 8c667cad605fcc6b581d91ebbb6e2be812e1d1be..835b1a361573d4991e05551af10b2bd1567db388 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 2e48b791dc8db510749aec7eed2184b8ef232381..c9a038e000e149f354db2bab72b48c04a721a5f6 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 9bd00dcc56fc2da43135d0ffc9fc36821fb59941..32e3944d35a1c69ce375db207427a535018da481 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 c9f15db3f788e13ca2f9a8279358358f1c50131b..b148c32f4968ce5a8c6b939978f7a983f15be702 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 714fbb1e4aa2d8abb10eebe464cd8ac11ad1dc18..e808d2a81539acc78a0c01155e1a63e357cead78 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 3a430d7a51068a3aa1fb341b3425830add5266cf..3243ebc389c851a2fb0c706280f2f6b8a24c1ef9 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 6ce8723abeea1ef0cc15d197135d7d14dc2fa86f..13c1d132124ebefc45284c5ab2c47efac6ca6ed3 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 30a1107d64e3c4fcb8a0b091d4c11f11a81ad947..62992c74bfd23456959ce7531afd268e62ee9df3 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 e86234f1bd9c7618eab0220cc41994b9e2855c7f..c895231d93ec5e3bb12d7d4eb2769a630016e2ef 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 26bede392d6fade06dd29cf5e5a28295bb1cbc43..f13bab078a6b0c95ad580b36ad2d7c34d0b470e6 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 9b12717f73087751ab08b37f5232c434e14b3c31..6a29781158b838378468b1789b9eed0408c3435d 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 1b5db8380514d552ed56ae3c65a338a082f02bdc..df1840794af3bbef1a2bdf8c2073c89991cdf9fd 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 052860cd0ab40479df7672ae32ebc6e75965b97b..4511578f34ec27b31736b2a762991e52e5a66bd4 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 265e346a9d8dfb0925783b812174410bb11ae86d..c8a6cd25f0fcbe9724972225d03b539285b7225f 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 3e8b0cfbc31f3551bcd6101e7ba48927b9600553..a88ffbe3d9637a8c6d3de9e065bd380d0c69c280 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 05f6ddda292bb43dc10296ac1c2c7b5332749d92..b3173a1386582a27faccdcdc49d0c5013204901f 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 aa01c5f769ae252ff04ef7e2526c473d6604403a..ef5cd8466f1759484f8541546235ac44dd827037 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 cb939f38ff3d9678e09e5cae433317031a47d78f..13eb78874c395e8ff2baa01d2fd0bd9f2df5c42c 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 a4e582c8fed13d93ec54ed29ad26ebe3d109aa09..8e94bb1d0e1498bfa69db565de0de36ffce63cb3 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 f4660751b582a460f8079173a9bb859e26711344..0b4c8f4a719afcb0aee39fb369516b9b47e52a71 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 de1a66057afa345512062103fc329c1138c3eeb1..32d3cdef4512bb072820970ed9db6d2d1289652b 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 763f67360ed0ad049e1838916e5cd99a168eb4ad..d715bf34a49ef10de11affacde4ac892be259da8 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 a232d52dec8d62fb42a6d662e94a9e29c5d935f7..f19ba5f2e41da3de710c726bc7899f12cbbc92dc 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 77c755581f9de2830c4ae2ab9c281321f7fb986f..2d2d8abe7062788b14b543bad22d699a1f41bd2d 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 c870e758e96afc1c70a26236b0d20ac05d77aaf1..a195b8dee3c2f5580be5f7c094194576b9eccb88 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 a1e29ed3e3459db9485b7d28fc7aa1c688a5cc89..7914e9d9a1058ab15a08e3b0dee8725e7a74bb38 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 46f22bcc8b26bc0b4f782ed9459491d471ad219d..980351e12a030760b6793ab665d80db737bfa9d5 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 c2e4407f662a292963941da2bc96b6ff97709d02..07fe44601ca08831a9e4372d04c097a8e56644f2 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 42eea54ce74a51a106beb9e9c05a3b8ef8c7b35d..21f21cdc95606ec98700736f51a2f50af6364e1a 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 1def919ffdf9fdb8976d6745ac718977eb57df73..fe850bb25d67f33a6dfa076f9a75c0b36cd82e5c 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 482c6ba60d26fdab5776e99d036162a7c67b21f8..bbb3c76beca20b4a20d3ec664ed4fc47ce542414 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 07ba7061678d97f11fa6541e7cb7c304d64eb945..723d7f3197230aa5218b19bebdf97bb9a7167e75 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 aeb4f533f49395ed43fface1a5c11cee508837d4..73c8f362d145db078ac4c84c91372dcdd61c47af 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;