revert conflicting files

python/paddle/fluid/tests/unittests/auto_parallel/test_pattern.py

@@ -14,7 +14,6 @@
 
 import sys
 import unittest
-
 import numpy as np
 
 import paddle
@@ -23,8 +22,8 @@
 sys.path.append("..")
 import auto_parallel_gpt_model as modeling
 from auto_parallel_gpt_model import (
-    GPTForPretraining,
     GPTModel,
+    GPTForPretraining,
     GPTPretrainingCriterion,
 )
 
@@ -112,13 +111,13 @@ def test_gpt(self):
             sequence_len,
             vocab_size,
         )
-        from paddle.distributed.auto_parallel.dist_context import (
-            DistributedContext,
-        )
         from paddle.distributed.auto_parallel.tuner.rule_based_tuner import (
-            _PATTERNS,
             RuleBasedTuner,
             convert_to_graph,
+            _PATTERNS,
+        )
+        from paddle.distributed.auto_parallel.dist_context import (
+            DistributedContext,
         )
 
         dist_context = DistributedContext()

python/paddle/static/nn/common.py

@@ -13,15 +13,17 @@
 # limitations under the License.
 
 import paddle
+from paddle.fluid.initializer import Normal
+from paddle.fluid.framework import static_only, Variable, _non_static_mode
+
+from paddle.fluid.data_feeder import check_dtype
+
 from paddle.common_ops_import import (
-    LayerHelper,
     check_type,
     check_variable_and_dtype,
     utils,
+    LayerHelper,
 )
-from paddle.fluid.data_feeder import check_dtype
-from paddle.fluid.framework import Variable, _non_static_mode, static_only
-from paddle.fluid.initializer import Normal
 
 __all__ = []