Merge branch 'main' into 2022.12

Author: asmeurer

.github/workflows/array-api-tests.yml

@@ -41,12 +41,9 @@ jobs:
     - name: Checkout array-api-tests
       uses: actions/checkout@v3
       with:
-        # repository: data-apis/array-api-tests
+        repository: data-apis/array-api-tests
         submodules: 'true'
         path: array-api-tests
-
-        repository: data-apis/array-api-tests
-        ref: master
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:

array_api_compat/common/_aliases.py

@@ -331,7 +331,7 @@ def _asarray(
 
     return xp.asarray(obj, dtype=dtype, **kwargs)
 
-# xp.reshape calls the keyword argument 'newshape' instead of 'shape'
+# np.reshape calls the keyword argument 'newshape' instead of 'shape'
 def reshape(x: ndarray,
             /,
             shape: Tuple[int, ...],
@@ -340,8 +340,9 @@ def reshape(x: ndarray,
     if copy is True:
         x = x.copy()
     elif copy is False:
-        x.shape = shape
-        return x
+        y = x.view()
+        y.shape = shape
+        return y
     return xp.reshape(x, shape, **kwargs)
 
 # The descending keyword is new in sort and argsort, and 'kind' replaced with

array_api_compat/common/_helpers.py

@@ -154,6 +154,11 @@ def _cupy_to_device(x, device, /, stream=None):
 
     if device == x.device:
         return x
+    elif device == "cpu":
+        # allowing us to use `to_device(x, "cpu")`
+        # is useful for portable test swapping between
+        # host and device backends
+        return x.get()
     elif not isinstance(device, _Device):
         raise ValueError(f"Unsupported device {device!r}")
     else:

array_api_compat/torch/_aliases.py

@@ -478,6 +478,16 @@ def where(condition: array, x1: array, x2: array, /) -> array:
     x1, x2 = _fix_promotion(x1, x2)
     return torch.where(condition, x1, x2)
 
+# torch.reshape doesn't have the copy keyword
+def reshape(x: array,
+            /,
+            shape: Tuple[int, ...],
+            copy: Optional[bool] = None,
+            **kwargs) -> array:
+    if copy is not None:
+        raise NotImplementedError("torch.reshape doesn't yet support the copy keyword")
+    return torch.reshape(x, shape, **kwargs)
+
 # torch.arange doesn't support returning empty arrays
 # (https://github.com/pytorch/pytorch/issues/70915), and doesn't support some
 # keyword argument combinations
@@ -680,8 +690,8 @@ def take(x: array, indices: array, /, *, axis: int, **kwargs) -> array:
            'floor_divide', 'greater', 'greater_equal', 'less', 'less_equal',
            'logaddexp', 'multiply', 'not_equal', 'pow', 'remainder',
            'subtract', 'max', 'min', 'sort', 'prod', 'sum', 'any', 'all',
-           'mean', 'std', 'var', 'concat', 'squeeze', 'broadcast_to', 'flip',
-           'roll', 'nonzero', 'where', 'arange', 'eye', 'linspace', 'full',
+           'mean', 'std', 'var', 'concat', 'squeeze', 'broadcast_to', ''flip', 'roll',
+           'nonzero', 'where', 'reshape', 'arange', 'eye', 'linspace', 'full',
            'ones', 'zeros', 'empty', 'tril', 'triu', 'expand_dims', 'astype',
            'broadcast_arrays', 'unique_all', 'unique_counts',
            'unique_inverse', 'unique_values', 'matmul', 'matrix_transpose',

tests/test_common.py

@@ -0,0 +1,23 @@
+from ._helpers import import_
+from array_api_compat import to_device, device
+
+import pytest
+import numpy as np
+from numpy.testing import assert_allclose
+
+@pytest.mark.parametrize("library", ["cupy", "numpy", "torch"])
+def test_to_device_host(library):
+    # different libraries have different semantics
+    # for DtoH transfers; ensure that we support a portable
+    # shim for common array libs
+    # see: https://github.com/scipy/scipy/issues/18286#issuecomment-1527552919
+    xp = import_('array_api_compat.' + library)
+    expected = np.array([1, 2, 3])
+    x = xp.asarray([1, 2, 3])
+    x = to_device(x, "cpu")
+    # torch will return a genuine Device object, but
+    # the other libs will do something different with
+    # a `device(x)` query; however, what's really important
+    # here is that we can test portably after calling
+    # to_device(x, "cpu") to return to host
+    assert_allclose(x, expected)