[WIP][API-Compat] Fixed CPU failure

Author: Enigmatisms

python/paddle/tensor/compat.py

@@ -409,10 +409,8 @@ def min(input: Tensor, *args: Any, **kwargs: Any) -> Tensor | MinMaxRetType:
             return MinMaxRetType(values=vals, indices=inds)
         else:
             # CPUPlace and other placements are implemented by composition
-            indices = _C_ops.argmin(
-                input, dim_or_other, True, False, paddle.int64
-            )
-            values = _C_ops.take_along_axis(input, indices, dim_or_other)
+            indices = paddle.argmin(input, axis=dim_or_other, keepdim=True)
+            values = paddle.take_along_axis(input, indices, axis=dim_or_other)
             if keepdim:
                 return MinMaxRetType(values=values, indices=indices)
             return MinMaxRetType(
@@ -524,10 +522,8 @@ def max(input: Tensor, *args: Any, **kwargs: Any) -> Tensor | MinMaxRetType:
             return MinMaxRetType(values=vals, indices=inds)
         else:
             # CPUPlace and other placements are implemented by composition
-            indices = _C_ops.argmax(
-                input, dim_or_other, True, False, paddle.int64
-            )
-            values = _C_ops.take_along_axis(input, indices, dim_or_other)
+            indices = paddle.argmax(input, axis=dim_or_other, keepdim=True)
+            values = paddle.take_along_axis(input, indices, axis=dim_or_other)
             if keepdim:
                 return MinMaxRetType(values=values, indices=indices)
             return MinMaxRetType(

python/paddle/tensor/math.py

@@ -100,6 +100,8 @@
     from paddle import Tensor
     from paddle._typing import DTypeLike
 
+from paddle.utils.decorator_utils import ForbidKeywordsDecorator
+
 __all__ = []
 
 _supported_int_dtype_ = [
@@ -3131,6 +3133,11 @@ def _check_input(x):
         return out
 
 
+@ForbidKeywordsDecorator(
+    illegal_keys=["input", "dim", "other"],
+    func_name="paddle.max",
+    correct_name="paddle.compat.max",
+)
 def max(
     x: Tensor,
     axis: int | Sequence[int] | None = None,
@@ -3290,6 +3297,11 @@ def max(
             return out
 
 
+@ForbidKeywordsDecorator(
+    illegal_keys=["input", "dim", "other"],
+    func_name="paddle.min",
+    correct_name="paddle.compat.min",
+)
 def min(
     x: Tensor,
     axis: int | Sequence[int] | None = None,

test/legacy_test/test_compat_minmax.py

@@ -187,6 +187,14 @@ def test_error_handling(self):
         err_msg1 = (
             "Tensors with integral type: 'paddle.int32' should stop gradient."
         )
+        err_msg2 = (
+            "paddle.min() received unexpected keyword arguments 'input', 'dim'. "
+            "\nDid you mean to use paddle.compat.min() instead?"
+        )
+        err_msg3 = (
+            "paddle.compat.max() received unexpected keyword argument 'axis'. "
+            "\nDid you mean to use paddle.max() instead?"
+        )
 
         # empty tensor
         empty_tensor = paddle.to_tensor([], dtype='float32')
@@ -250,6 +258,16 @@ def test_error_handling(self):
         with self.assertRaises(TypeError) as cm:
             paddle.compat.max(input_ts, dim=0, other=0, keepdim=True)
 
+        # Wrong API used case 1
+        with self.assertRaises(TypeError) as cm:
+            paddle.min(input=input_ts, dim=0)
+        self.assertEqual(str(cm.exception), err_msg2)
+
+        # Wrong API used case 2
+        with self.assertRaises(TypeError) as cm:
+            paddle.compat.max(input_ts, axis=0)
+        self.assertEqual(str(cm.exception), err_msg3)
+
 
 if __name__ == '__main__':
     unittest.main()