[API 2.0] Fix api 'is_empty' (#27593)

* fix is_empty api and code example; test=develop

python/paddle/fluid/layers/control_flow.py

@@ -3788,45 +3788,46 @@ def reorder_lod_tensor_by_rank(x, rank_table):
     return out
 
 
-def is_empty(x, cond=None):
+def is_empty(x, name=None):
     """
-    :alias_main: paddle.is_empty
-	:alias: paddle.is_empty,paddle.tensor.is_empty,paddle.tensor.logic.is_empty
-	:old_api: paddle.fluid.layers.is_empty
 
-    Test whether a Variable is empty.
+    Test whether a Tensor is empty.
 
     Args:
-        x (Variable): The Variable to be tested.
-        cond (Variable, optional): Output parameter. Default: None. If this parameter is given, it
-                              saves the test result of given 'x'.
+        x (Tensor): The Tensor to be tested.
+        name (str, optional): The default value is ``None`` . Normally users
+                            don't have to set this parameter. For more information,
+                            please refer to :ref:`api_guide_Name` .
 
     Returns:
-        Variable: A bool scalar. True if 'x' is an empty Variable.
-
-    Raises:
-        TypeError: If input cond is not a variable, or cond's dtype is
-                   not bool.
+        Tensor: A bool scalar Tensor. True if 'x' is an empty Tensor.
 
     Examples:
         .. code-block:: python
 
-          import paddle.fluid as fluid
-          input = fluid.layers.data(name="input", shape=[4, 32, 32], dtype="float32")
-          res = fluid.layers.is_empty(x=input)
-          # or:
-          # fluid.layers.is_empty(x=input, cond=res)
+            import paddle
+
+            input = paddle.rand(shape=[4, 32, 32], dtype='float32')
+            res = paddle.is_empty(x=input)
+            print("res:", res)
+            # ('res:', Tensor: eager_tmp_1
+            #    - place: CPUPlace
+            #    - shape: [1]
+            #    - layout: NCHW
+            #    - dtype: bool
+            #    - data: [0])
 
     """
+    if in_dygraph_mode():
+        return core.ops.is_empty(x)
+
     check_variable_and_dtype(x, 'x', ['float32', 'float64', 'int32', 'int64'],
                              'is_empty')
-    check_type(cond, 'cond', (Variable, type(None)), 'is_empty')
+    check_type(name, "name", (str, type(None)), "is_empty")
+
     helper = LayerHelper("is_empty", **locals())
-    if cond is None:
     cond = helper.create_variable_for_type_inference(dtype='bool')
     cond.stop_gradient = True
-    else:
-        check_dtype(cond.dtype, 'cond', ['bool'], 'is_empty')
     helper.append_op(
         type='is_empty', inputs={'X': [x]}, outputs={'Out': [cond]})
     return cond

python/paddle/fluid/tests/unittests/test_is_empty_op.py

@@ -17,7 +17,7 @@ from __future__ import print_function
 import unittest
 import numpy as np
 from op_test import OpTest
-import paddle.fluid as fluid
+import paddle
 
 
 class TestEmpty(OpTest):
@@ -39,39 +39,39 @@ class TestNotEmpty(TestEmpty):
 
 class TestIsEmptyOpError(unittest.TestCase):
     def test_errors(self):
-        with fluid.program_guard(fluid.Program(), fluid.Program()):
+        paddle.enable_static()
+        with paddle.static.program_guard(paddle.static.Program(),
+                                         paddle.static.Program()):
             input_data = np.random.random((3, 2)).astype("float64")
 
             def test_Variable():
                 # the input type must be Variable
-                fluid.layers.is_empty(x=input_data)
+                paddle.is_empty(x=input_data)
 
             self.assertRaises(TypeError, test_Variable)
 
-            def test_cond_Variable():
-                # cond type must be Variable or None
-                x2 = fluid.layers.data(name="x2", shape=[3, 2], dtype="float32")
-                cond_data = np.random.random((3, 2)).astype("float32")
-                fluid.layers.is_empty(x=x2, cond=cond_data)
-
-            self.assertRaises(TypeError, test_cond_Variable)
-
             def test_type():
                 # dtype must be float32, float64, int32, int64
-                x3 = fluid.layers.data(
+                x3 = paddle.static.data(
                     name="x3", shape=[4, 32, 32], dtype="bool")
-                res = fluid.layers.is_empty(x=x3)
+                res = paddle.is_empty(x=x3)
 
             self.assertRaises(TypeError, test_type)
 
-            def test_cond_type():
-                # cond dtype must be bool.
-                x4 = fluid.layers.data(name="x4", shape=[3, 2], dtype="float32")
-                cond = fluid.layers.data(
-                    name="cond", shape=[1], dtype="float32")
-                fluid.layers.is_empty(x=x4, cond=cond)
+            def test_name_type():
+                # name type must be string.
+                x4 = paddle.static.data(
+                    name="x4", shape=[3, 2], dtype="float32")
+                res = paddle.is_empty(x=x4, name=1)
+
+            self.assertRaises(TypeError, test_name_type)
+
 
-            self.assertRaises(TypeError, test_cond_type)
+class TestIsEmptyOpDygraph(unittest.TestCase):
+    def test_dygraph(self):
+        paddle.disable_static()
+        input = paddle.rand(shape=[4, 32, 32], dtype='float32')
+        res = paddle.is_empty(x=input)
 
 
 if __name__ == "__main__":