[Dy2st]Integrated gast library to fix compatibility problem permanently

python/paddle/fluid/dygraph/dygraph_to_static/assert_transformer.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import AstNodeWrapper
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code

python/paddle/fluid/dygraph/dygraph_to_static/ast_transformer.py

@@ -18,7 +18,7 @@
 # It provides a compatibility layer between the AST of various Python versions,
 # as produced by ast.parse from the standard ast module.
 # See details in https://github.com/serge-sans-paille/gast/
-import gast
+from paddle.utils import gast
 from paddle.fluid.dygraph.dygraph_to_static.assert_transformer import AssertTransformer
 from paddle.fluid.dygraph.dygraph_to_static.basic_api_transformer import BasicApiTransformer
 from paddle.fluid.dygraph.dygraph_to_static.break_continue_transformer import BreakContinueTransformer

python/paddle/fluid/dygraph/dygraph_to_static/basic_api_transformer.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import astor
-import gast
+from paddle.utils import gast
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import AstNodeWrapper
 from paddle.fluid.dygraph.dygraph_to_static import utils

python/paddle/fluid/dygraph/dygraph_to_static/break_continue_transformer.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 
 from paddle.fluid import unique_name
 from paddle.fluid.dygraph.dygraph_to_static.utils import index_in_list

python/paddle/fluid/dygraph/dygraph_to_static/call_transformer.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from __future__ import print_function
-import gast
+from paddle.utils import gast
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import AstNodeWrapper
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code

python/paddle/fluid/dygraph/dygraph_to_static/cast_transformer.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from __future__ import print_function
-import gast
+from paddle.utils import gast
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import AstNodeWrapper
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code

python/paddle/fluid/dygraph/dygraph_to_static/grad_transformer.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 import warnings
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import AstNodeWrapper

python/paddle/fluid/dygraph/dygraph_to_static/ifelse_transformer.py

@@ -22,7 +22,7 @@
 # It provides a compatibility layer between the AST of various Python versions,
 # as produced by ast.parse from the standard ast module.
 # See details in https://github.com/serge-sans-paille/gast/
-import gast
+from paddle.utils import gast
 from paddle.fluid import unique_name
 
 from paddle.fluid.dygraph.dygraph_to_static.utils import create_funcDef_node, ast_to_source_code

python/paddle/fluid/dygraph/dygraph_to_static/list_transformer.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import astor
-import gast
+from paddle.utils import gast
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import AstNodeWrapper, StaticAnalysisVisitor
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code

python/paddle/fluid/dygraph/dygraph_to_static/logical_transformer.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code
 
 cmpop_type_to_str = {

python/paddle/fluid/dygraph/dygraph_to_static/loop_transformer.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import copy
-import gast
+from paddle.utils import gast
 
 from collections import defaultdict
 from paddle.fluid import unique_name

python/paddle/fluid/dygraph/dygraph_to_static/origin_info.py

@@ -17,7 +17,7 @@
 import collections
 import inspect
 
-import gast
+from paddle.utils import gast
 from paddle.fluid import core
 from paddle.fluid.dygraph.dygraph_to_static.utils import unwrap
 from paddle.fluid.framework import Program

python/paddle/fluid/dygraph/dygraph_to_static/print_transformer.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import AstNodeWrapper, StaticAnalysisVisitor
 

python/paddle/fluid/dygraph/dygraph_to_static/program_translator.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import collections
-import gast
+from paddle.utils import gast
 import inspect
 import six
 import textwrap

python/paddle/fluid/dygraph/dygraph_to_static/return_transformer.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 
 from paddle.fluid import unique_name
 from paddle.fluid.dygraph.dygraph_to_static.utils import index_in_list

python/paddle/fluid/dygraph/dygraph_to_static/static_analysis.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 from .utils import is_paddle_api, is_dygraph_api, is_numpy_api, index_in_list
 
 __all__ = ['AstNodeWrapper', 'NodeVarType', 'StaticAnalysisVisitor']

python/paddle/fluid/dygraph/dygraph_to_static/tensor_shape_transformer.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import copy
-import gast
+from paddle.utils import gast
 
 from paddle.fluid import unique_name
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code

python/paddle/fluid/dygraph/dygraph_to_static/utils.py

@@ -19,7 +19,7 @@
 import atexit
 import copy
 import collections
-import gast
+from paddle.utils import gast
 import inspect
 import os
 import six

python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import six
-import gast
+from paddle.utils import gast
 
 from paddle.fluid import core
 from paddle.fluid import unique_name

python/paddle/fluid/tests/unittests/dygraph_to_static/test_ast_util.py

@@ -16,7 +16,7 @@
 
 import unittest
 import textwrap
-import gast
+from paddle.utils import gast
 import inspect
 import numpy as np
 import paddle.fluid as fluid

python/paddle/fluid/tests/unittests/dygraph_to_static/test_basic_api_transformation.py

@@ -17,7 +17,7 @@
 import numpy as np
 import unittest
 import inspect
-import gast
+from paddle.utils import gast
 
 import paddle
 import paddle.fluid as fluid

python/paddle/fluid/tests/unittests/dygraph_to_static/test_ifelse_basic.py

@@ -16,7 +16,7 @@
 
 import unittest
 import textwrap
-import gast
+from paddle.utils import gast
 from paddle.fluid.dygraph.dygraph_to_static.ifelse_transformer import get_name_ids
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import StaticAnalysisVisitor
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import NodeVarType

python/paddle/fluid/tests/unittests/dygraph_to_static/test_logging_utils.py

@@ -20,7 +20,7 @@
 import sys
 import unittest
 
-import gast
+from paddle.utils import gast
 
 import paddle
 from paddle.fluid.dygraph.dygraph_to_static import logging_utils

python/paddle/fluid/tests/unittests/dygraph_to_static/test_logical.py

@@ -18,7 +18,7 @@
 
 import unittest
 
-import gast
+from paddle.utils import gast
 import numpy as np
 
 import paddle

python/paddle/fluid/tests/unittests/dygraph_to_static/test_loop.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 import inspect
 import numpy as np
 import paddle

python/paddle/fluid/tests/unittests/dygraph_to_static/test_program_translator.py

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import astor
-import gast
+from paddle.utils import gast
 import inspect
 import numpy as np
 import textwrap

python/paddle/fluid/tests/unittests/dygraph_to_static/test_static_analysis.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 import inspect
 import numpy as np
 import paddle

python/paddle/fluid/tests/unittests/dygraph_to_static/test_variable_trans_func.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 
-import gast
+from paddle.utils import gast
 import unittest
 
 import numpy as np

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

@@ -15,7 +15,7 @@
 from __future__ import print_function
 
 import ast
-import gast
+from paddle.utils import gast
 import sys
 import textwrap
 import unittest

python/paddle/utils/__init__.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from . import gast
 from .profiler import ProfilerOptions  # noqa: F401
 from .profiler import Profiler  # noqa: F401
 from .profiler import get_profiler  # noqa: F401

python/paddle/utils/gast/__init__.py

@@ -0,0 +1,16 @@
+# Copyright (c) 2021 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.
+
+from .gast import *
+from ast import NodeVisitor, NodeTransformer, iter_fields, dump