Skip to content

Commit 2a26252

Browse files
committed
add some skips [skip ci]
1 parent ff7469b commit 2a26252

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

scipy/ndimage/_support_alternative_backends.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def wrapper(*args, **kwds):
4646
# XXX: output arrays
4747
result = func(*args, **kwds)
4848

49-
if isinstance(result, (np.ndarray, np.generic)):
49+
if isinstance(result, np.ndarray | np.generic):
5050
# XXX: np.int32->np.array_0D
5151
return xp.asarray(result)
5252
elif isinstance(result, int):

scipy/ndimage/tests/test_measurements.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
from scipy.conftest import array_api_compatible
2525
skip_xp_backends = pytest.mark.skip_xp_backends
26+
xfail_xp_backends = pytest.mark.xfail_xp_backends
2627
pytestmark = [array_api_compatible, pytest.mark.usefixtures("skip_xp_backends"),
2728
skip_xp_backends(cpu_only=True, exceptions=['cupy', 'jax.numpy'],)]
2829

@@ -365,10 +366,9 @@ def test_label_output_dtype(xp):
365366
assert output.dtype == t
366367

367368

369+
@xfail_xp_backends('dask.array', reason='Dask does not raise')
370+
@xfail_xp_backends('jax.numpy', reason='JAX does not raise')
368371
def test_label_output_wrong_size(xp):
369-
if is_jax(xp):
370-
pytest.xfail("JAX does not raise")
371-
372372
data = xp.ones([5])
373373
for t in types:
374374
dtype = getattr(xp, t)
@@ -569,7 +569,7 @@ def test_value_indices03(xp):
569569
assert list(vi.keys()) == list(trueKeys)
570570
for k in [int(x) for x in trueKeys]:
571571
trueNdx = xp.nonzero(a == k, **nnz_kwd)
572-
assert len(vi[k]) == len(trueNdx)
572+
assert vi[k].shape[0] == trueNdx.shape[0]
573573
for vik, true_vik in zip(vi[k], trueNdx):
574574
xp_assert_equal(vik, true_vik)
575575

@@ -772,6 +772,7 @@ def test_minimum03(xp):
772772
assert_almost_equal(output, xp.asarray(2.0), check_0d=False)
773773

774774

775+
@skip_xp_backends('dask.array', reason="no argsort in Dask")
775776
def test_minimum04(xp):
776777
labels = xp.asarray([[1, 2], [2, 3]])
777778
for type in types:
@@ -811,6 +812,7 @@ def test_maximum03(xp):
811812
assert_almost_equal(output, xp.asarray(4.0), check_0d=False)
812813

813814

815+
@skip_xp_backends('dask.array', reason="no argsort in Dask")
814816
def test_maximum04(xp):
815817
labels = xp.asarray([[1, 2], [2, 3]])
816818
for type in types:
@@ -1059,6 +1061,7 @@ def test_minimum_position06(xp):
10591061
assert output == (0, 1)
10601062

10611063

1064+
@skip_xp_backends('dask.array', reason="no argsort in Dask")
10621065
def test_minimum_position07(xp):
10631066
labels = xp.asarray([1, 2, 3, 4])
10641067
for type in types:
@@ -1124,6 +1127,7 @@ def test_maximum_position05(xp):
11241127
assert output == (0, 0)
11251128

11261129

1130+
@skip_xp_backends('dask.array', reason="no argsort in Dask")
11271131
def test_maximum_position06(xp):
11281132
labels = xp.asarray([1, 2, 0, 4])
11291133
for type in types:
@@ -1188,6 +1192,7 @@ def test_extrema02(xp):
11881192
assert output1 == (output2, output3, output4, output5)
11891193

11901194

1195+
@skip_xp_backends('dask.array', reason="no argsort in Dask")
11911196
def test_extrema03(xp):
11921197
labels = xp.asarray([[1, 2], [2, 3]])
11931198
for type in types:
@@ -1216,6 +1221,7 @@ def test_extrema03(xp):
12161221
assert output1[3] == output5
12171222

12181223

1224+
@skip_xp_backends('dask.array', reason="no argsort in Dask")
12191225
def test_extrema04(xp):
12201226
labels = xp.asarray([1, 2, 0, 4])
12211227
for type in types:
@@ -1589,7 +1595,8 @@ def test_watershed_ift08(self, xp):
15891595
@skip_xp_backends("cupy", reason="no watershed_ift on CuPy" )
15901596
def test_watershed_ift09(self, xp):
15911597
# Test large cost. See gh-19575
1592-
data = xp.asarray([[xp.iinfo(xp.uint16).max, 0],
1598+
xp_test = array_namespace(xp.empty(0)) # dask.array needs iinfo
1599+
data = xp.asarray([[xp_test.iinfo(xp.uint16).max, 0],
15931600
[0, 0]], dtype=xp.uint16)
15941601
markers = xp.asarray([[1, 0],
15951602
[0, 0]], dtype=xp.int8)

scipy/optimize/tests/test_chandrupatla.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ def _bracket_minimum(func, x1, x2):
187187

188188
@array_api_compatible
189189
@pytest.mark.usefixtures("skip_xp_backends")
190+
@pytest.mark.skip_xp_backends('dask.array', reason='no argsort in Dask')
190191
@pytest.mark.skip_xp_backends('jax.numpy',
191192
reason='JAX arrays do not support item assignment.')
192193
@pytest.mark.skip_xp_backends('array_api_strict',
@@ -553,6 +554,7 @@ def f(x):
553554

554555
@array_api_compatible
555556
@pytest.mark.usefixtures("skip_xp_backends")
557+
@pytest.mark.skip_xp_backends('dask.array', reason='boolean indexing assignment')
556558
@pytest.mark.skip_xp_backends('array_api_strict',
557559
reason='Currently uses fancy indexing assignment.')
558560
@pytest.mark.skip_xp_backends('jax.numpy',

0 commit comments

Comments
 (0)