Skip to content

Commit dad6e03

Browse files
committed
Fixed numpy 2.4 compatibility issues
1 parent 45279b6 commit dad6e03

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

stumpy/core.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4001,7 +4001,10 @@ def _subspace(D, k, include=None, discords=False):
40014001
# `include` processing occur here since we are dealing with indices, not distances
40024002
if include is not None:
40034003
include = _preprocess_include(include)
4004-
mask = np.in1d(sorted_idx, include)
4004+
try:
4005+
mask = np.in1d(sorted_idx, include)
4006+
except AttributeError: # pragma: no cover
4007+
mask = np.isin(sorted_idx, include)
40054008
include_idx = mask.nonzero()[0]
40064009
exclude_idx = (~mask).nonzero()[0]
40074010
sorted_idx[: include_idx.shape[0]], sorted_idx[include_idx.shape[0] :] = (

stumpy/floss.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,12 @@ def update(self, t):
659659

660660
self._M_T[:-1] = self._M_T[1:]
661661
self._Σ_T[:-1] = self._Σ_T[1:]
662-
self._M_T[-1], self._Σ_T[-1] = core.compute_mean_std(
663-
self._T[-self._m :], self._m
664-
)
662+
663+
M_T, Σ_T = core.compute_mean_std(self._T[-self._m :], self._m)
664+
try:
665+
self._M_T[-1], self._Σ_T[-1] = M_T, Σ_T
666+
except ValueError: # pragma: no cover
667+
self._M_T[-1], self._Σ_T[-1] = M_T.item(), Σ_T.item()
665668

666669
D = core.mass(
667670
self._finite_Q,

0 commit comments

Comments
 (0)