keep fill_constant consistency between static and dynamic mode (#67587)

deepllz · web-flow · commit d62e4fccba9f · 2024-08-26T14:24:50.000+08:00
* fix fill_constant bug in static mode

* fix test

* fix test
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
@@ -1042,6 +1042,7 @@ def fill_constant(
     out: paddle.Tensor | None = None,
     name: str | None = None,
 ) -> paddle.Tensor:
+    shape = [shape] if isinstance(shape, int) else shape
     if in_dynamic_or_pir_mode():
         place = _current_expected_place()
         if force_cpu:
diff --git a/test/legacy_test/test_fill_constant_op.py b/test/legacy_test/test_fill_constant_op.py
@@ -479,12 +479,6 @@ def test_errors2(self):
                 out=x2,
             )
 
-            # The argument shape's type of fill_constant_op must be list, tuple or Variable.
-            def test_shape_type():
-                paddle.tensor.fill_constant(shape=1, dtype="float32", value=1)
-
-            self.assertRaises(TypeError, test_shape_type)
-
             # The shape dtype of fill_constant_op must be int32 or int64.
             def test_shape_tensor_dtype():
                 shape = paddle.static.data(
diff --git a/test/legacy_test/test_full_op.py b/test/legacy_test/test_full_op.py
@@ -66,15 +66,25 @@ def test_api(self):
             out_7 = paddle.full(
                 shape=shape_tensor_int64, dtype=np.float32, fill_value=val
             )
+            out_8 = paddle.full(shape=10, dtype=np.float32, fill_value=val)
 
             exe = base.Executor(place=base.CPUPlace())
-            res_1, res_2, res_3, res_4, res_5, res_6, res_7 = exe.run(
+            res_1, res_2, res_3, res_4, res_5, res_6, res_7, res_8 = exe.run(
                 paddle.static.default_main_program(),
                 feed={
                     "shape_tensor_int32": np.array([1, 2]).astype("int32"),
                     "shape_tensor_int64": np.array([1, 2]).astype("int64"),
                 },
-                fetch_list=[out_1, out_2, out_3, out_4, out_5, out_6, out_7],
+                fetch_list=[
+                    out_1,
+                    out_2,
+                    out_3,
+                    out_4,
+                    out_5,
+                    out_6,
+                    out_7,
+                    out_8,
+                ],
             )
 
         np.testing.assert_array_equal(
@@ -98,6 +108,9 @@ def test_api(self):
         np.testing.assert_array_equal(
             res_7, np.full([1, 2], 1.1, dtype="float32")
         )
+        np.testing.assert_array_equal(
+            res_8, np.full([10], 1.1, dtype="float32")
+        )
         paddle.disable_static()
 
     def test_api_eager(self):
@@ -152,6 +165,8 @@ def test_api_eager(self):
                 out_7, dtype=np.float32, fill_value=np.abs(1.1)
             )
 
+            out_11 = paddle.full(shape=10, dtype="float32", fill_value=1.1)
+
             np.testing.assert_array_equal(
                 out_1, np.full([1, 2], 1.1, dtype="float32")
             )
@@ -182,6 +197,9 @@ def test_api_eager(self):
             np.testing.assert_array_equal(
                 out_10, np.full([1, 2], 1.1, dtype="float32")
             )
+            np.testing.assert_array_equal(
+                out_11, np.full([10], 1.1, dtype="float32")
+            )
 
 
 class TestFullOpError(unittest.TestCase):
@@ -192,19 +210,12 @@ def test_errors(self):
             paddle.static.Program(), paddle.static.Program()
         ):
             # for ci coverage
+            # The argument dtype of full must be one of bool, float16,
+            # float32, float64, uint8, int16, int32 or int64
             self.assertRaises(
                 TypeError, paddle.full, shape=[1], fill_value=5, dtype='uint4'
             )
 
-            # The argument dtype of full must be one of bool, float16,
-            # float32, float64, uint8, int16, int32 or int64
-
-            # The argument shape's type of full_op  must be list, tuple or Variable.
-            def test_shape_type():
-                paddle.full(shape=1, dtype="float32", fill_value=1)
-
-            self.assertRaises(TypeError, test_shape_type)
-
             # The shape dtype of full op must be int32 or int64.
             def test_shape_tensor_dtype():
                 shape = paddle.static.data(
diff --git a/test/legacy_test/test_ones_op.py b/test/legacy_test/test_ones_op.py
@@ -45,36 +45,14 @@ def test_paddle_ones(self):
             expected_result = np.ones(10, dtype="int64")
         self.assertEqual((result == expected_result).all(), True)
 
-    def test_base_ones(self):
         with paddle.static.program_guard(paddle.static.Program()):
-            ones = paddle.ones(shape=[10], dtype="int64")
+            ones = paddle.ones(shape=10, dtype="int64")
             place = paddle.CPUPlace()
             exe = paddle.static.Executor(place)
             (result,) = exe.run(fetch_list=[ones])
             expected_result = np.ones(10, dtype="int64")
         self.assertEqual((result == expected_result).all(), True)
 
 
-class ApiOnesZerosError(unittest.TestCase):
-    def test_errors(self):
-        def test_error1():
-            with paddle.static.program_guard(paddle.static.Program()):
-                ones = paddle.ones(shape=10, dtype="int64")
-
-        self.assertRaises(TypeError, test_error1)
-
-        def test_error2():
-            with paddle.static.program_guard(paddle.static.Program()):
-                ones = paddle.ones(shape=10)
-
-        self.assertRaises(TypeError, test_error2)
-
-        def test_error3():
-            with paddle.static.program_guard(paddle.static.Program()):
-                ones = paddle.ones(shape=10, dtype="int64")
-
-        self.assertRaises(TypeError, test_error3)
-
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/test/legacy_test/test_zeros_op.py b/test/legacy_test/test_zeros_op.py
@@ -51,25 +51,16 @@ def test_out(self):
             exe = paddle.static.Executor(place)
             result = exe.run(fetch_list=[out])
             self.assertEqual((result == out_np).all(), True)
-
-    def test_base_out(self):
         with program_guard(Program()):
-            zeros = paddle.zeros(shape=[10], dtype='int64')
+            out_np = np.zeros(shape=10, dtype='int32')
+            out = paddle.zeros(shape=10, dtype='int32')
             place = paddle.CPUPlace()
             exe = paddle.static.Executor(place)
-            (result,) = exe.run(fetch_list=[zeros])
-            expected_result = np.zeros(10, dtype='int64')
-        self.assertEqual((result == expected_result).all(), True)
+            result = exe.run(fetch_list=[out])
+            self.assertEqual((result == out_np).all(), True)
 
 
 class ApiZerosError(unittest.TestCase):
-    def test_errors(self):
-        def test_error1():
-            with paddle.static.program_guard(base.Program()):
-                ones = paddle.zeros(shape=10, dtype='int64')
-
-        self.assertRaises(TypeError, test_error1)
-
     def test_shape_errors(self):
         with base.dygraph.guard():
             try:
