[CodeStyle][isort][Dy2St] sort imports for paddle.jit (#48637)

* isort jit

* refine comment

Author: SigureMo

pyproject.toml

@@ -17,7 +17,4 @@ extend_skip_glob = [
     "python/paddle/utils/gast/**",
     "python/paddle/fluid/tests/unittests/npu/**",
     "python/paddle/fluid/tests/unittests/mlu/**",
-
-    # These files will be fixed in the future
-    "python/paddle/jit/**",
 ]

python/paddle/jit/api.py

@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Temporary disable isort to avoid circular import
+# This can be removed after the circular import is resolved
+# isort: skip_file
 import os
 import pickle
 import warnings

python/paddle/jit/dy2static/assert_transformer.py

@@ -12,15 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from paddle.jit.dy2static.static_analysis import AstNodeWrapper
+from paddle.jit.dy2static.utils import ast_to_source_code
 from paddle.utils import gast
 
-from paddle.jit.dy2static.static_analysis import (
-    AstNodeWrapper,
-)
-from paddle.jit.dy2static.utils import ast_to_source_code
-from .base_transformer import (
-    BaseTransformer,
-)
+from .base_transformer import BaseTransformer
 
 __all__ = []
 

python/paddle/jit/dy2static/ast_transformer.py

@@ -18,57 +18,27 @@
 # See details in https://github.com/serge-sans-paille/gast/
 
 import os
-from .base_transformer import (
-    BaseTransformer,
-)
-from .early_return_transformer import (
-    EarlyReturnTransformer,
-)
-from .assert_transformer import (
-    AssertTransformer,
-)
-from .basic_api_transformer import (
-    BasicApiTransformer,
-)
+
+from . import logging_utils
+from .assert_transformer import AssertTransformer
+from .base_transformer import BaseTransformer
+from .basic_api_transformer import BasicApiTransformer
 from .break_continue_transformer import (
     BreakContinueTransformer,
     BreakTransformOptimizer,
 )
-from .call_transformer import (
-    CallTransformer,
-)
-from .cast_transformer import (
-    CastTransformer,
-)
-from .typehint_transformer import (
-    TypeHintTransformer,
-)
-from .ifelse_transformer import (
-    IfElseTransformer,
-)
-from .logical_transformer import (
-    LogicalTransformer,
-)
-from .loop_transformer import (
-    LoopTransformer,
-)
-from .return_transformer import (
-    ReturnTransformer,
-)
-from .create_variable_transformer import (
-    CreateVariableTransformer,
-)
-from .static_analysis import (
-    StaticAnalysisVisitor,
-)
-from .tensor_shape_transformer import (
-    TensorShapeTransformer,
-)
-from .decorator_transformer import (
-    DecoratorTransformer,
-)
-
-from . import logging_utils
+from .call_transformer import CallTransformer
+from .cast_transformer import CastTransformer
+from .create_variable_transformer import CreateVariableTransformer
+from .decorator_transformer import DecoratorTransformer
+from .early_return_transformer import EarlyReturnTransformer
+from .ifelse_transformer import IfElseTransformer
+from .logical_transformer import LogicalTransformer
+from .loop_transformer import LoopTransformer
+from .return_transformer import ReturnTransformer
+from .static_analysis import StaticAnalysisVisitor
+from .tensor_shape_transformer import TensorShapeTransformer
+from .typehint_transformer import TypeHintTransformer
 from .utils import ast_to_source_code
 
 __all__ = []

python/paddle/jit/dy2static/base_transformer.py

@@ -12,20 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.utils import gast
 from paddle.fluid import unique_name
 from paddle.jit.dy2static.utils import (
-    ORIGI_INFO,
     FOR_ITER_INDEX_PREFIX,
-    FOR_ITER_VAR_LEN_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,
-    FOR_ITER_ITERATOR_PREFIX,
-    create_assign_node,
+    ORIGI_INFO,
     ast_to_source_code,
+    create_assign_node,
     get_attribute_full_name,
 )
+from paddle.utils import gast
 
 __all__ = []
 

python/paddle/jit/dy2static/basic_api_transformer.py

@@ -13,15 +13,12 @@
 # limitations under the License.
 
 import astor
+
 from paddle.utils import gast
 
-from .static_analysis import (
-    AstNodeWrapper,
-)
 from . import utils
-from .base_transformer import (
-    BaseTransformer,
-)
+from .base_transformer import BaseTransformer
+from .static_analysis import AstNodeWrapper
 
 __all__ = []
 

python/paddle/jit/dy2static/break_continue_transformer.py

@@ -12,20 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from paddle.fluid import unique_name
+from paddle.jit.dy2static.utils import BaseNodeVisitor, index_in_list
+from paddle.jit.dy2static.variable_trans_func import create_bool_node
 from paddle.utils import gast
 
-from paddle.fluid import unique_name
-from paddle.jit.dy2static.utils import index_in_list
-from paddle.jit.dy2static.utils import BaseNodeVisitor
-from paddle.jit.dy2static.variable_trans_func import (
-    create_bool_node,
-)
-from .base_transformer import (
-    BaseTransformer,
-)
-from .base_transformer import (
-    ForNodeVisitor,
-)
+from .base_transformer import BaseTransformer, ForNodeVisitor
 
 __all__ = []
 

python/paddle/jit/dy2static/call_transformer.py

@@ -12,16 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from paddle.jit.dy2static.static_analysis import AstNodeWrapper
+from paddle.jit.dy2static.utils import ast_to_source_code, is_paddle_api
 from paddle.utils import gast
 
-from paddle.jit.dy2static.static_analysis import (
-    AstNodeWrapper,
-)
-from paddle.jit.dy2static.utils import ast_to_source_code
-from paddle.jit.dy2static.utils import is_paddle_api
-from .base_transformer import (
-    BaseTransformer,
-)
+from .base_transformer import BaseTransformer
 
 PDB_SET = "pdb.set_trace"
 
@@ -53,9 +48,7 @@ def _no_need_convert_call(self, node):
 
         func_str = ast_to_source_code(node.func).strip()
         try:
-            from paddle.jit.dy2static.convert_call_func import (
-                is_builtin,
-            )
+            from paddle.jit.dy2static.convert_call_func import is_builtin
 
             need_convert_builtin_func_list = {
                 'len',

python/paddle/jit/dy2static/cast_transformer.py

@@ -12,15 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from paddle.jit.dy2static.static_analysis import AstNodeWrapper
+from paddle.jit.dy2static.utils import ast_to_source_code
 from paddle.utils import gast
 
-from paddle.jit.dy2static.static_analysis import (
-    AstNodeWrapper,
-)
-from paddle.jit.dy2static.utils import ast_to_source_code
-from .base_transformer import (
-    BaseTransformer,
-)
+from .base_transformer import BaseTransformer
 
 __all__ = []
 

python/paddle/jit/dy2static/convert_call_func.py

@@ -12,34 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import builtins
 import collections
 import copy
 import functools
-import logging
 import inspect
+import logging
 import pdb
 import re
 import types
 
 import numpy
-import builtins
 
 from paddle.fluid.dygraph.container import Sequential
+from paddle.fluid.dygraph.layers import Layer
+from paddle.jit.dy2static.logging_utils import TranslatorLogger
+from paddle.jit.dy2static.utils import is_paddle_func, unwrap
+
 from .convert_operators import (
-    convert_len,
-    convert_zip,
-    convert_range,
     convert_enumerate,
+    convert_len,
     convert_print,
+    convert_range,
+    convert_zip,
 )
 
-from paddle.jit.dy2static.logging_utils import (
-    TranslatorLogger,
-)
-
-from paddle.jit.dy2static.utils import is_paddle_func, unwrap
-from paddle.fluid.dygraph.layers import Layer
-
 __all__ = []
 
 
@@ -179,9 +176,9 @@ def dyfunc(x):
     """
     # NOTE(Aurelius84): Fix it after all files migrating into jit.
     from paddle.jit.dy2static.program_translator import (
+        StaticFunction,
         convert_to_static,
         unwrap_decorators,
-        StaticFunction,
     )
 
     translator_logger.log(