diff --git a/paddle/scripts/conda_build.py b/paddle/scripts/conda_build.py index 245544949272e..f284798a41054 100644 --- a/paddle/scripts/conda_build.py +++ b/paddle/scripts/conda_build.py @@ -57,7 +57,6 @@ def __init__(self): - gast==0.3.3 - Pillow - decorator - - astor """ self.requirement_run_windows = r""" @@ -68,7 +67,6 @@ def __init__(self): - gast==0.3.3 - Pillow - decorator - - astor """ self.test = r""" test: diff --git a/pyproject.toml b/pyproject.toml index 9bc5c4a1106ad..99fb2babee8b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -200,8 +200,8 @@ show_column_numbers = true [[tool.mypy.overrides]] module = [ - "astor", "cv2", + "decorator", "scipy", "xlsxwriter" ] diff --git a/python/paddle/jit/api.py b/python/paddle/jit/api.py index d5dd69a8e4172..690bef06f2c6b 100644 --- a/python/paddle/jit/api.py +++ b/python/paddle/jit/api.py @@ -156,13 +156,13 @@ def ignore_module(modules: list[ModuleType]) -> None: .. code-block:: python >>> import scipy - >>> import astor + >>> import decorator >>> import paddle >>> from paddle.jit import ignore_module >>> modules = [ ... scipy, - ... astor, + ... decorator, ... ] >>> ignore_module(modules) diff --git a/python/paddle/jit/dy2static/ast_utils.py b/python/paddle/jit/dy2static/ast_utils.py index 7c4c90ec44d0e..ad9de34f9a824 100644 --- a/python/paddle/jit/dy2static/ast_utils.py +++ b/python/paddle/jit/dy2static/ast_utils.py @@ -14,9 +14,6 @@ import ast -import sys - -import astor from paddle.utils import gast @@ -32,13 +29,5 @@ def ast_to_source_code(ast_node): if isinstance(ast_node, gast.AST): ast_node = gast.gast_to_ast(ast_node) - if sys.version_info >= (3, 9): - ast.fix_missing_locations(ast_node) - return ast.unparse(ast_node) - - # Do not wrap lines even if they are too long - def pretty_source(source): - return ''.join(source) - - source_code = astor.to_source(ast_node, pretty_source=pretty_source) - return source_code + ast.fix_missing_locations(ast_node) + return ast.unparse(ast_node) diff --git a/python/requirements.txt b/python/requirements.txt index 95d3982cafb02..009f191fcc240 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -3,7 +3,6 @@ numpy>=1.21 protobuf>=3.20.2 Pillow decorator -astor opt_einsum==3.3.0 networkx typing_extensions diff --git a/test/dygraph_to_static/test_program_translator.py b/test/dygraph_to_static/test_program_translator.py index cb81400f1b39e..d0980f33f3b46 100644 --- a/test/dygraph_to_static/test_program_translator.py +++ b/test/dygraph_to_static/test_program_translator.py @@ -12,11 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import inspect -import textwrap import unittest -import astor import numpy as np from dygraph_to_static_utils import ( Dy2StTestBase, @@ -31,7 +28,6 @@ import paddle import paddle.jit.dy2static as _jst from paddle.jit.dy2static.utils import func_to_source_code -from paddle.utils import gast np.random.seed(0) @@ -56,14 +52,6 @@ def decorated_simple_func(x, weight_numpy): return z -def get_source_code(func): - raw_code = inspect.getsource(func) - code = textwrap.dedent(raw_code) - root = gast.parse(code) - source_code = astor.to_source(gast.gast_to_ast(root)) - return source_code - - class StaticCode1: def dyfunc_with_if_else(x_v, label=None): loss = _jst.UndefinedVar('loss') diff --git a/tools/cinn/docker/requirements.txt b/tools/cinn/docker/requirements.txt index 3343a1cf2294b..28608116a4c9c 100644 --- a/tools/cinn/docker/requirements.txt +++ b/tools/cinn/docker/requirements.txt @@ -8,5 +8,4 @@ gast==0.3.3 ; platform_system == "Windows" Pillow six decorator==4.4.2 -astor xgboost