Skip to content

Commit

Permalink
Merge pull request #1488 from brian-team/numpy_2.0_ptp
Browse files Browse the repository at this point in the history
Explicitly wrap np.ptp for numpy 2.0 compatibility
  • Loading branch information
mstimberg authored Oct 9, 2023
2 parents 76545b0 + decab78 commit 9988aca
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion brian2/tests/test_units.py
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,8 @@ def test_numpy_functions_same_dimensions():
values = [np.array([1, 2]), np.ones((3, 3))]
units = [volt, second, siemens, mV, kHz]

from brian2.units.unitsafefunctions import ptp

# numpy functions
keep_dim_funcs = [
np.abs,
Expand All @@ -1013,7 +1015,7 @@ def test_numpy_functions_same_dimensions():
np.mean,
np.min,
np.negative,
np.ptp,
ptp,
np.round,
np.squeeze,
np.std,
Expand Down
4 changes: 4 additions & 0 deletions brian2/units/unitsafefunctions.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
fail_for_dimension_mismatch,
is_dimensionless,
wrap_function_dimensionless,
wrap_function_keep_dimensions,
wrap_function_remove_dimensions,
)

Expand Down Expand Up @@ -44,6 +45,7 @@
"zeros_like",
"arange",
"linspace",
"ptp",
]


Expand Down Expand Up @@ -93,6 +95,8 @@ def where(condition, *args, **kwds): # pylint: disable=C0111
expm1 = wrap_function_dimensionless(np.expm1)
log1p = wrap_function_dimensionless(np.log1p)

ptp = wrap_function_keep_dimensions(np.ptp)


@check_units(x=1, result=1)
def exprel(x):
Expand Down

0 comments on commit 9988aca

Please sign in to comment.