[RM FLUID] rm ps mode (#50704)

python/paddle/fluid/incubate/fleet/parameter_server/mode.py

-# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-
-class PSMode:
-    """
-    There are various mode for fleet, each of them is designed for different model.
-    """
-
-    TRANSPILER = 1
-    PSLIB = 2
-
-
-class DistributedMode:
-    SYNC = 0
-    ASYNC = 1
-    HALF_ASYNC = 2
-    GEO = 3

python/paddle/fluid/tests/unittests/collective/fleet/test_recv_save_op.py

@@ -25,8 +25,8 @@ from dist_test_utils import remove_ps_flag
 import paddle.fluid as fluid
 import paddle.fluid.core as core
 from paddle.fluid.framework import Program, program_guard
-from paddle.fluid.incubate.fleet.parameter_server.mode import DistributedMode
 from paddle.fluid.op import Operator
+from paddle.incubate.fleet.parameter_server.mode import DistributedMode
 
 
 def run_pserver(pserver_id):

python/paddle/fluid/tests/unittests/test_communicator_geo.py

@@ -140,7 +140,7 @@ import paddle.fluid as fluid
 
 from paddle.distributed.communicator import Communicator
 import paddle.fluid.incubate.fleet.base.role_maker as role_maker
-from paddle.fluid.incubate.fleet.parameter_server.mode import DistributedMode
+from paddle.incubate.fleet.parameter_server.mode import DistributedMode
 import paddle.distributed.fleet as fleet
 
 from test_communicator_geo import TestCommunicatorGeoEnd2End

python/paddle/fluid/transpiler/geo_sgd_transpiler.py

@@ -49,7 +49,7 @@ from .distribute_transpiler import (
     same_or_split_var,
     ServerRuntimeConfig,
 )
-from paddle.fluid.incubate.fleet.parameter_server.mode import DistributedMode
+from paddle.incubate.fleet.parameter_server.mode import DistributedMode
 from paddle.distributed.distribute_lookup_table import (
     find_distributed_lookup_table,
 )

python/paddle/incubate/fleet/parameter_server/ir/public.py

@@ -19,10 +19,10 @@ import warnings
 from functools import reduce
 
 import paddle
-from paddle.fluid.incubate.fleet.parameter_server.mode import DistributedMode
 from paddle.framework import core
 from paddle.incubate.fleet.parameter_server.ir import vars_metatools
 from paddle.incubate.fleet.parameter_server.ir.ps_dispatcher import RoundRobin
+from paddle.incubate.fleet.parameter_server.mode import DistributedMode
 
 OP_NAME_SCOPE = "op_namescope"
 CLIP_OP_NAME_SCOPE = "gradient_clip"

python/paddle/incubate/fleet/parameter_server/pslib/optimizer_factory.py

@@ -28,7 +28,7 @@ from . import ps_pb2 as pslib
 from .node import DownpourServer, DownpourWorker
 
 OpRole = core.op_proto_and_checker_maker.OpRole
-# this dict is for store info about pull/push sparse ops.
+# this dict is for storing info about pull/push sparse ops.
 FLEET_GLOBAL_DICT = {
     # global settings
     "enable": False,