Skip to content

Fix dask/distributed regression #617

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
seanlaw merged 1 commit into from
Jun 7, 2022
Merged

Fix dask/distributed regression #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions stumpy/aamped.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,6 @@ def aamped(dask_client, T_A, m, T_B=None, ignore_trivial=True, p=2.0):
out[:, 0] = profile[:, 0]
out[:, 1:4] = indices

# Delete data from Dask cluster
dask_client.cancel(T_A_future)
dask_client.cancel(T_B_future)
dask_client.cancel(T_A_subseq_isfinite_future)
dask_client.cancel(T_B_subseq_isfinite_future)
for diags_future in diags_futures:
dask_client.cancel(diags_future)
for future in futures:
dask_client.cancel(future)

threshold = 10e-6
if core.are_distances_too_small(out[:, 0], threshold=threshold): # pragma: no cover
logger.warning(f"A large number of values are smaller than {threshold}.")
Expand Down
11 changes: 0 additions & 11 deletions stumpy/maamped.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,4 @@ def maamped(dask_client, T, m, include=None, discords=False, p=2.0):
stop = min(k, start + step)
P[:, start + 1 : stop], I[:, start + 1 : stop] = results[i]

# Delete data from Dask cluster
dask_client.cancel(T_A_future)
dask_client.cancel(T_A_subseq_isfinite_future)
dask_client.cancel(T_B_subseq_isfinite_future)
for p_norm_future in p_norm_futures:
dask_client.cancel(p_norm_future)
for p_norm_first_future in p_norm_first_futures:
dask_client.cancel(p_norm_first_future)
for future in futures:
dask_client.cancel(future)

return P, I
13 changes: 0 additions & 13 deletions stumpy/mstumped.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,4 @@ def mstumped(dask_client, T, m, include=None, discords=False, normalize=True):
stop = min(k, start + step)
P[:, start + 1 : stop], I[:, start + 1 : stop] = results[i]

# Delete data from Dask cluster
dask_client.cancel(T_A_future)
dask_client.cancel(M_T_future)
dask_client.cancel(Σ_T_future)
dask_client.cancel(μ_Q_future)
dask_client.cancel(σ_Q_future)
for QT_future in QT_futures:
dask_client.cancel(QT_future)
for QT_first_future in QT_first_futures:
dask_client.cancel(QT_first_future)
for future in futures:
dask_client.cancel(future)

return P, I
18 changes: 0 additions & 18 deletions stumpy/stumped.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,24 +263,6 @@ def stumped(dask_client, T_A, m, T_B=None, ignore_trivial=True, normalize=True,
out[:, 0] = profile[:, 0]
out[:, 1:4] = indices

# Delete data from Dask cluster
dask_client.cancel(T_A_future)
dask_client.cancel(T_B_future)
dask_client.cancel(M_T_future)
dask_client.cancel(μ_Q_future)
dask_client.cancel(Σ_T_inverse_future)
dask_client.cancel(σ_Q_inverse_future)
dask_client.cancel(M_T_m_1_future)
dask_client.cancel(μ_Q_m_1_future)
dask_client.cancel(T_A_subseq_isfinite_future)
dask_client.cancel(T_B_subseq_isfinite_future)
dask_client.cancel(T_A_subseq_isconstant_future)
dask_client.cancel(T_B_subseq_isconstant_future)
for diags_future in diags_futures:
dask_client.cancel(diags_future)
for future in futures:
dask_client.cancel(future)

threshold = 10e-6
if core.are_distances_too_small(out[:, 0], threshold=threshold): # pragma: no cover
logger.warning(f"A large number of values are smaller than {threshold}.")
Expand Down