[Fluid clean]Migrate base/call/print et.al transformer into paddle.jit

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

@@ -21,7 +21,8 @@
 
 import paddle
 import paddle.fluid as fluid
-from paddle.fluid.dygraph.dygraph_to_static.logical_transformer import (
+from paddle.jit import ProgramTranslator
+from paddle.jit.dy2static.logical_transformer import (
     cmpop_node_to_str,
 )
 from paddle.jit import ProgramTranslator

python/paddle/jit/dy2static/assert_transformer.py

@@ -18,7 +18,7 @@
     AstNodeWrapper,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/jit/dy2static/ast_transformer.py

@@ -18,7 +18,7 @@
 # See details in https://github.com/serge-sans-paille/gast/
 
 import os
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 from .early_return_transformer import (
@@ -27,47 +27,47 @@
 from .assert_transformer import (
     AssertTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.basic_api_transformer import (
+from .basic_api_transformer import (
     BasicApiTransformer,
 )
 from .break_continue_transformer import (
     BreakContinueTransformer,
     BreakTransformOptimizer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.call_transformer import (
+from .call_transformer import (
     CallTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.cast_transformer import (
+from .cast_transformer import (
     CastTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.typehint_transformer import (
+from .typehint_transformer import (
     TypeHintTransformer,
 )
 from .ifelse_transformer import (
     IfElseTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.logical_transformer import (
+from .logical_transformer import (
     LogicalTransformer,
 )
 from .loop_transformer import (
     LoopTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.print_transformer import (
+from .print_transformer import (
     PrintTransformer,
 )
 from .return_transformer import (
     ReturnTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.create_variable_transformer import (
+from .create_variable_transformer import (
     CreateVariableTransformer,
 )
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import (
     StaticAnalysisVisitor,
 )
-from paddle.fluid.dygraph.dygraph_to_static.tensor_shape_transformer import (
+from .tensor_shape_transformer import (
     TensorShapeTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.decorator_transformer import (
+from .decorator_transformer import (
     DecoratorTransformer,
 )
 

python/paddle/fluid/dygraph/dygraph_to_static/base_transformer.py → python/paddle/jit/dy2static/base_transformer.py

@@ -14,25 +14,17 @@
 
 from paddle.utils import gast
 from paddle.fluid import unique_name
-from paddle.fluid.dygraph.dygraph_to_static.utils import get_attribute_full_name
-from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code
-from paddle.fluid.dygraph.dygraph_to_static.utils import create_assign_node
-from paddle.fluid.dygraph.dygraph_to_static.utils import ORIGI_INFO
-from paddle.fluid.dygraph.dygraph_to_static.utils import FOR_ITER_INDEX_PREFIX
-from paddle.fluid.dygraph.dygraph_to_static.utils import FOR_ITER_TUPLE_PREFIX
-from paddle.fluid.dygraph.dygraph_to_static.utils import (
-    FOR_ITER_TUPLE_INDEX_PREFIX,
-)
-from paddle.fluid.dygraph.dygraph_to_static.utils import FOR_ITER_VAR_LEN_PREFIX
 from paddle.fluid.dygraph.dygraph_to_static.utils import (
+    ORIGI_INFO,
+    FOR_ITER_INDEX_PREFIX,
+    FOR_ITER_VAR_LEN_PREFIX,
+    FOR_ITER_TARGET_PREFIX,
     FOR_ITER_VAR_NAME_PREFIX,
-)
-from paddle.fluid.dygraph.dygraph_to_static.utils import (
     FOR_ITER_ZIP_TO_LIST_PREFIX,
-)
-from paddle.fluid.dygraph.dygraph_to_static.utils import FOR_ITER_TARGET_PREFIX
-from paddle.fluid.dygraph.dygraph_to_static.utils import (
     FOR_ITER_ITERATOR_PREFIX,
+    create_assign_node,
+    ast_to_source_code,
+    get_attribute_full_name,
 )
 
 

python/paddle/fluid/dygraph/dygraph_to_static/basic_api_transformer.py → python/paddle/jit/dy2static/basic_api_transformer.py

@@ -19,7 +19,7 @@
     AstNodeWrapper,
 )
 from paddle.fluid.dygraph.dygraph_to_static import utils
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code

python/paddle/jit/dy2static/break_continue_transformer.py

@@ -20,10 +20,10 @@
 from paddle.fluid.dygraph.dygraph_to_static.variable_trans_func import (
     create_bool_node,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     ForNodeVisitor,
 )
 

python/paddle/fluid/dygraph/dygraph_to_static/call_transformer.py → python/paddle/jit/dy2static/call_transformer.py

@@ -19,7 +19,7 @@
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code
 from paddle.fluid.dygraph.dygraph_to_static.utils import is_paddle_api
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/fluid/dygraph/dygraph_to_static/cast_transformer.py → python/paddle/jit/dy2static/cast_transformer.py

@@ -18,7 +18,7 @@
     AstNodeWrapper,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/fluid/dygraph/dygraph_to_static/create_variable_transformer.py → python/paddle/jit/dy2static/create_variable_transformer.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.utils import gast
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import (
     AstNodeWrapper,
 )
@@ -22,7 +21,7 @@
 from paddle.fluid.dygraph.dygraph_to_static.variable_trans_func import (
     create_undefined_var,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/fluid/dygraph/dygraph_to_static/decorator_transformer.py → python/paddle/jit/dy2static/decorator_transformer.py

@@ -17,19 +17,17 @@
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import (
     AstNodeWrapper,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import (
-    create_funcDef_node,
+    RE_PYNAME,
+    RE_PYMODULE,
     ast_to_source_code,
-    is_paddle_api,
-    Dygraph2StaticException,
 )
 import warnings
 
 import re
-from paddle.fluid.dygraph.dygraph_to_static.utils import RE_PYNAME, RE_PYMODULE
 
 IGNORE_NAMES = [
     'declarative',

python/paddle/jit/dy2static/early_return_transformer.py

@@ -16,7 +16,7 @@
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import (
     AstNodeWrapper,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/jit/dy2static/ifelse_transformer.py

@@ -39,7 +39,7 @@
     create_get_args_node,
     create_set_args_node,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import (

python/paddle/fluid/dygraph/dygraph_to_static/logical_transformer.py → python/paddle/jit/dy2static/logical_transformer.py

@@ -14,7 +14,7 @@
 
 from paddle.utils import gast
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/jit/dy2static/loop_transformer.py

@@ -35,15 +35,12 @@
     FunctionNameLivenessAnalysis,
 )
 from .ifelse_transformer import ARGS_NAME
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
-)
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
     ForLoopTuplePreTransformer,
-)
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
     ForNodeVisitor,
 )
+
 from paddle.fluid.dygraph.dygraph_to_static.utils import (
     GetterSetterHelper,
     create_name_str,

python/paddle/fluid/dygraph/dygraph_to_static/print_transformer.py → python/paddle/jit/dy2static/print_transformer.py

@@ -18,7 +18,7 @@
     AstNodeWrapper,
     StaticAnalysisVisitor,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/jit/dy2static/return_transformer.py

@@ -20,7 +20,7 @@
     ForToWhileTransformer,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 from paddle.fluid.dygraph.dygraph_to_static.utils import Dygraph2StaticException

python/paddle/fluid/dygraph/dygraph_to_static/tensor_shape_transformer.py → python/paddle/jit/dy2static/tensor_shape_transformer.py

@@ -18,7 +18,7 @@
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import (
     AstNodeWrapper,
 )
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )
 

python/paddle/fluid/dygraph/dygraph_to_static/typehint_transformer.py → python/paddle/jit/dy2static/typehint_transformer.py

@@ -12,14 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle.utils import gast
-import warnings
 
 from paddle.fluid.dygraph.dygraph_to_static.static_analysis import (
     AstNodeWrapper,
 )
-from paddle.fluid.dygraph.dygraph_to_static import utils
-from paddle.fluid.dygraph.dygraph_to_static.base_transformer import (
+from .base_transformer import (
     BaseTransformer,
 )