Skip to content

Commit 49b6481

Browse files
committed
add some skips [skip ci]
1 parent f5474e3 commit 49b6481

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
@@ -36,7 +36,7 @@ def wrapper(*args, **kwds):
3636
# XXX: output arrays
3737
result = func(*args, **kwds)
3838

39-
if isinstance(result, (np.ndarray, np.generic)):
39+
if isinstance(result, np.ndarray | np.generic):
4040
# XXX: np.int32->np.array_0D
4141
return xp.asarray(result)
4242
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

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

366367

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

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

773773

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

812813

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

10601062

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

11251128

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

11891193

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

12171222

1223+
@skip_xp_backends('dask.array', reason="no argsort in Dask")
12181224
def test_extrema04(xp):
12191225
labels = xp.asarray([1, 2, 0, 4])
12201226
for type in types:
@@ -1588,7 +1594,8 @@ def test_watershed_ift08(self, xp):
15881594
@skip_xp_backends("cupy", reason="no watershed_ift on CuPy" )
15891595
def test_watershed_ift09(self, xp):
15901596
# Test large cost. See gh-19575
1591-
data = xp.asarray([[xp.iinfo(xp.uint16).max, 0],
1597+
xp_test = array_namespace(xp.empty(0)) # dask.array needs iinfo
1598+
data = xp.asarray([[xp_test.iinfo(xp.uint16).max, 0],
15921599
[0, 0]], dtype=xp.uint16)
15931600
markers = xp.asarray([[1, 0],
15941601
[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
@@ -188,6 +188,7 @@ def _bracket_minimum(func, x1, x2):
188188

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

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

0 commit comments

Comments
 (0)