8000 ENH: Add dtype-support to the ufunc-based `ndarray` magic methods 4/4 by BvB93 · Pull Request #18417 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH: Add dtype-support to the ufunc-based ndarray magic methods 4/4 #18417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 6, 2021
Merged

ENH: Add dtype-support to the ufunc-based ndarray magic methods 4/4 #18417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0148bf8
TST: Validate the mypy exit-code
Feb 12, 2021
7b43240
TST: Improve a number of mypy-related exception messages
Feb 12, 2021
2cc9e29
ENH: Add dtype-support to the (ufunc-based) `ndarray` inplace magic m…
Jan 26, 2021
982468e
TST: Add typing tests for the inplace `ndarray` magic methods
Feb 12, 2021
376ba3a
MAINT: Disallow `timedelta64 % integer`-based operations
Feb 15, 2021
c6bdbad
MAINT: Removed a redundant overload
Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
TST: Add typing tests for the inplace ndarray magic methods
  • Loading branch information
Bas van Beek committed Mar 4, 2021
commit 982468e33aea84f05fd329baaceebac62245bfbc
49 changes: 43 additions & 6 deletions numpy/typing/tests/data/fail/arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,50 @@
AR_M // AR_LIKE_M # E: Unsupported operand types

_3 = AR_m // AR_LIKE_b # E: Need type annotation
AR_m // AR_LIKE_c # E: Unsupported operand types
AR_m // AR_LIKE_c # E: Unsupported operand types

AR_b // AR_LIKE_m # E: Unsupported operand types
AR_u // AR_LIKE_m # E: Unsupported operand types
AR_i // AR_LIKE_m # E: Unsupported operand types
AR_f // AR_LIKE_m # E: Unsupported operand types
AR_c // AR_LIKE_m # E: Unsupported operand types
AR_b // AR_LIKE_m # E: Unsupported operand types
AR_u // AR_LIKE_m # E: Unsupported operand types
AR_i // AR_LIKE_m # E: Unsupported operand types
AR_f // AR_LIKE_m # E: Unsupported operand types
AR_c // AR_LIKE_m # E: Unsupported operand types

# Array multiplication

AR_b *= AR_LIKE_u # E: incompatible type
AR_b *= AR_LIKE_i # E: incompatible type
AR_b *= AR_LIKE_f # E: incompatible type
AR_b *= AR_LIKE_c # E: incompatible type
AR_b *= AR_LIKE_m # E: incompatible type

AR_u *= AR_LIKE_i # E: incompatible type
AR_u *= AR_LIKE_f # E: incompatible type
AR_u *= AR_LIKE_c # E: incompatible type
AR_u *= AR_LIKE_m # E: incompatible type

AR_i *= AR_LIKE_f # E: incompatible type
AR_i *= AR_LIKE_c # E: incompatible type
AR_i *= AR_LIKE_m # E: incompatible type

AR_f *= AR_LIKE_c # E: incompatible type
AR_f *= AR_LIKE_m # E: incompatible type

# Array power

AR_b **= AR_LIKE_b # E: incompatible type
AR_b **= AR_LIKE_u # E: incompatible type
AR_b **= AR_LIKE_i # E: incompatible type
AR_b **= AR_LIKE_f # E: incompatible type
AR_b **= AR_LIKE_c # E: incompatible type

AR_u **= AR_LIKE_i # E: incompatible type
AR_u **= AR_LIKE_f # E: incompatible type
AR_u **= AR_LIKE_c # E: incompatible type

AR_i **= AR_LIKE_f # E: incompatible type
AR_i **= AR_LIKE_c # E: incompatible type

AR_f **= AR_LIKE_c # E: incompatible type

# Scalars

Expand Down
73 changes: 73 additions & 0 deletions numpy/typing/tests/data/pass/arithmetic.py
10000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ def __floordiv__(self, value: Any) -> Object:
def __rfloordiv__(self, value: Any) -> Object:
return self

def __mul__(self, value: Any) -> Object:
return self

def __rmul__(self, value: Any) -> Object:
return self

def __pow__(self, value: Any) -> Object:
return self

def __rpow__(self, value: Any) -> Object:
return self


AR_b: np.ndarray[Any, np.dtype[np.bool_]] = np.array([True])
AR_u: np.ndarray[Any, np.dtype[np.uint32]] = np.array([1], dtype=np.uint32)
Expand Down Expand Up @@ -267,6 +279,67 @@ def __rfloordiv__(self, value: Any) -> Object:
AR_LIKE_f // AR_O
AR_LIKE_O // AR_O

# Inplace multiplication

AR_b *= AR_LIKE_b

AR_u *= AR_LIKE_b
AR_u *= AR_LIKE_u

AR_i *= AR_LIKE_b
AR_i *= AR_LIKE_u
AR_i *= AR_LIKE_i

AR_f *= AR_LIKE_b
AR_f *= AR_LIKE_u
AR_f *= AR_LIKE_i
AR_f *= AR_LIKE_f

AR_c *= AR_LIKE_b
AR_c *= AR_LIKE_u
AR_c *= AR_LIKE_i
AR_c *= AR_LIKE_f
AR_c *= AR_LIKE_c

AR_m *= AR_LIKE_b
AR_m *= AR_LIKE_u
AR_m *= AR_LIKE_i
AR_m *= AR_LIKE_f

AR_O *= AR_LIKE_b
AR_O *= AR_LIKE_u
AR_O *= AR_LIKE_i
AR_O *= AR_LIKE_f
AR_O *= AR_LIKE_c
AR_O *= AR_LIKE_O

# Inplace power

AR_u **= AR_LIKE_b
AR_u **= AR_LIKE_u

AR_i **= AR_LIKE_b
AR_i **= AR_LIKE_u
AR_i **= AR_LIKE_i

AR_f **= AR_LIKE_b
AR_f **= AR_LIKE_u
AR_f **= AR_LIKE_i
AR_f **= AR_LIKE_f

AR_c **= AR_LIKE_b
AR_c **= AR_LIKE_u
AR_c **= AR_LIKE_i
AR_c **= AR_LIKE_f
AR_c **= AR_LIKE_c

AR_O **= AR_LIKE_b
AR_O **= AR_LIKE_u
AR_O **= AR_LIKE_i
AR_O **= AR_LIKE_f
AR_O **= AR_LIKE_c
AR_O **= AR_LIKE_O

# unary ops

-c16
Expand Down
0