From c04e2e85c522f14f388fdafd211a556dbbb5e865 Mon Sep 17 00:00:00 2001 From: zhhsplendid Date: Mon, 21 Sep 2020 09:18:44 +0000 Subject: [PATCH] Add import, test=develop --- .../dygraph_to_static/variable_trans_func.py | 4 +-- python/paddle/jit/__init__.py | 4 +++ .../paddle/jit/dygraph_to_static/__init__.py | 23 ++++++++++++++++ .../dygraph_to_static/convert_operators.py | 25 ++++++++++++++++++ .../dygraph_to_static/variable_trans_func.py | 26 +++++++++++++++++++ python/setup.py.in | 1 + 6 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 python/paddle/jit/dygraph_to_static/__init__.py create mode 100644 python/paddle/jit/dygraph_to_static/convert_operators.py create mode 100644 python/paddle/jit/dygraph_to_static/variable_trans_func.py diff --git a/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py b/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py index bc2851b630c..a7d7d55d7a0 100644 --- a/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py +++ b/python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py @@ -22,8 +22,8 @@ from paddle.fluid.layers import fill_constant from paddle.fluid.layer_helper import LayerHelper __all__ = [ - 'to_static_variable_gast_node', 'create_static_variable_gast_node', - 'data_layer_not_check' + 'create_fill_constant_node', 'create_static_variable_gast_node', + 'data_layer_not_check', 'to_static_variable', 'to_static_variable_gast_node' ] diff --git a/python/paddle/jit/__init__.py b/python/paddle/jit/__init__.py index d04a65ad6ea..1d189dedd22 100644 --- a/python/paddle/jit/__init__.py +++ b/python/paddle/jit/__init__.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import print_function + from ..fluid.dygraph.jit import save #DEFINE_ALIAS from ..fluid.dygraph.jit import load #DEFINE_ALIAS from ..fluid.dygraph.jit import TracedLayer #DEFINE_ALIAS @@ -21,6 +23,8 @@ from ..fluid.dygraph.jit import declarative as to_static #DEFINE_ALIAS from ..fluid.dygraph import ProgramTranslator #DEFINE_ALIAS from ..fluid.dygraph.io import TranslatedLayer #DEFINE_ALIAS +from . import dygraph_to_static + __all__ = [ 'save', 'load', 'TracedLayer', 'to_static', 'ProgramTranslator', 'TranslatedLayer', 'set_code_level', 'set_verbosity' diff --git a/python/paddle/jit/dygraph_to_static/__init__.py b/python/paddle/jit/dygraph_to_static/__init__.py new file mode 100644 index 00000000000..b993507c837 --- /dev/null +++ b/python/paddle/jit/dygraph_to_static/__init__.py @@ -0,0 +1,23 @@ +# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import print_function + +from . import convert_operators + +from . import variable_trans_func +from .variable_trans_func import * + +__all__ = [] +__all__ += variable_trans_func.__all__ diff --git a/python/paddle/jit/dygraph_to_static/convert_operators.py b/python/paddle/jit/dygraph_to_static/convert_operators.py new file mode 100644 index 00000000000..2b6f67212e5 --- /dev/null +++ b/python/paddle/jit/dygraph_to_static/convert_operators.py @@ -0,0 +1,25 @@ +# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +from __future__ import print_function + +from ...fluid.dygraph.dygraph_to_static.convert_operators import cast_bool_if_necessary #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_assert #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_len #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_logical_and #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_logical_not #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_logical_or #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_print #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_var_dtype #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_var_shape #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.convert_operators import convert_while_loop #DEFINE_ALIAS diff --git a/python/paddle/jit/dygraph_to_static/variable_trans_func.py b/python/paddle/jit/dygraph_to_static/variable_trans_func.py new file mode 100644 index 00000000000..08c057934a5 --- /dev/null +++ b/python/paddle/jit/dygraph_to_static/variable_trans_func.py @@ -0,0 +1,26 @@ +# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import print_function + +from ...fluid.dygraph.dygraph_to_static.variable_trans_func import create_fill_constant_node #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.variable_trans_func import create_static_variable_gast_node #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.variable_trans_func import data_layer_not_check #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.variable_trans_func import to_static_variable #DEFINE_ALIAS +from ...fluid.dygraph.dygraph_to_static.variable_trans_func import to_static_variable_gast_node #DEFINE_ALIAS + +__all__ = [ + 'create_fill_constant_node', 'create_static_variable_gast_node', + 'data_layer_not_check', 'to_static_variable', 'to_static_variable_gast_node' +] diff --git a/python/setup.py.in b/python/setup.py.in index 77316640034..117c24bd2d7 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -155,6 +155,7 @@ packages=['paddle', 'paddle.distributed.fleet.utils', 'paddle.framework', 'paddle.jit', + 'paddle.jit.dygraph_to_static', 'paddle.fluid', 'paddle.fluid.inference', 'paddle.fluid.dygraph', -- GitLab