Skip to content

✨♻️ ufunc improvements #585

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
jorenham merged 3 commits into from
Jun 13, 2025
Merged

✨♻️ ufunc improvements #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a4c39b
✨♻️ ufunc improvements
jorenham Jun 12, 2025
23aad2e
🚨 work around overload spec non-conformance
jorenham Jun 13, 2025
b7135bb
🐴 ignore a false positive `overload-overlap`
jorenham Jun 13, 2025
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
16 changes: 8 additions & 8 deletions src/_numtype/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,17 +693,17 @@ ToObject_1nd = TypeAliasType("ToObject_1nd", _ToArray2_1nd[np.object_, _PyObject
ToObject_2nd = TypeAliasType("ToObject_2nd", _ToArray2_2nd[np.object_, _PyObject])
ToObject_3nd = TypeAliasType("ToObject_3nd", _ToArray2_3nd[np.object_, _PyObject])

ToGeneric_nd = TypeAliasType("ToGeneric_nd", _ToArray2_nd[np.generic, _PyScalar])
ToGeneric_0d = TypeAliasType("ToGeneric_0d", _ToArray2_0d[np.generic, _PyScalar])
ToGeneric_nd = TypeAliasType("ToGeneric_nd", _ToArray2_nd[np.generic, _PyScalar] | ToString_nd)
ToGeneric_0d = TypeAliasType("ToGeneric_0d", _ToArray2_0d[np.generic, _PyScalar] | ToString_0d)
ToGeneric_1d = TypeAliasType("ToGeneric_1d", _ToArray2_1d[np.generic, _PyScalar])
ToGeneric_2d = TypeAliasType("ToGeneric_2d", _ToArray2_2d[np.generic, _PyScalar])
ToGeneric_3d = TypeAliasType("ToGeneric_3d", _ToArray2_3d[np.generic, _PyScalar])
ToGeneric_1ds = TypeAliasType("ToGeneric_1ds", _ToArray2_1ds[np.generic, _PyScalar])
ToGeneric_2ds = TypeAliasType("ToGeneric_2ds", _ToArray2_2ds[np.generic, _PyScalar])
ToGeneric_3ds = TypeAliasType("ToGeneric_3ds", _ToArray2_3ds[np.generic, _PyScalar])
ToGeneric_1nd = TypeAliasType("ToGeneric_1nd", _ToArray2_1nd[np.generic, _PyScalar])
ToGeneric_2nd = TypeAliasType("ToGeneric_2nd", _ToArray2_2nd[np.generic, _PyScalar])
ToGeneric_3nd = TypeAliasType("ToGeneric_3nd", _ToArray2_3nd[np.generic, _PyScalar])
ToGeneric_1ds = TypeAliasType("ToGeneric_1ds", _ToArray2_1ds[np.generic, _PyScalar] | ToString_1ds)
ToGeneric_2ds = TypeAliasType("ToGeneric_2ds", _ToArray2_2ds[np.generic, _PyScalar] | ToString_2ds)
ToGeneric_3ds = TypeAliasType("ToGeneric_3ds", _ToArray2_3ds[np.generic, _PyScalar] | ToString_3ds)
ToGeneric_1nd = TypeAliasType("ToGeneric_1nd", _ToArray2_1nd[np.generic, _PyScalar] | ToString_1nd)
ToGeneric_2nd = TypeAliasType("ToGeneric_2nd", _ToArray2_2nd[np.generic, _PyScalar] | ToString_2nd)
ToGeneric_3nd = TypeAliasType("ToGeneric_3nd", _ToArray2_3nd[np.generic, _PyScalar] | ToString_3nd)

###
# *Co*ercible (overlapping) scalar- and array-like aliases.
Expand Down
8 changes: 4 additions & 4 deletions src/numpy-stubs/@test/static/accept/multiarray.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ assert_type(np.frompyfunc(func11, 1, 1).identity, Any | None)
assert_type(np.frompyfunc(func11, 1, 1).signature, str | None)
assert_type(np.frompyfunc(func11, 1, 1)(f8), bool)
assert_type(np.frompyfunc(func11, 1, 1).at(AR_f8, AR_i8), None)
assert_type(np.frompyfunc(func11, 1, 1)(AR_f8), bool | _nt.Array[np.object_])
assert_type(np.frompyfunc(func11, 1, 1)(AR_f8), _nt.Array[np.object_])

assert_type(np.frompyfunc(func21, 2, 1).nin, int)
assert_type(np.frompyfunc(func21, 2, 1).nout, int)
Expand All @@ -126,8 +126,8 @@ assert_type(np.frompyfunc(func21, 2, 1).ntypes, int)
assert_type(np.frompyfunc(func21, 2, 1).identity, Any | None)
assert_type(np.frompyfunc(func21, 2, 1).signature, str | None)
assert_type(np.frompyfunc(func21, 2, 1)(f8, f8), int)
assert_type(np.frompyfunc(func21, 2, 1)(AR_f8, f8), int | _nt.Array[np.object_])
assert_type(np.frompyfunc(func21, 2, 1)(f8, AR_f8), int | _nt.Array[np.object_])
assert_type(np.frompyfunc(func21, 2, 1)(AR_f8, f8), _nt.Array[np.object_])
assert_type(np.frompyfunc(func21, 2, 1)(f8, AR_f8), _nt.Array[np.object_])
assert_type(np.frompyfunc(func21, 2, 1).reduce(AR_f8, axis=0), Any)
assert_type(np.frompyfunc(func21, 2, 1).accumulate(AR_f8), _nt.Array[Any])
assert_type(np.frompyfunc(func21, 2, 1).reduceat(AR_f8, AR_i8), _nt.Array[Any])
Expand All @@ -147,7 +147,7 @@ assert_type(np.frompyfunc(func12, 1, 2).ntypes, int)
assert_type(np.frompyfunc(func12, 1, 2).identity, Any | None)
assert_type(np.frompyfunc(func12, 1, 2).signature, str | None)
assert_type(np.frompyfunc(func12, 1, 2)(f8, f8), tuple[complex, str])
assert_type(np.frompyfunc(func12, 1, 2)(AR_f8, f8), tuple[complex | _nt.Array[np.object_], str | _nt.Array[np.object_]])
assert_type(np.frompyfunc(func12, 1, 2)(AR_f8, f8), tuple[_nt.Array[np.object_], _nt.Array[np.object_]])

assert_type(np.datetime_data("m8[D]"), tuple[str, int])
assert_type(np.datetime_data(np.datetime64), tuple[str, int])
Expand Down
4 changes: 2 additions & 2 deletions src/numpy-stubs/@test/static/accept/ufuncs.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ assert_type(np.isnat(td64), np.bool_)
assert_type(np.isnat([td64, td64]), _nt.Array[np.bool_])
assert_type(np.isnat([td64, td64], out=AR_bool), _nt.Array[np.bool_])
assert_type(np.isnat(AR_dt64), _nt.Array[np.bool_])
assert_type(np.isnat(AR_dt64, out=AR_bool), _nt.Array[np.bool_])
assert_type(np.isnat(AR_td64), _nt.Array[np.bool_])
assert_type(np.isnat(AR_dt64, out=AR_bool), _nt.Array[np.bool_])
assert_type(np.isnat(AR_td64, out=AR_bool), _nt.Array[np.bool_])

assert_type(np.isinf(f8), np.bool_)
Expand All @@ -67,7 +67,7 @@ assert_type(np.isfinite(AR_f8, out=AR_bool), _nt.Array[np.bool_])
assert_type(np.logical_not(True), np.bool_)
assert_type(np.logical_not(AR_bool), _nt.Array[np.bool_])
assert_type(np.logical_not(AR_bool, out=AR_bool), _nt.Array[np.bool_])
assert_type(np.logical_not(AR_bool, dtype=np.object_), _nt.Array[np.object_] | bool)
assert_type(np.logical_not(AR_bool, dtype=np.object_), _nt.Array[np.object_])

assert_type(np.logical_and(True, True), np.bool_)
assert_type(np.logical_and(AR_bool, AR_bool), _nt.Array[np.bool_])
Expand Down
Loading