Skip to content

Commit 197c7f8

Browse files
committed
Fixed isort 9.0.* and back incompatibility issue
1 parent bf9d12b commit 197c7f8

12 files changed

Lines changed: 38 additions & 44 deletions

‎stumpy/__init__.py‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,17 @@ def _get_fastmath_value(module_name, func_name): # pragma: no cover
9999
)
100100
else: # pragma: no cover
101101
from . import core
102-
from .core import _gpu_aamp_driver_not_found as gpu_aamp # noqa: F401
103-
from .core import ( # noqa: F401
104-
_gpu_aamp_ostinato_driver_not_found as gpu_aamp_ostinato,
105-
)
106-
from .core import _gpu_aamp_stimp_driver_not_found as gpu_aamp_stimp # noqa: F401
107-
from .core import _gpu_aampdist_driver_not_found as gpu_aampdist # noqa: F401
108-
from .core import _gpu_mpdist_driver_not_found as gpu_mpdist # noqa: F401
109-
from .core import _gpu_ostinato_driver_not_found as gpu_ostinato # noqa: F401
110-
from .core import _gpu_stimp_driver_not_found as gpu_stimp # noqa: F401
111-
from .core import _gpu_stump_driver_not_found as gpu_stump # noqa: F401
112-
113-
core._gpu_searchsorted_left = core._gpu_searchsorted_left_driver_not_found
114-
core._gpu_searchsorted_right = core._gpu_searchsorted_right_driver_not_found
102+
from .core import _gpu_aamp_dnf as gpu_aamp # noqa: F401
103+
from .core import _gpu_aamp_ostinato_dnf as gpu_aamp_ostinato # noqa: F401
104+
from .core import _gpu_aamp_stimp_dnf as gpu_aamp_stimp # noqa: F401
105+
from .core import _gpu_aampdist_dnf as gpu_aampdist # noqa: F401
106+
from .core import _gpu_mpdist_dnf as gpu_mpdist # noqa: F401
107+
from .core import _gpu_ostinato_dnf as gpu_ostinato # noqa: F401
108+
from .core import _gpu_stimp_dnf as gpu_stimp # noqa: F401
109+
from .core import _gpu_stump_dnf as gpu_stump # noqa: F401
110+
111+
core._gpu_searchsorted_left = core._gpu_searchsorted_left_dnf
112+
core._gpu_searchsorted_right = core._gpu_searchsorted_right_dnf
115113

116114
# Fix GPU-STUMP Docs
117115
gpu_stump.__doc__ = ""

‎stumpy/core.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def driver_not_found(*args, **kwargs): # pragma: no cover
166166
_raise_driver_not_found()
167167

168168

169-
def _gpu_stump_driver_not_found(*args, **kwargs): # pragma: no cover
169+
def _gpu_stump_dnf(*args, **kwargs): # pragma: no cover
170170
"""
171171
Dummy function to raise CudaSupportError driver not found error.
172172
@@ -181,7 +181,7 @@ def _gpu_stump_driver_not_found(*args, **kwargs): # pragma: no cover
181181
driver_not_found()
182182

183183

184-
def _gpu_aamp_driver_not_found(*args, **kwargs): # pragma: no cover
184+
def _gpu_aamp_dnf(*args, **kwargs): # pragma: no cover
185185
"""
186186
Dummy function to raise CudaSupportError driver not found error.
187187
@@ -196,7 +196,7 @@ def _gpu_aamp_driver_not_found(*args, **kwargs): # pragma: no cover
196196
driver_not_found()
197197

198198

199-
def _gpu_ostinato_driver_not_found(*args, **kwargs): # pragma: no cover
199+
def _gpu_ostinato_dnf(*args, **kwargs): # pragma: no cover
200200
"""
201201
Dummy function to raise CudaSupportError driver not found error.
202202
@@ -211,7 +211,7 @@ def _gpu_ostinato_driver_not_found(*args, **kwargs): # pragma: no cover
211211
driver_not_found()
212212

213213

214-
def _gpu_aamp_ostinato_driver_not_found(*args, **kwargs): # pragma: no cover
214+
def _gpu_aamp_ostinato_dnf(*args, **kwargs): # pragma: no cover
215215
"""
216216
Dummy function to raise CudaSupportError driver not found error.
217217
@@ -226,7 +226,7 @@ def _gpu_aamp_ostinato_driver_not_found(*args, **kwargs): # pragma: no cover
226226
driver_not_found()
227227

228228

229-
def _gpu_mpdist_driver_not_found(*args, **kwargs): # pragma: no cover
229+
def _gpu_mpdist_dnf(*args, **kwargs): # pragma: no cover
230230
"""
231231
Dummy function to raise CudaSupportError driver not found error.
232232
@@ -241,7 +241,7 @@ def _gpu_mpdist_driver_not_found(*args, **kwargs): # pragma: no cover
241241
driver_not_found()
242242

243243

244-
def _gpu_aampdist_driver_not_found(*args, **kwargs): # pragma: no cover
244+
def _gpu_aampdist_dnf(*args, **kwargs): # pragma: no cover
245245
"""
246246
Dummy function to raise CudaSupportError driver not found error.
247247
@@ -256,7 +256,7 @@ def _gpu_aampdist_driver_not_found(*args, **kwargs): # pragma: no cover
256256
driver_not_found()
257257

258258

