[RM FLUID] trainer_pass&heter_trainer_pass (#50610)

* [RM FLUID] trainer_pass&heter_trainer_pass
* [RM FLUID] rm distributed_strategy

Author: wangzhen38

python/paddle/distributed/fleet/meta_optimizers/parameter_server_optimizer.py

@@ -96,7 +96,7 @@ def _get_distributed_strategy(self):
         return strategy
 
     def _build_trainer_programs(self, compiled_config):
-        from paddle.fluid.incubate.fleet.parameter_server.ir import (
+        from paddle.incubate.fleet.parameter_server.ir import (
             trainer_pass as worker,
         )
 
@@ -106,7 +106,7 @@ def _build_trainer_programs(self, compiled_config):
         use_ps_gpu = self.user_defined_strategy.a_sync_configs["use_ps_gpu"]
 
         if not compiled_config.is_geo_mode():
-            from paddle.fluid.incubate.fleet.parameter_server.ir.public import (
+            from paddle.incubate.fleet.parameter_server.ir.public import (
                 _add_lr_decay_table_pass,
             )
 
@@ -150,7 +150,7 @@ def _build_trainer_programs(self, compiled_config):
             compiled_config.set_origin_ps_startup_program(_startup)
             # for heter program
             if self.role_maker._is_heter_parameter_server_mode:
-                from paddle.fluid.incubate.fleet.parameter_server.ir import (
+                from paddle.incubate.fleet.parameter_server.ir import (
                     heter_trainer_pass as heter_worker,
                 )
 
@@ -191,13 +191,13 @@ def _build_pserver_programs(self, compiled_config):
         _main = paddle.static.Program()
         _startup = paddle.static.Program()
 
-        from paddle.fluid.incubate.fleet.parameter_server.ir import (
+        from paddle.incubate.fleet.parameter_server.ir import (
             pserver_pass as server,
         )
 
         if not compiled_config.is_geo_mode():
 
-            from paddle.fluid.incubate.fleet.parameter_server.ir.public import (
+            from paddle.incubate.fleet.parameter_server.ir.public import (
                 _get_optimize_ops,
             )
 
@@ -209,7 +209,7 @@ def _build_pserver_programs(self, compiled_config):
             if len(ops) == 0:
                 return _main, _startup
 
-            from paddle.fluid.incubate.fleet.parameter_server.ir.public import (
+            from paddle.incubate.fleet.parameter_server.ir.public import (
                 _add_lr_decay_table_pass,
             )
 
@@ -299,9 +299,7 @@ def get_sys_free_mem():
 
         free = get_sys_free_mem()
 
-        from paddle.fluid.incubate.fleet.parameter_server.ir import (
-            vars_metatools,
-        )
+        from paddle.incubate.fleet.parameter_server.ir import vars_metatools
 
         processed_var_names = set(["@EMPTY@"])
         param_memory_size = 0
@@ -371,9 +369,7 @@ def minimize_impl(
 
         _origin_main_program = loss.block.program
         _origin_startup_program = startup_program
-        from paddle.fluid.incubate.fleet.parameter_server.ir import (
-            public as public,
-        )
+        from paddle.incubate.fleet.parameter_server.ir import public as public
 
         compiled_config = public.CompileTimeStrategy(
             _origin_main_program,
@@ -409,14 +405,14 @@ def minimize_impl(
                 }
             else:
                 loss.block.program = main_program
-                fluid.framework.switch_startup_program(startup_program)
+                paddle.framework.switch_startup_program(startup_program)
 
         elif self.role_maker._is_server():
             main_program, startup_program = self._build_pserver_programs(
                 compiled_config
             )
             loss.block.program = main_program
-            fluid.framework.switch_startup_program(startup_program)
+            paddle.framework.switch_startup_program(startup_program)
         return None, None
 
     def _disable_strategy(self, dist_strategy):

python/paddle/fluid/device_worker.py

@@ -123,7 +123,7 @@ def _gen_worker_desc(self, trainer_desc):
                 hogwild.stat_var_names.extend([i])
                 downpour.stat_var_names.extend([i])
 
-        from paddle.fluid.incubate.fleet.parameter_server import version
+        from paddle.incubate.fleet.parameter_server import version
 
         if (
             version.is_transpiler()
@@ -271,7 +271,7 @@ def _gen_worker_desc(self, trainer_desc):
             for i in opt_info["stat_var_names"]:
                 downpour.stat_var_names.extend([i])
 
-        from paddle.fluid.incubate.fleet.parameter_server import version
+        from paddle.incubate.fleet.parameter_server import version
 
         if (
             version.is_transpiler()