Merge branch 'main' into typ_v4

Author: crusaderky

array_api_compat/__init__.py

@@ -17,6 +17,6 @@
 this implementation for the default when working with NumPy arrays.
 
 """
-__version__ = '1.12.dev0'
+__version__ = '1.13.0.dev0'
 
 from .common import *  # noqa: F401, F403

array_api_compat/dask/array/_aliases.py

@@ -171,7 +171,7 @@ def asarray(
         return obj.copy() if copy else obj  # pyright: ignore[reportAttributeAccessIssue]
 
     if copy is False:
-        raise NotImplementedError(
+        raise ValueError(
             "Unable to avoid copy when converting a non-dask object to dask"
         )
 

array_api_compat/numpy/__init__.py

@@ -23,6 +23,6 @@
 
 __import__(__package__ + ".fft")
 
-from .linalg import matrix_transpose, vecdot  # type: ignore[no-redef] # noqa: F401
+from .linalg import matrix_transpose, vecdot  # type: ignore[no-redef]  # noqa: F401
 
 __array_api_version__: Final = "2024.12"

cupy-xfails.txt

@@ -39,6 +39,11 @@ array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_sc
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[logaddexp]
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[nextafter]
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[hypot]
+array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[atan2]
+array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[divide]
+array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[copysign]
+array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[divide]
+array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[maximum]
 
 # cupy (arg)min/max wrong with infinities
 # https://github.com/cupy/cupy/issues/7424

docs/changelog.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## 1.12.0 (2025-05-13)
+
+
+### Major changes
+
+- The build system has been updated to use `pyproject.toml` instead of `setup.py`
+- Support for Python 3.9 has been dropped. The minimum supported Python version is now
+  3.10; the minimum supported NumPy version is 1.22.
+- The `linalg` extension works correctly with `pytorch>=2.7`.
+- Multiple improvements to handling of devices in CuPy and PyTorch backends.
+  Support for multiple devices in CuPy is still immature and you should use
+  context managers rather than relying on input-output device propagation or
+  on the `device` parameter.  Please report any issues you encounter.
+
+### Minor changes
+
+- `finfo` and `iinfo` functions now accept array arguments, in accordance with the
+   Array API spec;
+- `torch.asarray` function propagates the device of the input array. This works around
+   the [pytorch issue #150199](https://github.com/pytorch/pytorch/issues/150199);
+- `torch.repeat` function is now available;
+- `torch.count_nonzero` function now correctly handles the case of a tuple `axis`
+  arguments and `keepdims=True`;
+- `torch.meshgrid` wrapper defaults to `indexing="xy"`, in accordance with the
+  array API specification;
+- `cupy.asarray` function now implements the `copy=False` argument, albeit
+  at the cost of risking to make a temporary copy.
+- In `numpy.take_along_axis` and `cupy.take_along_axis` the `axis` parameter now
+  defaults to -1, in accordance to the Array API spec.
+
+
+The following users contributed to this release:
+
+Evgeni Burovski,
+Lucas Colley,
+Neil Girdhar,
+Joren Hammudoglu,
+Guido Imperiale
+
+
 ## 1.11.2 (2025-03-20)
 
 This is a bugfix release with no new features compared to version 1.11.

numpy-1-22-xfails.txt

@@ -131,6 +131,7 @@ array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_sc
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[nextafter]
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[multiply]
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[maximum]
+array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[minimum]
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[copysign]
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[pow]
 array_api_tests/test_operators_and_elementwise_functions.py::test_binary_with_scalars_real[pow]

tests/test_common.py

@@ -268,7 +268,6 @@ def test_asarray_cross_library(source_library, target_library, request):
     assert b.dtype == tgt_lib.int32
 
 
-
 @pytest.mark.parametrize("library", wrapped_libraries)
 def test_asarray_copy(library):
     # Note, we have this test here because the test suite currently doesn't
@@ -278,100 +277,87 @@ def test_asarray_copy(library):
     xp = import_(library, wrapper=True)
     asarray = xp.asarray
     is_lib_func = globals()[is_array_functions[library]]
-    all = xp.all if library != 'dask.array' else lambda x: xp.all(x).compute()
-
-    if library == 'cupy':
-        supports_copy_false_other_ns = False
-        supports_copy_false_same_ns = False
-    elif library == 'dask.array':
-        supports_copy_false_other_ns = False
-        supports_copy_false_same_ns = True
-    else:
-        supports_copy_false_other_ns = True
-        supports_copy_false_same_ns = True
 
     a = asarray([1])
     b = asarray(a, copy=True)
     assert is_lib_func(b)
     a[0] = 0
-    assert all(b[0] == 1)
-    assert all(a[0] == 0)
+    assert b[0] == 1
+    assert a[0] == 0
 
     a = asarray([1])
-    if supports_copy_false_same_ns:
-        b = asarray(a, copy=False)
-        assert is_lib_func(b)
-        a[0] = 0
-        assert all(b[0] == 0)
-    else:
-        pytest.raises(NotImplementedError, lambda: asarray(a, copy=False))
 
-    a = asarray([1])
-    if supports_copy_false_same_ns:
-        pytest.raises(ValueError, lambda: asarray(a, copy=False,
-                                                  dtype=xp.float64))
-    else:
-        pytest.raises(NotImplementedError, lambda: asarray(a, copy=False, dtype=xp.float64))
+    # Test copy=False within the same namespace
+    b = asarray(a, copy=False)
+    assert is_lib_func(b)
+    a[0] = 0
+    assert b[0] == 0
+    with pytest.raises(ValueError):
+        asarray(a, copy=False, dtype=xp.float64)
 
+    # copy=None defaults to False when possible
     a = asarray([1])
     b = asarray(a, copy=None)
     assert is_lib_func(b)
     a[0] = 0
-    assert all(b[0] == 0)
+    assert b[0] == 0
 
+    # copy=None defaults to True when impossible
     a = asarray([1.0], dtype=xp.float32)
     assert a.dtype == xp.float32
     b = asarray(a, dtype=xp.float64, copy=None)
     assert is_lib_func(b)
     assert b.dtype == xp.float64
     a[0] = 0.0
-    assert all(b[0] == 1.0)
+    assert b[0] == 1.0
 
+    # copy=None defaults to False when possible
     a = asarray([1.0], dtype=xp.float64)
     assert a.dtype == xp.float64
     b = asarray(a, dtype=xp.float64, copy=None)
     assert is_lib_func(b)
     assert b.dtype == xp.float64
     a[0] = 0.0
-    assert all(b[0] == 0.0)
+    assert b[0] == 0.0
 
     # Python built-in types
     for obj in [True, 0, 0.0, 0j, [0], [[0]]]:
-        asarray(obj, copy=True) # No error
-        asarray(obj, copy=None) # No error
-        if supports_copy_false_other_ns:
-            pytest.raises(ValueError, lambda: asarray(obj, copy=False))
-        else:
-            pytest.raises(NotImplementedError, lambda: asarray(obj, copy=False))
+        asarray(obj, copy=True)  # No error
+        asarray(obj, copy=None)  # No error
+
+        with pytest.raises(ValueError):
+            asarray(obj, copy=False)
 
     # Use the standard library array to test the buffer protocol
-    a = array.array('f', [1.0])
+    a = array.array("f", [1.0])
     b = asarray(a, copy=True)
     assert is_lib_func(b)
     a[0] = 0.0
-    assert all(b[0] == 1.0)
+    assert b[0] == 1.0
 
-    a = array.array('f', [1.0])
-    if supports_copy_false_other_ns:
+    a = array.array("f", [1.0])
+    if library in ("cupy", "dask.array"):
+        with pytest.raises(ValueError):
+            asarray(a, copy=False)
+    else:
         b = asarray(a, copy=False)
         assert is_lib_func(b)
         a[0] = 0.0
-        assert all(b[0] == 0.0)
-    else:
-        pytest.raises(NotImplementedError, lambda: asarray(a, copy=False))
+        assert b[0] == 0.0
 
-    a = array.array('f', [1.0])
+    a = array.array("f", [1.0])
     b = asarray(a, copy=None)
     assert is_lib_func(b)
     a[0] = 0.0
-    if library in ('cupy', 'dask.array'):
+    if library in ("cupy", "dask.array"):
         # A copy is required for libraries where the default device is not CPU
         # dask changed behaviour of copy=None in 2024.12 to copy;
         # this wrapper ensures the same behaviour in older versions too.
         # https://github.com/dask/dask/pull/11524/
-        assert all(b[0] == 1.0)
+        assert b[0] == 1.0
     else:
-        assert all(b[0] == 0.0)
+        # copy=None defaults to False when possible
+        assert b[0] == 0.0
 
 
 @pytest.mark.parametrize("library", ["numpy", "cupy", "torch"])

tests/test_cupy.py

@@ -5,18 +5,41 @@
 from cupy.cuda import Stream
 
 
-def test_to_device_with_stream():
+@pytest.mark.parametrize(
+    "make_stream",
+    [
+        lambda: Stream(),
+        lambda: Stream(non_blocking=True),
+        lambda: Stream(null=True),
+        lambda: Stream(ptds=True),
+    ],
+)
+def test_to_device_with_stream(make_stream):
     devices = xp.__array_namespace_info__().devices()
-    streams = [
-        Stream(),
-        Stream(non_blocking=True), 
-        Stream(null=True),
-        Stream(ptds=True), 
-        123,  # dlpack stream
-    ]
 
     a = xp.asarray([1, 2, 3])
     for dev in devices:
-        for stream in streams:
-            b = to_device(a, dev, stream=stream)
-            assert device(b) == dev
+        # Streams are device-specific and must be created within
+        # the context of the device...
+        with dev:
+            stream = make_stream()
+        # ... however, to_device() does not need to be inside the
+        # device context.
+        b = to_device(a, dev, stream=stream)
+        assert device(b) == dev
+
+
+def test_to_device_with_dlpack_stream():
+    devices = xp.__array_namespace_info__().devices()
+
+    a = xp.asarray([1, 2, 3])
+    for dev in devices:
+        # Streams are device-specific and must be created within
+        # the context of the device...
+        with dev:
+            s1 = Stream()
+
+        # ... however, to_device() does not need to be inside the
+        # device context.
+        b = to_device(a, dev, stream=s1.ptr)
+        assert device(b) == dev