diff options
Diffstat (limited to 'numpy/_array_api')
| -rw-r--r-- | numpy/_array_api/_linear_algebra_functions.py | 2 | ||||
| -rw-r--r-- | numpy/_array_api/_searching_functions.py | 6 | ||||
| -rw-r--r-- | numpy/_array_api/_statistical_functions.py | 10 | ||||
| -rw-r--r-- | numpy/_array_api/_utility_functions.py | 4 |
4 files changed, 12 insertions, 10 deletions
diff --git a/numpy/_array_api/_linear_algebra_functions.py b/numpy/_array_api/_linear_algebra_functions.py index addbaeccb..ec67f9c0b 100644 --- a/numpy/_array_api/_linear_algebra_functions.py +++ b/numpy/_array_api/_linear_algebra_functions.py @@ -176,7 +176,7 @@ def trace(x: array, /, *, axis1: int = 0, axis2: int = 1, offset: int = 0) -> ar See its docstring for more information. """ - return np.trace(x, axis1=axis1, axis2=axis2, offset=offset) + return np.asarray(np.trace(x, axis1=axis1, axis2=axis2, offset=offset)) def transpose(x: array, /, *, axes: Optional[Tuple[int, ...]] = None) -> array: """ diff --git a/numpy/_array_api/_searching_functions.py b/numpy/_array_api/_searching_functions.py index 3b37167af..d5128cca9 100644 --- a/numpy/_array_api/_searching_functions.py +++ b/numpy/_array_api/_searching_functions.py @@ -10,7 +10,8 @@ def argmax(x: array, /, *, axis: int = None, keepdims: bool = False) -> array: See its docstring for more information. """ - return np.argmax(x, axis=axis, keepdims=keepdims) + # Note: this currently fails as np.argmax does not implement keepdims + return np.asarray(np.argmax(x, axis=axis, keepdims=keepdims)) def argmin(x: array, /, *, axis: int = None, keepdims: bool = False) -> array: """ @@ -18,7 +19,8 @@ def argmin(x: array, /, *, axis: int = None, keepdims: bool = False) -> array: See its docstring for more information. """ - return np.argmin(x, axis=axis, keepdims=keepdims) + # Note: this currently fails as np.argmin does not implement keepdims + return np.asarray(np.argmin(x, axis=axis, keepdims=keepdims)) def nonzero(x: array, /) -> Tuple[array, ...]: """ diff --git a/numpy/_array_api/_statistical_functions.py b/numpy/_array_api/_statistical_functions.py index 020053896..e62410d01 100644 --- a/numpy/_array_api/_statistical_functions.py +++ b/numpy/_array_api/_statistical_functions.py @@ -8,21 +8,21 @@ def max(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keep return np.max(x, axis=axis, keepdims=keepdims) def mean(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keepdims: bool = False) -> array: - return np.mean(x, axis=axis, keepdims=keepdims) + return np.asarray(np.mean(x, axis=axis, keepdims=keepdims)) def min(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keepdims: bool = False) -> array: return np.min(x, axis=axis, keepdims=keepdims) def prod(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keepdims: bool = False) -> array: - return np.prod(x, axis=axis, keepdims=keepdims) + return np.asarray(np.prod(x, axis=axis, keepdims=keepdims)) def std(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, correction: Union[int, float] = 0.0, keepdims: bool = False) -> array: # Note: the keyword argument correction is different here - return np.std(x, axis=axis, ddof=correction, keepdims=keepdims) + return np.asarray(np.std(x, axis=axis, ddof=correction, keepdims=keepdims)) def sum(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keepdims: bool = False) -> array: - return np.sum(x, axis=axis, keepdims=keepdims) + return np.asarray(np.sum(x, axis=axis, keepdims=keepdims)) def var(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, correction: Union[int, float] = 0.0, keepdims: bool = False) -> array: # Note: the keyword argument correction is different here - return np.var(x, axis=axis, ddof=correction, keepdims=keepdims) + return np.asarray(np.var(x, axis=axis, ddof=correction, keepdims=keepdims)) diff --git a/numpy/_array_api/_utility_functions.py b/numpy/_array_api/_utility_functions.py index 69e17e0e5..51a04dc8b 100644 --- a/numpy/_array_api/_utility_functions.py +++ b/numpy/_array_api/_utility_functions.py @@ -10,7 +10,7 @@ def all(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keep See its docstring for more information. """ - return np.all(x, axis=axis, keepdims=keepdims) + return np.asarray(np.all(x, axis=axis, keepdims=keepdims)) def any(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keepdims: bool = False) -> array: """ @@ -18,4 +18,4 @@ def any(x: array, /, *, axis: Optional[Union[int, Tuple[int, ...]]] = None, keep See its docstring for more information. """ - return np.any(x, axis=axis, keepdims=keepdims) + return np.asarray(np.any(x, axis=axis, keepdims=keepdims)) |