reconstruct directory of ps (#39191)

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)

paddle/fluid/distributed/ps/CMakeLists.txt

+set_property(GLOBAL PROPERTY RPC_DEPS sendrecv_rpc ${BRPC_DEPS} string_helper)
+add_subdirectory(table)
+add_subdirectory(service)
+add_subdirectory(wrapper)

paddle/fluid/distributed/service/CMakeLists.txt → 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)

paddle/fluid/distributed/service/brpc_ps_client.cc → paddle/fluid/distributed/ps/service/brpc_ps_client.cc

@@ -16,7 +16,7 @@
 #include <sstream>
 #include <string>
 
-#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;

paddle/fluid/distributed/service/brpc_ps_client.h → 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"

paddle/fluid/distributed/service/brpc_ps_server.cc → 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 <thread>  // 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"
 

paddle/fluid/distributed/service/brpc_ps_server.h → 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;

paddle/fluid/distributed/service/brpc_utils.cc → 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 <arpa/inet.h>
 #include <netdb.h>
 #include "paddle/fluid/platform/enforce.h"

paddle/fluid/distributed/service/brpc_utils.h → paddle/fluid/distributed/ps/service/brpc_utils.h

@@ -20,7 +20,7 @@ limitations under the License. */
 #include <vector>
 
 #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"

paddle/fluid/distributed/ps/service/communicator/CMakeLists.txt

+
+
+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})

paddle/fluid/distributed/service/communicator.cc → 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 <google/protobuf/text_format.h>
 
 #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"
 

paddle/fluid/distributed/service/communicator.h → paddle/fluid/distributed/ps/service/communicator/communicator.h

@@ -29,7 +29,7 @@ limitations under the License. */
 #include <vector>
 
 #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 {

paddle/fluid/distributed/service/env.cc → 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

paddle/fluid/distributed/service/graph_brpc_client.cc → 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 <algorithm>
 #include <memory>
 #include <sstream>
@@ -20,8 +20,8 @@
 #include <utility>
 #include <vector>
 #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 {

paddle/fluid/distributed/service/graph_brpc_client.h → 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"

paddle/fluid/distributed/service/graph_brpc_server.cc → 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 <thread>  // NOLINT
 #include <utility>
 #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 {

paddle/fluid/distributed/service/graph_brpc_server.h → paddle/fluid/distributed/ps/service/graph_brpc_server.h

@@ -20,10 +20,10 @@
 
 #include <memory>
 #include <vector>
-#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 {

paddle/fluid/distributed/service/heter_client.cc → 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"
 

paddle/fluid/distributed/service/heter_client.h → 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"

