array-api-strict 1.0__py3-none-any.whl → 1.1__py3-none-any.whl

array_api_strict/_array_object.py

@@ -122,14 +122,26 @@ class Array:
 
     # This function is not required by the spec, but we implement it here for
     # convenience so that np.asarray(array_api_strict.Array) will work.
-    def __array__(self, dtype: None | np.dtype[Any] = None) -> npt.NDArray[Any]:
+    def __array__(self, dtype: None | np.dtype[Any] = None, copy: None | bool = None) -> npt.NDArray[Any]:
         """
         Warning: this method is NOT part of the array API spec. Implementers
         of other libraries need not include it, and users should not assume it
         will be present in other implementations.
 
         """
-        return np.asarray(self._array, dtype=dtype)
+        # copy keyword is new in 2.0.0; for older versions don't use it
+        # retry without that keyword.
+        if np.__version__[0] < '2':
+            return np.asarray(self._array, dtype=dtype)
+        elif np.__version__.startswith('2.0.0-dev0'):
+            # Handle dev version for which we can't know based on version
+            # number whether or not the copy keyword is supported.
+            try:
+                return np.asarray(self._array, dtype=dtype, copy=copy)
+            except TypeError:
+                return np.asarray(self._array, dtype=dtype)
+        else:
+            return np.asarray(self._array, dtype=dtype, copy=copy)
 
     # These are various helper functions to make the array behavior match the
     # spec in places where it either deviates from or is more strict than

array_api_strict/_creation_functions.py

@@ -11,7 +11,6 @@ if TYPE_CHECKING:
         NestedSequence,
         SupportsBufferProtocol,
     )
-    from collections.abc import Sequence
 from ._dtypes import _DType, _all_dtypes
 
 import numpy as np
@@ -22,6 +21,12 @@ def _check_valid_dtype(dtype):
     if dtype not in (None,) + _all_dtypes:
         raise ValueError("dtype must be one of the supported dtypes")
 
