[Dy2Stat]Remove fluid.layers in transformer code and return_out_vars in convert_ifelse (#43372)

* [Dy2Stat]Remove fluid.layers in transformer code

* remove useless return_name_vars

* fix unittest

* fix unittest

* fix unittest

python/paddle/fluid/dygraph/dygraph_to_static/convert_operators.py

@@ -188,7 +188,7 @@ def _run_py_logical_not(x):
     return not x
 
 
-def convert_ifelse(pred, true_fn, false_fn, true_args, false_args, return_vars):
+def convert_ifelse(pred, true_fn, false_fn, true_args, false_args):
     """
     A function representation of a Python ``if/else`` statement.
 
@@ -198,15 +198,13 @@ def convert_ifelse(pred, true_fn, false_fn, true_args, false_args, return_vars):
         false_fn(callable): A callable to be performed if ``pred`` is false.
         true_args(tuple): Parameters of ``true_fn``.
         false_args(tuple): Parameters of ``false_fn``.
-        return_vars(tuple): Return variables of ``true_fn`` and ``false_fn``.
 
     Returns:
         ``true_fn(true_args)`` if the predicate ``pred`` is true else ``false_fn(false_args)`` .
 
     """
     if isinstance(pred, Variable):
-        out = _run_paddle_cond(pred, true_fn, false_fn, true_args, false_args,
-                               return_vars)
+        out = _run_paddle_cond(pred, true_fn, false_fn, true_args, false_args)
     else:
         out = _run_py_ifelse(pred, true_fn, false_fn, true_args, false_args)
 
@@ -246,8 +244,7 @@ def _remove_no_value_return_var(out):
         return out
 
 
-def _run_paddle_cond(pred, true_fn, false_fn, true_args, false_args,
-                     return_vars):
+def _run_paddle_cond(pred, true_fn, false_fn, true_args, false_args):
     pred = cast_bool_if_necessary(pred)
     return control_flow.cond(pred, lambda: true_fn(*true_args),
                              lambda: false_fn(*false_args))

python/paddle/fluid/dygraph/dygraph_to_static/ifelse_transformer.py

@@ -507,7 +507,7 @@ def create_convert_ifelse_node(return_name_ids,
                                is_if_expr=False):
     """
     Create `paddle.jit.dy2static.convert_ifelse(
-            pred, true_fn, false_fn, true_args, false_args, return_vars)`
+            pred, true_fn, false_fn, true_args, false_args)`
     to replace original `python if/else` statement.
     """
 
@@ -535,17 +535,14 @@ def create_convert_ifelse_node(return_name_ids,
         true_func_source = true_func.name
         false_func_source = false_func.name
 
-    return_vars = create_name_nodes(return_name_ids)
-
     convert_ifelse_layer = gast.parse(
         '_jst.convert_ifelse('
-        '{pred}, {true_fn}, {false_fn}, {true_args}, {false_args}, {return_vars})'
-        .format(pred=ast_to_source_code(pred),
-                true_fn=true_func_source,
-                false_fn=false_func_source,
-                true_args=ast_to_source_code(true_args),
-                false_args=ast_to_source_code(false_args),
-                return_vars=ast_to_source_code(return_vars))).body[0].value
+        '{pred}, {true_fn}, {false_fn}, {true_args}, {false_args})'.format(
+            pred=ast_to_source_code(pred),
+            true_fn=true_func_source,
+            false_fn=false_func_source,
+            true_args=ast_to_source_code(true_args),
+            false_args=ast_to_source_code(false_args))).body[0].value
 
     if return_name_ids:
         _, cond_node = create_assign_node(return_name_ids, convert_ifelse_layer)

python/paddle/fluid/dygraph/dygraph_to_static/utils.py

@@ -349,14 +349,14 @@ def create_api_shape_node(tensor_shape_node):
 
     if isinstance(tensor_shape_node, gast.Name):
         api_shape_node = gast.Call(
-            func=gast.parse('fluid.layers.shape').body[0].value,
+            func=gast.parse('paddle.shape').body[0].value,
             args=[tensor_shape_node],
             keywords=[])
         return api_shape_node
 
     if isinstance(tensor_shape_node, gast.Attribute):
         api_shape_node = gast.Call(
-            func=gast.parse('fluid.layers.shape').body[0].value,
+            func=gast.parse('paddle.shape').body[0].value,
             args=[tensor_shape_node.value],
             keywords=[])
         return api_shape_node
@@ -368,8 +368,8 @@ def create_api_shape_node(tensor_shape_node):
 
 
 def get_constant_variable_node(name, value, shape=[1], dtype='int64'):
-    return gast.parse('%s = fluid.layers.fill_constant(%s, "%s", %s)' %
-                      (name, str(shape), dtype, str(value)))
+    return gast.parse('%s = paddle.full(%s, "%s", %s)' %
+                      (name, str(shape), str(value), dtype))
 
 
 def get_attribute_full_name(node):

python/paddle/fluid/dygraph/dygraph_to_static/variable_trans_func.py

@@ -15,12 +15,11 @@
 from __future__ import print_function
 
 import six
+import paddle
 from paddle.utils import gast
-
 from paddle.fluid import core
 from paddle.fluid import unique_name
 from paddle.fluid.framework import Variable
-from paddle.fluid.layers import fill_constant
 from paddle.fluid.layer_helper import LayerHelper
 
 __all__ = [
@@ -87,17 +86,19 @@ def create_static_variable_gast_node(name):
 
 
 def create_fill_constant_node(name, value):
-    func_code = "{} = paddle.fluid.layers.fill_constant(shape=[1], ".format(
-        name)
+    func_code = "{} = paddle.full(shape=[1], ".format(name)
     if isinstance(value, bool):
-        func_code += "dtype='bool', value={}, name='{}')".format(value, name)
+        func_code += "dtype='bool', fill_value={}, name='{}')".format(
+            value, name)
         return gast.parse(func_code).body[0]
     if isinstance(value, float):
-        func_code += "dtype='float64', value={}, name='{}')".format(value, name)
+        func_code += "dtype='float64', fill_value={}, name='{}')".format(
+            value, name)
         return gast.parse(func_code).body[0]
 
     if isinstance(value, int):
-        func_code += "dtype='int64', value={}, name='{}')".format(value, name)
+        func_code += "dtype='int64', fill_value={}, name='{}')".format(
+            value, name)
         return gast.parse(func_code).body[0]
 
 
@@ -106,12 +107,12 @@ def to_static_variable(x):
     Translate a Python Tensor to PaddlePaddle static graph Tensor
     '''
     if isinstance(x, bool):
-        return fill_constant(shape=[1], dtype='bool', value=x)
+        return paddle.full(shape=[1], dtype='bool', fill_value=x)
     if isinstance(x, float):
-        return fill_constant(shape=[1], dtype='float64', value=x)
+        return paddle.full(shape=[1], dtype='float64', fill_value=x)
 
     if isinstance(x, six.integer_types):
-        return fill_constant(shape=[1], dtype='int64', value=x)
+        return paddle.full(shape=[1], dtype='int64', fill_value=x)
 
     return x
 
@@ -121,6 +122,6 @@ def create_bool_as_type(x, value=True):
     Create a bool variable, which type is the same as x.
     '''
     if isinstance(x, Variable):
-        return fill_constant(shape=[1], value=value, dtype="bool")
+        return paddle.full(shape=[1], fill_value=value, dtype="bool")
     else:
         return value

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

@@ -66,8 +66,10 @@ def get_source_code(func):
 class StaticCode1():
 
     def dyfunc_with_if_else(x_v, label=None):
-        __return_value_init_0 = paddle.fluid.layers.fill_constant(
-            shape=[1], dtype='float64', value=0.0, name='__return_value_init_0')
+        __return_value_init_0 = paddle.full(shape=[1],
+                                            dtype='float64',
+                                            fill_value=0.0,
+                                            name='__return_value_init_0')
         __return_value_0 = __return_value_init_0
 
         def true_fn_0(x_v):
@@ -80,7 +82,7 @@ class StaticCode1():
 
         x_v = _jst.convert_ifelse(
             fluid.layers.mean(x_v)[0] > 5, true_fn_0, false_fn_0, (x_v, ),
-            (x_v, ), (x_v, ))
+            (x_v, ))
         __return_0 = _jst.create_bool_as_type(label is not None, False)
 
         def true_fn_1(__return_0, __return_value_0, label, x_v):
@@ -95,7 +97,7 @@ class StaticCode1():
         __return_0, __return_value_0 = _jst.convert_ifelse(
             label is not None, true_fn_1, false_fn_1,
             (__return_0, __return_value_0, label, x_v),
-            (__return_0, __return_value_0), (__return_0, __return_value_0))
+            (__return_0, __return_value_0))
 
         def true_fn_2(__return_0, __return_value_0, x_v):
             __return_1 = _jst.create_bool_as_type(
@@ -108,16 +110,17 @@ class StaticCode1():
 
         __return_value_0 = _jst.convert_ifelse(
             _jst.convert_logical_not(__return_0), true_fn_2, false_fn_2,
-            (__return_0, __return_value_0, x_v), (__return_value_0, ),
-            (__return_value_0, ))
+            (__return_0, __return_value_0, x_v), (__return_value_0, ))
         return __return_value_0
 
 
 class StaticCode2():
     # TODO: Transform return statement
     def dyfunc_with_if_else(x_v, label=None):
