From 77b6e86615483d9397264544d4c79a4d8e01b189 Mon Sep 17 00:00:00 2001 From: Evgeni Burovski Date: Mon, 17 Nov 2025 12:08:33 +0100 Subject: [PATCH 1/3] ENH: test side=left,right in searchsorted --- array_api_tests/test_searching_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/array_api_tests/test_searching_functions.py b/array_api_tests/test_searching_functions.py index 26a348d1..aca03a02 100644 --- a/array_api_tests/test_searching_functions.py +++ b/array_api_tests/test_searching_functions.py @@ -286,7 +286,7 @@ def test_searchsorted(data): out_dtype=out.dtype, expected=xp.__array_namespace_info__().default_dtypes()["indexing"], ) - # TODO: values testing + # TODO: x2.ndim > 1, values testing ph.assert_shape("searchsorted", out_shape=out.shape, expected=x2.shape) except Exception as exc: ph.add_note(exc, repro_snippet) From 370bfed6f4511ada540ed175444725f4e7ca40a0 Mon Sep 17 00:00:00 2001 From: Evgeni Burovski Date: Mon, 17 Nov 2025 13:29:41 +0100 Subject: [PATCH 2/3] ENH: test searchsorted with x2.ndim > 1 --- array_api_tests/test_searching_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/array_api_tests/test_searching_functions.py b/array_api_tests/test_searching_functions.py index aca03a02..26a348d1 100644 --- a/array_api_tests/test_searching_functions.py +++ b/array_api_tests/test_searching_functions.py @@ -286,7 +286,7 @@ def test_searchsorted(data): out_dtype=out.dtype, expected=xp.__array_namespace_info__().default_dtypes()["indexing"], ) - # TODO: x2.ndim > 1, values testing + # TODO: values testing ph.assert_shape("searchsorted", out_shape=out.shape, expected=x2.shape) except Exception as exc: ph.add_note(exc, repro_snippet) From de3623c2d90580e0c1408ed05fd13dfd39905dc7 Mon Sep 17 00:00:00 2001 From: Evgeni Burovski Date: Mon, 17 Nov 2025 18:28:39 +0100 Subject: [PATCH 3/3] ENH: searchsorted: allow python scalars for `x2` cross-ref https://github.com/data-apis/array-api/pull/982 --- array_api_tests/hypothesis_helpers.py | 7 +++- array_api_tests/test_searching_functions.py | 45 +++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/array_api_tests/hypothesis_helpers.py b/array_api_tests/hypothesis_helpers.py index e1df108c..cef157b6 100644 --- a/array_api_tests/hypothesis_helpers.py +++ b/array_api_tests/hypothesis_helpers.py @@ -454,9 +454,12 @@ def scalars(draw, dtypes, finite=False, **kwds): """ Strategy to generate a scalar that matches a dtype strategy - dtypes should be one of the shared_* dtypes strategies. + dtypes should be one of the shared_* dtypes strategies or a sequence of dtypes. """ - dtype = draw(dtypes) + if isinstance(dtypes, Sequence): + dtype = draw(sampled_from(dtypes)) + else: + dtype = draw(dtypes) mM = kwds.pop('mM', None) if dh.is_int_dtype(dtype): if mM is None: diff --git a/array_api_tests/test_searching_functions.py b/array_api_tests/test_searching_functions.py index 26a348d1..da7afda2 100644 --- a/array_api_tests/test_searching_functions.py +++ b/array_api_tests/test_searching_functions.py @@ -291,3 +291,48 @@ def test_searchsorted(data): except Exception as exc: ph.add_note(exc, repro_snippet) raise + + +### @pytest.mark.min_version("2025.12") +@given(data=st.data()) +def test_searchsorted_with_scalars(data): + # 1. draw x1, sorter and side exactly the same as in test_searchsorted + x1_dtype = data.draw(st.sampled_from(dh.real_dtypes)) + _x1 = data.draw( + st.lists( + xps.from_dtype(x1_dtype, allow_nan=False, allow_infinity=False), + min_size=1, + unique=True + ), + label="_x1", + ) + x1 = xp.asarray(_x1, dtype=x1_dtype) + if data.draw(st.booleans(), label="use sorter?"): + sorter = xp.argsort(x1) + else: + sorter = None + x1 = xp.sort(x1) + + kw = data.draw(hh.kwargs(side=st.sampled_from(["left", "right"]))) + + # 2. draw x2, a real-valued scalar + x2 = data.draw(hh.scalars(st.just(x1.dtype), finite=True)) + + # 3. testing: similar to test_searchsorted, modulo `out.shape == ()` + repro_snippet = ph.format_snippet( + f"xp.searchsorted({x1!r}, {x2!r}, sorter={sorter!r}, **kw) with {kw = }" + ) + try: + out = xp.searchsorted(x1, x2, sorter=sorter, **kw) + + ph.assert_dtype( + "searchsorted", + in_dtype=[x1.dtype], #, x2.dtype + out_dtype=out.dtype, + expected=xp.__array_namespace_info__().default_dtypes()["indexing"], + ) + # TODO: values testing + ph.assert_shape("searchsorted", out_shape=out.shape, expected=()) + except Exception as exc: + exc.add_note(repro_snippet) + raise