paddle/fluid/distributed/service/heter_server.cc → 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 {

paddle/fluid/distributed/service/heter_server.h → 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"

paddle/fluid/distributed/service/ps_client.cc → 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 {

paddle/fluid/distributed/service/ps_client.h → paddle/fluid/distributed/ps/service/ps_client.h

@@ -22,10 +22,10 @@
 #include <vector>
 #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 {

paddle/fluid/distributed/service/ps_local_client.cc → 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
 

paddle/fluid/distributed/service/ps_local_client.h → 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 {

paddle/fluid/distributed/service/ps_local_server.h → paddle/fluid/distributed/ps/service/ps_local_server.h

@@ -16,7 +16,7 @@
 
 #include <memory>
 #include <vector>
-#include "paddle/fluid/distributed/service/server.h"
+#include "paddle/fluid/distributed/ps/service/server.h"
 
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/service/graph_py_service.cc → 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 <thread>  // 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 {

paddle/fluid/distributed/service/graph_py_service.h → 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"

paddle/fluid/distributed/service/service.cc → 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 <fcntl.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <google/protobuf/text_format.h>
 #include <iostream>
-#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

paddle/fluid/distributed/service/service.h → paddle/fluid/distributed/ps/service/ps_service/service.h

@@ -20,9 +20,9 @@ limitations under the License. */
 #include <vector>
 
 #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 {

paddle/fluid/distributed/service/server.cc → 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 {

paddle/fluid/distributed/service/server.h → 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"

paddle/fluid/distributed/table/barrier_table.cc → 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 {

paddle/fluid/distributed/table/common_dense_table.cc → 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"
 

paddle/fluid/distributed/table/common_dense_table.h → paddle/fluid/distributed/ps/table/common_dense_table.h

@@ -19,10 +19,10 @@
 #include <pthread.h>
 #include <string>
 #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 {

paddle/fluid/distributed/table/common_graph_table.cc → 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 <time.h>
 #include <algorithm>
 #include <chrono>
 #include <set>
 #include <sstream>
 #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"

paddle/fluid/distributed/table/common_graph_table.h → paddle/fluid/distributed/ps/table/common_graph_table.h

@@ -36,11 +36,10 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#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 {

paddle/fluid/distributed/table/common_sparse_table.cc → 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 <sstream>
 
 #include "glog/logging.h"

paddle/fluid/distributed/table/common_sparse_table.h → paddle/fluid/distributed/ps/table/common_sparse_table.h

@@ -24,11 +24,11 @@
 #include <utility>
 #include <vector>
 #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"
 

paddle/fluid/distributed/table/common_table.h → paddle/fluid/distributed/ps/table/common_table.h

@@ -19,7 +19,7 @@
 #include <mutex>               // NOLINT
 #include <set>
 
-#include "paddle/fluid/distributed/table/table.h"
+#include "paddle/fluid/distributed/ps/table/table.h"
 
 #include "paddle/fluid/distributed/common/utils.h"
 

paddle/fluid/distributed/table/ctr_accessor.cc → 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 <gflags/gflags.h>
 #include "glog/logging.h"
 #include "paddle/fluid/string/string_helper.h"

paddle/fluid/distributed/table/ctr_accessor.h → paddle/fluid/distributed/ps/table/ctr_accessor.h

@@ -18,8 +18,8 @@
 #include <vector>
 #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 {

paddle/fluid/distributed/table/depends/large_scale_kv.h → 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"

paddle/fluid/distributed/table/depends/sparse.h → 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 {

paddle/fluid/distributed/table/graph/graph_edge.cc → 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 <cstring>
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/table/graph/graph_node.cc → 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 <cstring>
 namespace paddle {
 namespace distributed {

paddle/fluid/distributed/table/graph/graph_node.h → paddle/fluid/distributed/ps/table/graph/graph_node.h

@@ -18,7 +18,7 @@
 #include <memory>
 #include <sstream>
 #include <vector>
-#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 {
 

paddle/fluid/distributed/table/graph/graph_weighted_sampler.cc → 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 <iostream>
 #include <memory>
 #include <unordered_map>

paddle/fluid/distributed/table/graph/graph_weighted_sampler.h → paddle/fluid/distributed/ps/table/graph/graph_weighted_sampler.h

@@ -18,7 +18,7 @@
 #include <random>
 #include <unordered_map>
 #include <vector>
-#include "paddle/fluid/distributed/table/graph/graph_edge.h"
+#include "paddle/fluid/distributed/ps/table/graph/graph_edge.h"
 namespace paddle {
 namespace distributed {
 

paddle/fluid/distributed/table/memory_sparse_table.cc → paddle/fluid/distributed/ps/table/memory_sparse_table.cc

@@ -16,7 +16,7 @@
 #include <sstream>
 
 #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"

paddle/fluid/distributed/table/memory_sparse_table.h → paddle/fluid/distributed/ps/table/memory_sparse_table.h

@@ -24,9 +24,9 @@
 #include <utility>
 #include <vector>
 #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"

paddle/fluid/distributed/table/sparse_geo_table.cc → 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 {

paddle/fluid/distributed/table/sparse_geo_table.h → paddle/fluid/distributed/ps/table/sparse_geo_table.h

@@ -24,13 +24,13 @@
 #include <vector>
 
 #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"
 

paddle/fluid/distributed/table/sparse_sgd_rule.cc → 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 <gflags/gflags.h>
 #include "glog/logging.h"
 

paddle/fluid/distributed/table/ssd_sparse_table.cc → 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");
 

paddle/fluid/distributed/table/ssd_sparse_table.h → 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 {

paddle/fluid/distributed/table/table.cc → 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;

paddle/fluid/distributed/table/table.h → paddle/fluid/distributed/ps/table/table.h

@@ -21,9 +21,9 @@
 #include <string>
 #include <utility>
 #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"

paddle/fluid/distributed/table/tensor_accessor.cc → 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 {

paddle/fluid/distributed/table/tensor_accessor.h → 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 {

paddle/fluid/distributed/table/tensor_table.cc → 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 {

paddle/fluid/distributed/table/tensor_table.h → paddle/fluid/distributed/ps/table/tensor_table.h

@@ -24,7 +24,7 @@
 #include <vector>
 
 #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"

paddle/fluid/distributed/ps/wrapper/CMakeLists.txt

+
+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)

paddle/fluid/distributed/fleet.cc → 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 {

paddle/fluid/distributed/fleet.h → paddle/fluid/distributed/ps/wrapper/fleet.h

@@ -23,8 +23,8 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 
-#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"

paddle/fluid/distributed/test/barrier_table_test.cc

@@ -17,8 +17,8 @@ limitations under the License. */
 #include <vector>
 #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 {

paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc

@@ -17,8 +17,8 @@ limitations under the License. */
 #include <thread>  // 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"

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"

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 {

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 <cmath>
 #include <iostream>
 #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 {

paddle/fluid/distributed/test/dense_table_test.cc

@@ -16,7 +16,7 @@ limitations under the License. */
 #include <vector>
 #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 {

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 <vector>
 #include "gtest/gtest.h"
 

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 {

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"

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"

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 {

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 {

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 <cmath>
 #include <iostream>
 #include "gtest/gtest.h"

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 {

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 {

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__

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 {

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 {

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"
 

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"

paddle/fluid/framework/fleet/ps_gpu_wrapper.h

@@ -29,7 +29,7 @@ limitations under the License. */
 #include <gloo/broadcast.h>
 #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 {

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"

paddle/fluid/framework/heter_section_worker.cc

@@ -11,7 +11,7 @@ limitations under the License. */
 
 #if defined(PADDLE_WITH_PSCORE)
 #include <float.h>
-#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"

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 {

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 {

paddle/fluid/operators/pscore/distributed_lookup_table_op.h

@@ -13,8 +13,8 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#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"

paddle/fluid/operators/pscore/distributed_push_sparse_op.h

@@ -13,8 +13,8 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#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"

paddle/fluid/operators/pscore/heter_listen_and_serv_op.h

@@ -23,9 +23,9 @@ limitations under the License. */
 #include <utility>
 #include <vector>
 
-#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"

paddle/fluid/operators/pscore/heter_listen_and_server_test.cc

@@ -18,8 +18,8 @@ limitations under the License. */
 #include <thread>  // 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"

paddle/fluid/operators/pscore/heter_server_test.cc

@@ -18,8 +18,8 @@ limitations under the License. */
 #include <thread>  // 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;

paddle/fluid/operators/pscore/send_and_recv_op.cc

@@ -15,7 +15,7 @@ limitations under the License. */
 #include <future>  // NOLINT
 #include <ostream>
 
-#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"

paddle/fluid/operators/pscore/send_and_recv_op_cpu_test.cc

@@ -19,8 +19,8 @@ limitations under the License. */
 #include <thread>  // 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"
 

paddle/fluid/operators/pscore/send_and_recv_op_gpu_test.cc

@@ -20,8 +20,8 @@ limitations under the License. */
 #include <thread>  // 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"

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 {

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 {

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;
 

paddle/fluid/pybind/fleet_py.cc

@@ -29,15 +29,15 @@ limitations under the License. */
 #include <vector>
 
 #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;