remove fluid APIs in distributed_strategy.py and role_maker.py

PaddlePaddle · Nov 15, 2022 · 223bbee · 223bbee
1 parent 19f5dfe
commit 223bbee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/python/paddle/distributed/fleet/base/distributed_strategy.py b/python/paddle/distributed/fleet/base/distributed_strategy.py
@@ -103,7 +103,7 @@ def _set_distributed_strategy(self, dist_strategy):
         self.job_info.strategy = dist_strategy
 
 
-ReduceStrategyFluid = paddle.fluid.BuildStrategy.ReduceStrategy
+ReduceStrategyFluid = paddle.static.BuildStrategy.ReduceStrategy
 ReduceStrategyFleet = int
 
 
@@ -204,7 +204,7 @@ def execution_strategy(self):
             strategy = paddle.distributed.fleet.DistributedStrategy()
             strategy.execution_strategy = exe_strategy
         """
-        execution_strategy = paddle.fluid.ExecutionStrategy()
+        execution_strategy = paddle.static.ExecutionStrategy()
         fields = self.strategy.execution_strategy.DESCRIPTOR.fields
         for f in fields:
             setattr(
@@ -251,7 +251,7 @@ def build_strategy(self):
             strategy.build_strategy = build_strategy
         """
 
-        build_strategy = paddle.fluid.BuildStrategy()
+        build_strategy = paddle.static.BuildStrategy()
         fields = self.strategy.build_strategy.DESCRIPTOR.fields
         for f in fields:
             value = getattr(self.strategy.build_strategy, f.name)

diff --git a/python/paddle/distributed/fleet/base/role_maker.py b/python/paddle/distributed/fleet/base/role_maker.py
@@ -19,7 +19,7 @@
 from multiprocessing import Process, Manager
 
 import paddle
-import paddle.fluid as fluid
+import paddle.framework as framework
 from paddle.distributed.fleet.base.private_helper_function import (
     wait_server_ready,
 )
@@ -128,7 +128,7 @@ def init(
 
     def _init_fs(self, fs_path, prefix):
         def init(rank, nodes, role):
-            gloo = fluid.core.Gloo()
+            gloo = framework.core.Gloo()
             gloo.set_rank(rank)
             gloo.set_size(nodes)
             gloo.set_prefix(prefix)
@@ -156,7 +156,7 @@ def init(rank, nodes, role):
 
     def _init_dfs(self, dfs_name, dfs_ugi, dfs_path, prefix):
         def init(rank, nodes, role):
-            gloo = fluid.core.Gloo()
+            gloo = framework.core.Gloo()
             gloo.set_rank(rank)
             gloo.set_size(nodes)
             gloo.set_prefix(prefix)
@@ -216,7 +216,7 @@ def init_kv_server(http_server_d):
             return _http_server
 
         def init(rank, nodes, role):
-            gloo = fluid.core.Gloo()
+            gloo = framework.core.Gloo()
             gloo.set_rank(rank)
             gloo.set_size(nodes)
             gloo.set_prefix(prefix)
@@ -1175,7 +1175,7 @@ def _generate_role(self):
             else:
                 self._collective_env()
             self._role_is_generated = True
-            if not paddle.fluid.framework._non_static_mode():
+            if not paddle.framework._non_static_mode():
                 self._gloo_init()