diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2022-01-12 13:12:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 13:12:54 -0700 |
| commit | f98c60a035b007680fe811eeed3b6326961ccff5 (patch) | |
| tree | 73556ad843b2ac6670bb2840d8eb4982c70d171e /numpy/array_api/_array_object.py | |
| parent | f637d75eb6cbcc90ceadee3e62e6b62fd0e53976 (diff) | |
| parent | e3406ed3ef83f7de0f3419361e85bd8634d0fd2b (diff) | |
| download | numpy-f98c60a035b007680fe811eeed3b6326961ccff5.tar.gz | |
Merge pull request #20762 from honno/xp-pow-fixes
BUG: Allow integer inputs for pow-related functions in `array_api`
Diffstat (limited to 'numpy/array_api/_array_object.py')
| -rw-r--r-- | numpy/array_api/_array_object.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/numpy/array_api/_array_object.py b/numpy/array_api/_array_object.py index 04d9f8a24..c86cfb3a6 100644 --- a/numpy/array_api/_array_object.py +++ b/numpy/array_api/_array_object.py @@ -656,15 +656,13 @@ class Array: res = self._array.__pos__() return self.__class__._new(res) - # PEP 484 requires int to be a subtype of float, but __pow__ should not - # accept int. - def __pow__(self: Array, other: Union[float, Array], /) -> Array: + def __pow__(self: Array, other: Union[int, float, Array], /) -> Array: """ Performs the operation __pow__. """ from ._elementwise_functions import pow - other = self._check_allowed_dtypes(other, "floating-point", "__pow__") + other = self._check_allowed_dtypes(other, "numeric", "__pow__") if other is NotImplemented: return other # Note: NumPy's __pow__ does not follow type promotion rules for 0-d @@ -914,23 +912,23 @@ class Array: res = self._array.__ror__(other._array) return self.__class__._new(res) - def __ipow__(self: Array, other: Union[float, Array], /) -> Array: + def __ipow__(self: Array, other: Union[int, float, Array], /) -> Array: """ Performs the operation __ipow__. """ - other = self._check_allowed_dtypes(other, "floating-point", "__ipow__") + other = self._check_allowed_dtypes(other, "numeric", "__ipow__") if other is NotImplemented: return other self._array.__ipow__(other._array) return self - def __rpow__(self: Array, other: Union[float, Array], /) -> Array: + def __rpow__(self: Array, other: Union[int, float, Array], /) -> Array: """ Performs the operation __rpow__. """ from ._elementwise_functions import pow - other = self._check_allowed_dtypes(other, "floating-point", "__rpow__") + other = self._check_allowed_dtypes(other, "numeric", "__rpow__") if other is NotImplemented: return other # Note: NumPy's __pow__ does not follow the spec type promotion rules |