[Executor] remove api paddle.static.ParallelExecutor (#51701)

* remove api `class ParallelExecutor` * remove other references
PaddlePaddle · Mar 28, 2023 · e9c3da9 · e9c3da9
1 parent cdba7e3
commit e9c3da9
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 438 deletions.
diff --git a/python/paddle/distributed/fleet/runtime/parameter_server_runtime.py b/python/paddle/distributed/fleet/runtime/parameter_server_runtime.py
@@ -20,7 +20,6 @@
 from paddle.static import (
     CompiledProgram,
     Executor,
-    ParallelExecutor,
     Program,
     Variable,
     default_main_program,
@@ -697,11 +696,6 @@ def _ps_inference_save_persistables(
         single file, use `filename` to specify the file name.
         """
 
-        if isinstance(executor, ParallelExecutor):
-            raise TypeError(
-                "in fleet.save_persistables() function, executor must be as Executor type, ParallelExecutor is not allowed"
-            )
-
         if not isinstance(executor, Executor):
             raise TypeError(
                 "in fleet.save_persistables() function, executor must be as Executor type"
@@ -733,11 +727,6 @@ def _ps_inference_save_inference_model(
         and then save it and all related parameters to given `dirname` by the `executor`.
         """
 
-        if isinstance(executor, ParallelExecutor):
-            raise TypeError(
-                "in fleet.save_inference_model() function, executor must be as Executor type, ParallelExecutor is not allowed"
-            )
-
         if not isinstance(executor, Executor):
             raise TypeError(
                 "in fleet.save_inference_model() function, executor must be as Executor type"

diff --git a/python/paddle/distributed/fleet/runtime/the_one_ps.py b/python/paddle/distributed/fleet/runtime/the_one_ps.py
@@ -20,7 +20,6 @@
 from paddle.fluid.compiler import CompiledProgram
 from paddle.fluid.executor import Executor
 from paddle.fluid.framework import Program
-from paddle.fluid.parallel_executor import ParallelExecutor
 
 from ..base.private_helper_function import wait_server_ready
 from .runtime_base import RuntimeBase
@@ -1362,11 +1361,6 @@ def _ps_inference_save_persistables(
         single file, use `filename` to specify the file name.
         """
 
-        if isinstance(executor, ParallelExecutor):
-            raise TypeError(
-                "in fleet.save() function, executor must be as Executor type, ParallelExecutor is not allowed"
-            )
-
         if not isinstance(executor, Executor):
             raise TypeError(
                 "in fleet.save() function, executor must be as Executor type"
@@ -1400,11 +1394,6 @@ def _ps_inference_save_inference_model(
         and then save it and all related parameters to given `dirname` by the `executor`.
         """
 
-        if isinstance(executor, ParallelExecutor):
-            raise TypeError(
-                "in fleet.save() function, executor must be as Executor type, ParallelExecutor is not allowed"
-            )
-
         if not isinstance(executor, Executor):
             raise TypeError(
                 "in fleet.save() function, executor must be as Executor type"

diff --git a/python/paddle/distributed/ps/the_one_ps.py b/python/paddle/distributed/ps/the_one_ps.py
@@ -28,7 +28,7 @@
 from paddle.distributed.ps.coordinator import Coordinator
 from paddle.distributed.ps.utils.public import *  # noqa: F403
 from paddle.framework import core
-from paddle.static import CompiledProgram, Executor, ParallelExecutor, Program
+from paddle.static import CompiledProgram, Executor, Program
 
 __all__ = [
     'Table',
@@ -1491,11 +1491,6 @@ def _save_distributed_persistables(
         single file, use `filename` to specify the file name.
         """
 
-        if isinstance(executor, ParallelExecutor):
-            raise TypeError(
-                "in fleet.save() function, executor must be as Executor type, ParallelExecutor is not allowed"
-            )
-
         if not isinstance(executor, Executor):
             raise TypeError(
                 "in fleet.save() function, executor must be as Executor type"
@@ -1526,11 +1521,6 @@ def _ps_inference_save_inference_model(
         and then save it and all related parameters to given `dirname` by the `executor`.
         """
 
-        if isinstance(executor, ParallelExecutor):
-            raise TypeError(
-                "in fleet.save() function, executor must be as Executor type, ParallelExecutor is not allowed"
-            )
-
         if not isinstance(executor, Executor):
             raise TypeError(
                 "in fleet.save() function, executor must be as Executor type"

diff --git a/python/paddle/fluid/__init__.py b/python/paddle/fluid/__init__.py
@@ -79,8 +79,6 @@
 from .lod_tensor import create_lod_tensor, create_random_int_lodtensor
 from . import profiler
 from . import unique_name
-from . import parallel_executor
-from .parallel_executor import *
 from . import compiler
 from .compiler import *
 from paddle.fluid.layers.math_op_patch import monkey_patch_variable
@@ -105,7 +103,6 @@
     framework.__all__
     + executor.__all__
     + trainer_desc.__all__
-    + parallel_executor.__all__
     + lod_tensor.__all__
     + data_feed_desc.__all__
     + compiler.__all__