259-
def _gpu_stimp_driver_not_found(*args, **kwargs): # pragma: no cover
259+
def _gpu_stimp_dnf(*args, **kwargs): # pragma: no cover
260260
"""
261261
Dummy function to raise CudaSupportError driver not found error.
262262
@@ -271,7 +271,7 @@ def _gpu_stimp_driver_not_found(*args, **kwargs): # pragma: no cover
271271
driver_not_found()
272272

273273

274-
def _gpu_aamp_stimp_driver_not_found(*args, **kwargs): # pragma: no cover
274+
def _gpu_aamp_stimp_dnf(*args, **kwargs): # pragma: no cover
275275
"""
276276
Dummy function to raise CudaSupportError driver not found error.
277277
@@ -286,7 +286,7 @@ def _gpu_aamp_stimp_driver_not_found(*args, **kwargs): # pragma: no cover
286286
driver_not_found()
287287

288288

289-
def _gpu_searchsorted_left_driver_not_found(*args, **kwargs): # pragma: no cover
289+
def _gpu_searchsorted_left_dnf(*args, **kwargs): # pragma: no cover
290290
"""
291291
Dummy function to raise CudaSupportError driver not found error.
292292
@@ -301,7 +301,7 @@ def _gpu_searchsorted_left_driver_not_found(*args, **kwargs): # pragma: no cove
301301
driver_not_found()
302302

303303

304-
def _gpu_searchsorted_right_driver_not_found(*args, **kwargs): # pragma: no cover
304+
def _gpu_searchsorted_right_dnf(*args, **kwargs): # pragma: no cover
305305
"""
306306
Dummy function to raise CudaSupportError driver not found error.
307307

‎tests/test_gpu_aamp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
if cuda.is_available():
1111
from stumpy.gpu_aamp import gpu_aamp
1212
else: # pragma: no cover
13-
from stumpy.core import _gpu_aamp_driver_not_found as gpu_aamp # noqa: F401
13+
from stumpy.core import _gpu_aamp_dnf as gpu_aamp # noqa: F401
1414

1515

1616
try:

‎tests/test_gpu_aamp_ostinato.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
if cuda.is_available():
1919
from stumpy.gpu_aamp_ostinato import gpu_aamp_ostinato
2020
else: # pragma: no cover
21-
from stumpy.core import ( # noqa: F401
22-
_gpu_aamp_ostinato_driver_not_found as gpu_aamp_ostinato,
23-
)
21+
from stumpy.core import _gpu_aamp_ostinato_dnf as gpu_aamp_ostinato # noqa: F401
2422

2523
TEST_THREADS_PER_BLOCK = 10
2624

‎tests/test_gpu_aamp_stimp.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
if cuda.is_available():
88
from stumpy.gpu_aamp_stimp import gpu_aamp_stimp
99
else: # pragma: no cover
10-
from stumpy.core import ( # noqa: F401
11-
_gpu_aamp_stimp_driver_not_found as gpu_aamp_stimp,
12-
)
10+
from stumpy.core import _gpu_aamp_stimp_dnf as gpu_aamp_stimp # noqa: F401
1311

1412
try:
1513
from numba.errors import NumbaPerformanceWarning

‎tests/test_gpu_aampdist.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
if cuda.is_available():
88
from stumpy.gpu_aampdist import gpu_aampdist
99
else: # pragma: no cover
10-
from stumpy.core import _gpu_aampdist_driver_not_found as gpu_aampdist # noqa: F401
10+
from stumpy.core import _gpu_aampdist_dnf as gpu_aampdist # noqa: F401
1111

1212
try:
1313
from numba.errors import NumbaPerformanceWarning

‎tests/test_gpu_mpdist.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
if cuda.is_available():
99
from stumpy.gpu_mpdist import gpu_mpdist
1010
else: # pragma: no cover
11-
from stumpy.core import _gpu_mpdist_driver_not_found as gpu_mpdist # noqa: F401
11+
from stumpy.core import _gpu_mpdist_dnf as gpu_mpdist # noqa: F401
1212

1313
try:
1414
from numba.errors import NumbaPerformanceWarning

‎tests/test_gpu_ostinato.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
if cuda.is_available():
2121
from stumpy.gpu_ostinato import gpu_ostinato
2222
else: # pragma: no cover
23-
from stumpy.core import _gpu_ostinato_driver_not_found as gpu_ostinato # noqa: F401
23+
from stumpy.core import _gpu_ostinato_dnf as gpu_ostinato # noqa: F401
2424

2525

2626
TEST_THREADS_PER_BLOCK = 10

‎tests/test_gpu_stimp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
if cuda.is_available():
99
from stumpy.gpu_stimp import gpu_stimp
1010
else: # pragma: no cover
11-
from stumpy.core import _gpu_stimp_driver_not_found as gpu_stimp # noqa: F401
11+
from stumpy.core import _gpu_stimp_dnf as gpu_stimp # noqa: F401
1212

1313
try:
1414
from numba.errors import NumbaPerformanceWarning

‎tests/test_gpu_stump.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
if cuda.is_available():
1212
from stumpy.gpu_stump import gpu_stump
1313
else: # pragma: no cover
14-
from stumpy.core import _gpu_stump_driver_not_found as gpu_stump # noqa: F401
14+
from stumpy.core import _gpu_stump_dnf as gpu_stump # noqa: F401
1515

1616

1717
try:

0 commit comments

Comments
 (0)