-        __return_value_init_1 = paddle.fluid.layers.fill_constant(
-            shape=[1], dtype='float64', value=0.0, name='__return_value_init_1')
+        __return_value_init_1 = paddle.full(shape=[1],
+                                            dtype='float64',
+                                            fill_value=0.0,
+                                            name='__return_value_init_1')
         __return_value_1 = __return_value_init_1
 
         def true_fn_3(x_v):
@@ -130,7 +133,7 @@ class StaticCode2():
 
         x_v = _jst.convert_ifelse(
             fluid.layers.mean(x_v)[0] > 5, true_fn_3, false_fn_3, (x_v, ),
-            (x_v, ), (x_v, ))
+            (x_v, ))
         __return_2 = _jst.create_bool_as_type(label is not None, False)
 
         def true_fn_4(__return_2, __return_value_1, label, x_v):
@@ -145,7 +148,7 @@ class StaticCode2():
         __return_2, __return_value_1 = _jst.convert_ifelse(
             label is not None, true_fn_4, false_fn_4,
             (__return_2, __return_value_1, label, x_v),
-            (__return_2, __return_value_1), (__return_2, __return_value_1))
+            (__return_2, __return_value_1))
 
         def true_fn_5(__return_2, __return_value_1, x_v):
             __return_3 = _jst.create_bool_as_type(
@@ -158,8 +161,7 @@ class StaticCode2():
 
         __return_value_1 = _jst.convert_ifelse(
             _jst.convert_logical_not(__return_2), true_fn_5, false_fn_5,
-            (__return_2, __return_value_1, x_v), (__return_value_1, ),
-            (__return_value_1, ))
+            (__return_2, __return_value_1, x_v), (__return_value_1, ))
         return __return_value_1
 
 

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

