From 41da96c8b95b714370c1702c8a440f92fa4d9239 Mon Sep 17 00:00:00 2001 From: Aurelius84 Date: Wed, 30 Nov 2022 10:48:49 +0800 Subject: [PATCH] [Fluid clean]Migrate base/call/print et.al transformer into paddle.jit (#48513) * [Fluid clean]Migrate base/call/print et.al transformer into paddle.jit * fix phi kernel * Revert "fix phi kernel" This reverts commit eff8891c7efda6e49799edbcaef2ca50379d50ef. --- .../dygraph_to_static/test_logical.py | 3 ++- .../jit/dy2static/assert_transformer.py | 2 +- .../paddle/jit/dy2static/ast_transformer.py | 20 ++++++++--------- .../dy2static}/base_transformer.py | 22 ++++++------------- .../dy2static}/basic_api_transformer.py | 2 +- .../dy2static/break_continue_transformer.py | 4 ++-- .../dy2static}/call_transformer.py | 2 +- .../dy2static}/cast_transformer.py | 2 +- .../dy2static}/create_variable_transformer.py | 3 +-- .../dy2static}/decorator_transformer.py | 8 +++---- .../jit/dy2static/early_return_transformer.py | 2 +- .../jit/dy2static/ifelse_transformer.py | 2 +- .../dy2static}/logical_transformer.py | 2 +- .../paddle/jit/dy2static/loop_transformer.py | 7 ++---- .../dy2static}/print_transformer.py | 2 +- .../jit/dy2static/return_transformer.py | 2 +- .../dy2static}/tensor_shape_transformer.py | 2 +- .../dy2static}/typehint_transformer.py | 5 +---- 18 files changed, 38 insertions(+), 54 deletions(-) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/base_transformer.py (95%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/basic_api_transformer.py (98%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/call_transformer.py (97%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/cast_transformer.py (96%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/create_variable_transformer.py (94%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/decorator_transformer.py (96%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/logical_transformer.py (98%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/print_transformer.py (96%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/tensor_shape_transformer.py (96%) rename python/paddle/{fluid/dygraph/dygraph_to_static => jit/dy2static}/typehint_transformer.py (89%) diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_logical.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_logical.py index 97213982ba..97454a8cef 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_logical.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_logical.py @@ -21,7 +21,8 @@ import numpy as np 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 diff --git a/python/paddle/jit/dy2static/assert_transformer.py b/python/paddle/jit/dy2static/assert_transformer.py index 96b2abca21..3a8a8b01ae 100644 --- a/python/paddle/jit/dy2static/assert_transformer.py +++ b/python/paddle/jit/dy2static/assert_transformer.py @@ -18,7 +18,7 @@ from paddle.fluid.dygraph.dygraph_to_static.static_analysis import ( 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, ) diff --git a/python/paddle/jit/dy2static/ast_transformer.py b/python/paddle/jit/dy2static/ast_transformer.py index f99c85c94a..b23a6dc368 100644 --- a/python/paddle/jit/dy2static/ast_transformer.py +++ b/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 .early_return_transformer import ( 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, ) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/base_transformer.py b/python/paddle/jit/dy2static/base_transformer.py similarity index 95% rename from python/paddle/fluid/dygraph/dygraph_to_static/base_transformer.py rename to python/paddle/jit/dy2static/base_transformer.py index 5f082acca5..518805250d 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/base_transformer.py +++ b/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, ) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/basic_api_transformer.py b/python/paddle/jit/dy2static/basic_api_transformer.py similarity index 98% rename from python/paddle/fluid/dygraph/dygraph_to_static/basic_api_transformer.py rename to python/paddle/jit/dy2static/basic_api_transformer.py index d6c32a1fc2..8a80fc4e6e 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/basic_api_transformer.py +++ b/python/paddle/jit/dy2static/basic_api_transformer.py @@ -19,7 +19,7 @@ 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, ) from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code diff --git a/python/paddle/jit/dy2static/break_continue_transformer.py b/python/paddle/jit/dy2static/break_continue_transformer.py index 7ee451b736..23576fdf98 100644 --- a/python/paddle/jit/dy2static/break_continue_transformer.py +++ b/python/paddle/jit/dy2static/break_continue_transformer.py @@ -20,10 +20,10 @@ from paddle.fluid.dygraph.dygraph_to_static.utils import BaseNodeVisitor 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, ) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/call_transformer.py b/python/paddle/jit/dy2static/call_transformer.py similarity index 97% rename from python/paddle/fluid/dygraph/dygraph_to_static/call_transformer.py rename to python/paddle/jit/dy2static/call_transformer.py index 043102b0f6..7380934d47 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/call_transformer.py +++ b/python/paddle/jit/dy2static/call_transformer.py @@ -19,7 +19,7 @@ from paddle.fluid.dygraph.dygraph_to_static.static_analysis import ( ) 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, ) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/cast_transformer.py b/python/paddle/jit/dy2static/cast_transformer.py similarity index 96% rename from python/paddle/fluid/dygraph/dygraph_to_static/cast_transformer.py rename to python/paddle/jit/dy2static/cast_transformer.py index 7a5821e12f..ca1bf11c43 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/cast_transformer.py +++ b/python/paddle/jit/dy2static/cast_transformer.py @@ -18,7 +18,7 @@ from paddle.fluid.dygraph.dygraph_to_static.static_analysis import ( 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, ) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/create_variable_transformer.py b/python/paddle/jit/dy2static/create_variable_transformer.py similarity index 94% rename from python/paddle/fluid/dygraph/dygraph_to_static/create_variable_transformer.py rename to python/paddle/jit/dy2static/create_variable_transformer.py index 3432765191..feccbfe594 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/create_variable_transformer.py +++ b/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.utils import ( 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, ) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/decorator_transformer.py b/python/paddle/jit/dy2static/decorator_transformer.py similarity index 96% rename from python/paddle/fluid/dygraph/dygraph_to_static/decorator_transformer.py rename to python/paddle/jit/dy2static/decorator_transformer.py index 55ca1f9d9a..f802db72de 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/decorator_transformer.py +++ b/python/paddle/jit/dy2static/decorator_transformer.py @@ -17,19 +17,17 @@ from paddle.utils import gast 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', diff --git a/python/paddle/jit/dy2static/early_return_transformer.py b/python/paddle/jit/dy2static/early_return_transformer.py index 864ca52155..53bb2394e8 100644 --- a/python/paddle/jit/dy2static/early_return_transformer.py +++ b/python/paddle/jit/dy2static/early_return_transformer.py @@ -16,7 +16,7 @@ from paddle.utils import gast 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, ) diff --git a/python/paddle/jit/dy2static/ifelse_transformer.py b/python/paddle/jit/dy2static/ifelse_transformer.py index 86d4f4d405..8bae82c11a 100644 --- a/python/paddle/jit/dy2static/ifelse_transformer.py +++ b/python/paddle/jit/dy2static/ifelse_transformer.py @@ -39,7 +39,7 @@ from paddle.fluid.dygraph.dygraph_to_static.utils import ( 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 ( diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/logical_transformer.py b/python/paddle/jit/dy2static/logical_transformer.py similarity index 98% rename from python/paddle/fluid/dygraph/dygraph_to_static/logical_transformer.py rename to python/paddle/jit/dy2static/logical_transformer.py index 3ad623a8ff..1ab4491d8d 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/logical_transformer.py +++ b/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, ) diff --git a/python/paddle/jit/dy2static/loop_transformer.py b/python/paddle/jit/dy2static/loop_transformer.py index 3d109398c8..7d42638b9e 100644 --- a/python/paddle/jit/dy2static/loop_transformer.py +++ b/python/paddle/jit/dy2static/loop_transformer.py @@ -35,15 +35,12 @@ from paddle.fluid.dygraph.dygraph_to_static.utils import ( 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, diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/print_transformer.py b/python/paddle/jit/dy2static/print_transformer.py similarity index 96% rename from python/paddle/fluid/dygraph/dygraph_to_static/print_transformer.py rename to python/paddle/jit/dy2static/print_transformer.py index fdbd585a71..cd4f13f019 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/print_transformer.py +++ b/python/paddle/jit/dy2static/print_transformer.py @@ -18,7 +18,7 @@ from paddle.fluid.dygraph.dygraph_to_static.static_analysis import ( AstNodeWrapper, StaticAnalysisVisitor, ) -from paddle.fluid.dygraph.dygraph_to_static.base_transformer import ( +from .base_transformer import ( BaseTransformer, ) diff --git a/python/paddle/jit/dy2static/return_transformer.py b/python/paddle/jit/dy2static/return_transformer.py index cb18dfd33a..c8114e078d 100644 --- a/python/paddle/jit/dy2static/return_transformer.py +++ b/python/paddle/jit/dy2static/return_transformer.py @@ -20,7 +20,7 @@ from .break_continue_transformer import ( 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 diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/tensor_shape_transformer.py b/python/paddle/jit/dy2static/tensor_shape_transformer.py similarity index 96% rename from python/paddle/fluid/dygraph/dygraph_to_static/tensor_shape_transformer.py rename to python/paddle/jit/dy2static/tensor_shape_transformer.py index e7a882b28a..9dae08b123 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/tensor_shape_transformer.py +++ b/python/paddle/jit/dy2static/tensor_shape_transformer.py @@ -18,7 +18,7 @@ from paddle.fluid.dygraph.dygraph_to_static.utils import ast_to_source_code 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, ) diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/typehint_transformer.py b/python/paddle/jit/dy2static/typehint_transformer.py similarity index 89% rename from python/paddle/fluid/dygraph/dygraph_to_static/typehint_transformer.py rename to python/paddle/jit/dy2static/typehint_transformer.py index 3fddc0bcf5..dd272f7647 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/typehint_transformer.py +++ b/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, ) -- GitLab