[Dy2St] Move more transformer specific utilities to transformers dir (#61242)

SigureMo · web-flow · commit b3308ea80ba6 · 2024-01-29T11:12:57.000+08:00
diff --git a/python/paddle/jit/dy2static/transformers/base.py b/python/paddle/jit/dy2static/transformers/base.py
@@ -14,18 +14,20 @@
 
 from paddle.base import unique_name
 from paddle.jit.dy2static.utils import (
+    ORIGI_INFO,
+    ast_to_source_code,
+)
+from paddle.utils import gast
+
+from .utils import (
     FOR_ITER_INDEX_PREFIX,
     FOR_ITER_ITERATOR_PREFIX,
     FOR_ITER_TARGET_PREFIX,
     FOR_ITER_VAR_LEN_PREFIX,
     FOR_ITER_VAR_NAME_PREFIX,
     FOR_ITER_ZIP_TO_LIST_PREFIX,
-    ORIGI_INFO,
-    ast_to_source_code,
+    create_assign_node,
 )
-from paddle.utils import gast
-
-from .utils import create_assign_node
 
 __all__ = []
 
diff --git a/python/paddle/jit/dy2static/transformers/basic_api_transformer.py b/python/paddle/jit/dy2static/transformers/basic_api_transformer.py
@@ -15,7 +15,7 @@
 
 from paddle.utils import gast
 
-from .. import utils
+from ..utils import ast_to_source_code
 from .base import BaseTransformer
 
 __all__ = []
@@ -82,7 +82,7 @@ def transform(self):
 
     def _surround_with_ld(self, node):
         node = (
-            gast.parse(f"_jst.Ld({utils.ast_to_source_code(node).strip()})")
+            gast.parse(f"_jst.Ld({ast_to_source_code(node).strip()})")
             .body[0]
             .value
         )
@@ -161,7 +161,7 @@ def visit_Attribute(self, node):
             value = node.value
             node = (
                 gast.parse(
-                    f"_jst.Attr({utils.ast_to_source_code(value).strip()}, \"{attr}\")"
+                    f"_jst.Attr({ast_to_source_code(value).strip()}, \"{attr}\")"
                 )
                 .body[0]
                 .value
@@ -172,7 +172,7 @@ def visit_Attribute(self, node):
 
 def is_to_variable(node):
     assert isinstance(node, gast.Call)
-    api_name = utils.ast_to_source_code(node.func).strip()
+    api_name = ast_to_source_code(node.func).strip()
 
     return api_name.split(".")[-1] == "to_variable"
 
diff --git a/python/paddle/jit/dy2static/transformers/call_transformer.py b/python/paddle/jit/dy2static/transformers/call_transformer.py
@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.jit.dy2static.utils import ast_to_source_code
 from paddle.utils import gast
 
-from ..utils import is_builtin
+from ..utils import ast_to_source_code, is_builtin
 from .base import BaseTransformer
 from .utils import is_paddle_api
 
diff --git a/python/paddle/jit/dy2static/transformers/create_variable_transformer.py b/python/paddle/jit/dy2static/transformers/create_variable_transformer.py
@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ..utils import FunctionNameLivenessAnalysis
 from .base import BaseTransformer
-from .utils import create_undefined_var
+from .utils import FunctionNameLivenessAnalysis, create_undefined_var
 
 __all__ = []
 
diff --git a/python/paddle/jit/dy2static/transformers/ifelse_transformer.py b/python/paddle/jit/dy2static/transformers/ifelse_transformer.py
@@ -17,6 +17,19 @@
 
 from paddle.base import unique_name
 from paddle.jit.dy2static.utils import (
+    GetterSetterHelper,
+    ast_to_source_code,
+)
+
+# gast is a generic AST to represent Python2 and Python3's Abstract Syntax Tree(AST).
+# 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/
+from paddle.utils import gast
+
+from .base import BaseTransformer
+from .utils import (
+    FALSE_FUNC_PREFIX,
     FOR_ITER_INDEX_PREFIX,
     FOR_ITER_ITERATOR_PREFIX,
     FOR_ITER_TARGET_PREFIX,
@@ -25,24 +38,15 @@
     FOR_ITER_VAR_LEN_PREFIX,
     FOR_ITER_VAR_NAME_PREFIX,
     FOR_ITER_ZIP_TO_LIST_PREFIX,
+    TRUE_FUNC_PREFIX,
     FunctionNameLivenessAnalysis,
-    GetterSetterHelper,
-    ast_to_source_code,
+    create_function_def_node,
     create_get_args_node,
+    create_name_str,
     create_nonlocal_stmt_nodes,
     create_set_args_node,
 )
 
-# gast is a generic AST to represent Python2 and Python3's Abstract Syntax Tree(AST).
-# 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/
-from paddle.utils import gast
-
-from ..utils import FALSE_FUNC_PREFIX, TRUE_FUNC_PREFIX
-from .base import BaseTransformer
-from .utils import create_function_def_node, create_name_str
-
 __all__ = []
 
 GET_ARGS_FUNC_PREFIX = 'get_args'
diff --git a/python/paddle/jit/dy2static/transformers/loop_transformer.py b/python/paddle/jit/dy2static/transformers/loop_transformer.py
@@ -19,24 +19,28 @@
 from paddle.utils import gast
 
 from ..utils import (
+    GetterSetterHelper,
+    ast_to_source_code,
+)
+from .base import (
+    BaseTransformer,
+    ForLoopTuplePreTransformer,
+    ForNodeVisitor,
+)
+from .utils import (
+    ARGS_NAME,
     FOR_BODY_PREFIX,
     FOR_CONDITION_PREFIX,
     WHILE_BODY_PREFIX,
     WHILE_CONDITION_PREFIX,
     FunctionNameLivenessAnalysis,
-    GetterSetterHelper,
-    ast_to_source_code,
     create_get_args_node,
+    create_name_str,
     create_nonlocal_stmt_nodes,
     create_set_args_node,
+    get_attribute_full_name,
+    get_parent_mapping,
 )
-from .base import (
-    BaseTransformer,
-    ForLoopTuplePreTransformer,
-    ForNodeVisitor,
-)
-from .ifelse_transformer import ARGS_NAME
-from .utils import create_name_str, get_attribute_full_name, get_parent_mapping
 
 __all__ = []
 
diff --git a/python/paddle/jit/dy2static/transformers/utils.py b/python/paddle/jit/dy2static/transformers/utils.py
diff --git a/python/paddle/jit/dy2static/utils.py b/python/paddle/jit/dy2static/utils.py
diff --git a/test/dygraph_to_static/test_closure_analysis.py b/test/dygraph_to_static/test_closure_analysis.py