@@ -52,19 +52,19 @@ class TestVariableTransFunc(unittest.TestCase):
 
     def test_create_fill_constant_node(self):
         node = create_fill_constant_node("a", 1.0)
-        source = "a = paddle.fluid.layers.fill_constant(shape=[1], dtype='float64', value=1.0, name='a')"
+        source = "a = paddle.full(shape=[1], dtype='float64', fill_value=1.0, name='a')"
         self.assertEqual(
             ast_to_source_code(node).replace('\n', '').replace(' ', ''),
             source.replace(' ', ''))
 
         node = create_fill_constant_node("b", True)
-        source = "b = paddle.fluid.layers.fill_constant(shape=[1], dtype='bool', value=True, name='b')"
+        source = "b = paddle.full(shape=[1], dtype='bool', fill_value=True, name='b')"
         self.assertEqual(
             ast_to_source_code(node).replace('\n', '').replace(' ', ''),
             source.replace(' ', ''))
 
         node = create_fill_constant_node("c", 4293)
-        source = "c = paddle.fluid.layers.fill_constant(shape=[1], dtype='int64', value=4293, name='c')"
+        source = "c = paddle.full(shape=[1], dtype='int64', fill_value=4293, name='c')"
         self.assertEqual(
             ast_to_source_code(node).replace('\n', '').replace(' ', ''),
             source.replace(' ', ''))