Merge pull request #41 from asmeurer/ci-fix

Use the main array-api-tests repo instead of my fork on CI

Author: asmeurer

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

@@ -41,13 +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
-
-        # Temporarily use https://github.com/data-apis/array-api-tests/pull/157
-        repository: asmeurer/array-api-tests
-        ref: xfails-file
     - 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/torch/_aliases.py

@@ -459,6 +459,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
@@ -659,8 +669,8 @@ def isdtype(
            'logaddexp', 'multiply', 'not_equal', 'pow', 'remainder',
            'subtract', 'max', 'min', 'sort', 'prod', 'sum', 'any', 'all',
            'mean', 'std', 'var', 'concat', 'squeeze', 'flip', 'roll',
-           'nonzero', 'where', 'arange', 'eye', 'linspace', 'full', 'ones',
-           'zeros', 'empty', 'tril', 'triu', 'expand_dims', 'astype',
+           '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',
            'vecdot', 'tensordot', 'isdtype']