+def _supports_buffer_protocol(obj):
+    try:
+        memoryview(obj)
+    except TypeError:
+        return False
+    return True
 
 def asarray(
     obj: Union[
@@ -36,7 +41,7 @@ def asarray(
     *,
     dtype: Optional[Dtype] = None,
     device: Optional[Device] = None,
-    copy: Optional[Union[bool, np._CopyMode]] = None,
+    copy: Optional[bool] = None,
 ) -> Array:
     """
     Array API compatible wrapper for :py:func:`np.asarray <numpy.asarray>`.
@@ -53,20 +58,37 @@ def asarray(
         _np_dtype = dtype._np_dtype
     if device not in [CPU_DEVICE, None]:
         raise ValueError(f"Unsupported device {device!r}")
-    if copy in (False, np._CopyMode.IF_NEEDED):
-        # Note: copy=False is not yet implemented in np.asarray
-        raise NotImplementedError("copy=False is not yet implemented")
+
+    if np.__version__[0] < '2':
+        if copy is False:
+            # Note: copy=False is not yet implemented in np.asarray for
+            # NumPy 1
+
+            # Work around it by creating the new array and seeing if NumPy
+            # copies it.
+            if isinstance(obj, Array):
+                new_array = np.array(obj._array, copy=copy, dtype=_np_dtype)
+                if new_array is not obj._array:
+                    raise ValueError("Unable to avoid copy while creating an array from given array.")
+                return Array._new(new_array)
+            elif _supports_buffer_protocol(obj):
+                # Buffer protocol will always support no-copy
+                return Array._new(np.array(obj, copy=copy, dtype=_np_dtype))
+            else:
+                # No-copy is unsupported for Python built-in types.
+                raise ValueError("Unable to avoid copy while creating an array from given object.")
+
+        if copy is None:
+            # NumPy 1 treats copy=False the same as the standard copy=None
+            copy = False
+
     if isinstance(obj, Array):
-        if dtype is not None and obj.dtype != dtype:
-            copy = True
-        if copy in (True, np._CopyMode.ALWAYS):
-            return Array._new(np.array(obj._array, copy=True, dtype=_np_dtype))
-        return obj
+        return Array._new(np.array(obj._array, copy=copy, dtype=_np_dtype))
     if dtype is None and isinstance(obj, int) and (obj > 2 ** 64 or obj < -(2 ** 63)):
         # Give a better error message in this case. NumPy would convert this
         # to an object array. TODO: This won't handle large integers in lists.
         raise OverflowError("Integer out of bounds for array dtypes")
-    res = np.asarray(obj, dtype=_np_dtype)
+    res = np.array(obj, dtype=_np_dtype, copy=copy)
     return Array._new(res)
 
 

array_api_strict/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-01-24T13:16:13-0700",
+ "date": "2024-03-08T13:47:35-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "c0f153460b1881115ceccfad854dc5d9ae346f55",
- "version": "1.0"
+ "full-revisionid": "e6fb25db36ce4732478855520d75b4224a0cb067",
+ "version": "1.1"
 }
 '''  # END VERSION_JSON
 

array_api_strict/linalg.py

@@ -73,9 +73,6 @@ def cross(x1: Array, x2: Array, /, *, axis: int = -1) -> Array:
     """
     if x1.dtype not in _numeric_dtypes or x2.dtype not in _numeric_dtypes:
         raise TypeError('Only numeric dtypes are allowed in cross')
-    # Note: this is different from np.cross(), which broadcasts
-    if x1.shape != x2.shape:
-        raise ValueError('x1 and x2 must have the same shape')
     if x1.ndim == 0:
         raise ValueError('cross() requires arrays of dimension at least 1')
     # Note: this is different from np.cross(), which allows dimension 2

array_api_strict/tests/test_creation_functions.py

@@ -50,19 +50,49 @@ def test_asarray_copy():
     a[0] = 0
     assert all(b[0] == 1)
     assert all(a[0] == 0)
+
     a = asarray([1])
-    b = asarray(a, copy=np._CopyMode.ALWAYS)
+    b = asarray(a, copy=False)
     a[0] = 0
-    assert all(b[0] == 1)
-    assert all(a[0] == 0)
+    assert all(b[0] == 0)
+
+    a = asarray([1])
+    assert_raises(ValueError, lambda: asarray(a, copy=False, dtype=float64))
+
+    a = asarray([1])
+    b = asarray(a, copy=None)
+    a[0] = 0
+    assert all(b[0] == 0)
+
     a = asarray([1])
-    b = asarray(a, copy=np._CopyMode.NEVER)
+    b = asarray(a, dtype=float64, copy=None)
+    a[0] = 0
+    assert all(b[0] == 1.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
+        assert_raises(ValueError, lambda: asarray(obj, copy=False))
+
+    # Buffer protocol
+    a = np.array([1])
+    b = asarray(a, copy=True)
+    assert isinstance(b, Array)
+    a[0] = 0
+    assert all(b[0] == 1)
+
+    a = np.array([1])
+    b = asarray(a, copy=False)
+    assert isinstance(b, Array)
     a[0] = 0
     assert all(b[0] == 0)
-    assert_raises(NotImplementedError, lambda: asarray(a, copy=False))
-    assert_raises(NotImplementedError,
-                  lambda: asarray(a, copy=np._CopyMode.IF_NEEDED))
 
+    a = np.array([1])
+    b = asarray(a, copy=None)
+    assert isinstance(b, Array)
+    a[0] = 0
+    assert all(b[0] == 0)
 
 def test_arange_errors():
     arange(1, device=CPU_DEVICE)  # Doesn't error

{array_api_strict-1.0.dist-info → array_api_strict-1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: array_api_strict
-Version: 1.0
+Version: 1.1
 Summary: A strict, minimal implementation of the Python array API standard.
 Home-page: https://data-apis.org/array-api-strict/
 Author: Consortium for Python Data API Standards

{array_api_strict-1.0.dist-info → array_api_strict-1.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 array_api_strict/__init__.py,sha256=cXEybrrXZOSyqr1JtCDKnKWCrMycZuVd_J6jdHgvnso,5061
-array_api_strict/_array_object.py,sha256=hi2rHZDTOw0UHNO95U5-eoE16vfiVY0vK-OeaQpzifY,44292
+array_api_strict/_array_object.py,sha256=liFkS3y4MVkpxNlAkJsOHWFYg0BInLRaaGpY3FGlUio,44922
 array_api_strict/_constants.py,sha256=AYayN2jf1Dp5rXZ7WPBdUhtPBo_JMCi-pD9oW5zmFkI,87
-array_api_strict/_creation_functions.py,sha256=7C-5i7c_ADUoeP5oN1r-mVzNP3esWM2WSO98xN65g0Y,10829
+array_api_strict/_creation_functions.py,sha256=rcgdgxmRWFg1FWW8IkBqlk8PuMatlpD5rz3LLErTgh4,11640
 array_api_strict/_data_type_functions.py,sha256=LJc62mWGtRsgfDS4M3WlCdl51HojcP7jApmcwdJ55l8,6436
 array_api_strict/_dtypes.py,sha256=aNZleHcEqemH2-mCijrFr8dxMQQJoMXNnvThbXZ4awc,6208
 array_api_strict/_elementwise_functions.py,sha256=0kGuDX3Ur_Qp6tBMBWTO7LPUxzXNGAlA2SSJhdAp4DU,25992
@@ -13,12 +13,12 @@ array_api_strict/_sorting_functions.py,sha256=7pszlxNN7-DNqEZlonGLFQrlXPP7evVA8j
 array_api_strict/_statistical_functions.py,sha256=I2k2Ql-Bdwh8VmvqfeQdZjncHiMQHGzolCbFIl65aoY,3680
 array_api_strict/_typing.py,sha256=VVqlHrb4qFCQ-wn5Xrs4BmNk_lnh5X4yBx5iafdMwho,1112
 array_api_strict/_utility_functions.py,sha256=HwycylbPAgRVz4nZvjvwqN3mQnJbqKA-NRMaAvIP-CE,824
-array_api_strict/_version.py,sha256=VsI7Etj8obFBBab7V6GzmRBA3BqWGKOFtbo9OYpCaLQ,495
+array_api_strict/_version.py,sha256=M_lEho1__YIS9E5u5ogjfmM5V2SQBb8m95MvIyAZU4Q,495
 array_api_strict/fft.py,sha256=YuyPom-zog_i-yLSYFw300CFdPCJc7xbU0gq1UHXlNg,8996
-array_api_strict/linalg.py,sha256=MQqoSMayWhPdrQDFjWVzPX83Nat31j7SiDtpAguhGX4,18712
+array_api_strict/linalg.py,sha256=PhspNehj7Ag8RF3piB-A_FRXUTm-6Fwrr8sUe8lG1l0,18556
 array_api_strict/tests/__init__.py,sha256=t_2GZ3lKcsu4ec4GMKPUDYaeMUJyDquBlQAcPgj7kFE,282
 array_api_strict/tests/test_array_object.py,sha256=N_Leal0TBEPnx8gzCXGtex-kTtnJ-Q_4_Yk1bC8kHeo,17300
-array_api_strict/tests/test_creation_functions.py,sha256=e1AvqOwJxccQoDfO9GvSQ7i8cr-4QADLpeQnO1zzqsQ,6109
+array_api_strict/tests/test_creation_functions.py,sha256=dO3b22XOy3quhUG8gFNvy_n_0OdDcTcvTSrrNLBrASU,6711
 array_api_strict/tests/test_data_type_functions.py,sha256=hZ1r3jIsZ9CE746b2doMwORPqgxXhx8dXj27CS07t7E,1292
 array_api_strict/tests/test_elementwise_functions.py,sha256=CTj4LLwtusI51HkpzD0JPohP1ffNxogAVFz8WLuWFzM,3800
 array_api_strict/tests/test_indexing_functions.py,sha256=srT5EUcIfmyq6Um8OXIzq-mQPzvlDseksttywBslGME,622
@@ -26,8 +26,8 @@ array_api_strict/tests/test_manipulation_functions.py,sha256=wce25dSJjubrGhFxmia
 array_api_strict/tests/test_set_functions.py,sha256=ikzab1j3SXxGf0OqwHrOAM13HwQetdhtB60Zc_gc1DE,542
 array_api_strict/tests/test_sorting_functions.py,sha256=fJ1ahz8ihYTb9SylqNXufMRdHMwGSzK2n6LFx29KzaU,598
 array_api_strict/tests/test_validation.py,sha256=JdsK4z1M0U5YoJrfWSzOpEhmlehvZHF5SG0I0k6oDy8,672
-array_api_strict-1.0.dist-info/LICENSE,sha256=djDm4UfHAJmycwFUNyUmrTdRkrFF9Ac8uqIlbxH7j5Y,1585
-array_api_strict-1.0.dist-info/METADATA,sha256=N9tT-KKo0X-JyMLiDeVH-sQN3g62UYNxi6xYf5rgt5U,9825
-array_api_strict-1.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-array_api_strict-1.0.dist-info/top_level.txt,sha256=M4cE8VLgRHp_d9TPkbk7_I4JriELFdEJz-NKJJqAkAE,17
-array_api_strict-1.0.dist-info/RECORD,,
+array_api_strict-1.1.dist-info/LICENSE,sha256=djDm4UfHAJmycwFUNyUmrTdRkrFF9Ac8uqIlbxH7j5Y,1585
+array_api_strict-1.1.dist-info/METADATA,sha256=2BI7fTWe1W_LBl75niW9H--aOmAwYX83D2Ar48zggZs,9825
+array_api_strict-1.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+array_api_strict-1.1.dist-info/top_level.txt,sha256=M4cE8VLgRHp_d9TPkbk7_I4JriELFdEJz-NKJJqAkAE,17
+array_api_strict-1.1.dist-info/RECORD,,