fix

Author: HydrogenSulfate

python/paddle/tensor/creation.py

@@ -26,7 +26,10 @@
 import paddle
 from paddle import _C_ops
 from paddle.utils import deprecated
-from paddle.utils.decorator_utils import ParamAliasDecorator, view_decorator
+from paddle.utils.decorator_utils import (
+    ParamAliasDecorator,
+    size_args_decorator,
+)
 from paddle.utils.inplace_utils import inplace_apis_in_dygraph_only
 
 from ..base.data_feeder import (
@@ -1278,7 +1281,7 @@ def fill_constant(
         return out
 
 
-@view_decorator()
+@size_args_decorator
 def ones(
     shape: ShapeLike,
     dtype: DTypeLike | None = None,
@@ -1405,7 +1408,7 @@ def ones_like(
     )
 
 
-@view_decorator()
+@size_args_decorator
 def zeros(
     shape: ShapeLike,
     dtype: DTypeLike | None = None,
@@ -2825,7 +2828,7 @@ def diag(
         return out
 
 
-@view_decorator()
+@size_args_decorator
 def empty(
     shape: ShapeLike,
     dtype: DTypeLike | None = None,

python/paddle/utils/decorator_utils.py

@@ -246,6 +246,35 @@ def process(
         return args, kwargs
 
 
+def size_args_decorator(func: Callable) -> Callable:
+    """
+    A decorator that normalizes the 'size' argument to 'shape'.
+
+    Usage Example:
+
+    paddle.ones(1, dtype=paddle.float32)
+    paddle.ones(1, 2, 3, dtype=paddle.float32)
+    paddle.ones([1, 2, 3], dtype=paddle.float32)
+    paddle.ones(size=[1, 2, 3], dtype=paddle.float32)
+    paddle.ones([1, 2, 3], paddle.float32)
+    paddle.ones(shape=[1, 2, 3], dtype=paddle.float32)
+    """
+
+    @functools.wraps(func)
+    def wrapper(*args: Any, **kwargs: Any) -> Any:
+        # 如果 kwargs 中有 'size'，改成 'shape'
+        if 'size' in kwargs:
+            kwargs['shape'] = kwargs.pop('size')
+        # 如果第一个位置参数是整数，则把所有位置参数组成 shape
+        elif len(args) >= 1 and all(isinstance(a, int) for a in args):
+            kwargs['shape'] = list(args)
+            args = ()
+
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 class VariableArgsDecorator(DecoratorBase):
     def __init__(self, var: str) -> None:
         super().__init__()

test/legacy_test/test_creation.py

@@ -53,11 +53,31 @@ def test_ones(self):
                 self.assertEqual(x.stop_gradient, not requires_grad)
                 if isinstance(dtype, paddle.dtype):
                     self.assertEqual(x.dtype, dtype)
+
+                def wrapped_ones(
+                    shape,
+                    dtype=None,
+                    name=None,
+                    *,
+                    out=None,
+                    device=None,
+                    requires_grad=False,
+                ):
+                    return paddle.ones(
+                        shape,
+                        dtype,
+                        name,
+                        out=out,
+                        device=device,
+                        requires_grad=requires_grad,
+                    )
+
                 st_f = paddle.jit.to_static(
-                    paddle.ones, full_graph=True, backend=None
+                    wrapped_ones, full_graph=True, backend=None
                 )
                 x = st_f(
                     [2],
+                    out=None,
                     dtype=dtype,
                     requires_grad=requires_grad,
                     device=device,
@@ -84,11 +104,31 @@ def test_zeros(self):
                 self.assertEqual(x.stop_gradient, not requires_grad)
                 if isinstance(dtype, paddle.dtype):
                     self.assertEqual(x.dtype, dtype)
+
+                def wrapped_zeros(
+                    shape,
+                    dtype=None,
+                    name=None,
+                    *,
+                    out=None,
+                    device=None,
+                    requires_grad=False,
+                ):
+                    return paddle.zeros(
+                        shape,
+                        dtype,
+                        name,
+                        out=out,
+                        device=device,
+                        requires_grad=requires_grad,
+                    )
+
                 st_f = paddle.jit.to_static(
-                    paddle.zeros, full_graph=True, backend=None
+                    wrapped_zeros, full_graph=True, backend=None
                 )
                 x = st_f(
                     [2],
+                    out=None,
                     dtype=dtype,
                     requires_grad=requires_grad,
                     device=device,
@@ -148,11 +188,31 @@ def test_empty(self):
                 self.assertEqual(x.stop_gradient, not requires_grad)
                 if isinstance(dtype, paddle.dtype):
                     self.assertEqual(x.dtype, dtype)
+
+                def wrapped_empty(
+                    shape,
+                    dtype=None,
+                    name=None,
+                    *,
+                    out=None,
+                    device=None,
+                    requires_grad=False,
+                ):
+                    return paddle.empty(
+                        shape,
+                        dtype,
+                        name,
+                        out=out,
+                        device=device,
+                        requires_grad=requires_grad,
+                    )
+
                 st_f = paddle.jit.to_static(
-                    paddle.empty, full_graph=True, backend=None
+                    wrapped_empty, full_graph=True, backend=None
                 )
                 x = st_f(
                     [2],
+                    out=None,
                     dtype=dtype,
                     requires_grad=requires_grad,
                     device=device,