Use ValueError for different device errors

Author: asmeurer

array_api_strict/_array_object.py

@@ -221,7 +221,7 @@ def _check_device(self, other):
             return
         elif isinstance(other, Array):
             if self.device != other.device:
-                raise RuntimeError(f"Arrays from two different devices ({self.device} and {other.device}) can not be combined.")
+                raise ValueError(f"Arrays from two different devices ({self.device} and {other.device}) can not be combined.")
 
     # Helper function to match the type promotion rules in the spec
     def _promote_scalar(self, scalar):

array_api_strict/_elementwise_functions.py

@@ -23,5 +23,5 @@ def take(x: Array, indices: Array, /, *, axis: Optional[int] = None) -> Array:
     if indices.ndim != 1:
         raise ValueError("Only 1-dim indices array is supported")
     if x.device != indices.device:
-        raise RuntimeError(f"Arrays from two different devices ({x.device} and {indices.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x.device} and {indices.device}) can not be combined.")
     return Array._new(np.take(x._array, indices._array, axis=axis), device=x.device)

array_api_strict/_indexing_functions.py

@@ -84,7 +84,7 @@ def cross(x1: Array, x2: Array, /, *, axis: int = -1) -> Array:
         raise ValueError('cross() dimension must equal 3')
 
     if x1.device != x2.device:
-        raise RuntimeError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
 
     if get_array_api_strict_flags()['api_version'] >= '2023.12':
         if axis >= 0:
@@ -246,7 +246,7 @@ def outer(x1: Array, x2: Array, /) -> Array:
         raise ValueError('The input arrays to outer must be 1-dimensional')
 
     if x1.device != x2.device:
-        raise RuntimeError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
 
     return Array._new(np.outer(x1._array, x2._array), device=x1.device)
 
@@ -357,7 +357,7 @@ def solve(x1: Array, x2: Array, /) -> Array:
         raise TypeError('Only floating-point dtypes are allowed in solve')
 
     if x1.device != x2.device:
-        raise RuntimeError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
 
     return Array._new(_solve(x1._array, x2._array), device=x1.device)
 

array_api_strict/_linalg.py

@@ -31,7 +31,7 @@ def matmul(x1: Array, x2: Array, /) -> Array:
         raise TypeError('Only numeric dtypes are allowed in matmul')
 
     if x1.device != x2.device:
-        raise RuntimeError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
 
     return Array._new(np.matmul(x1._array, x2._array), device=x1.device)
 
@@ -45,7 +45,7 @@ def tensordot(x1: Array, x2: Array, /, *, axes: Union[int, Tuple[Sequence[int],
         raise TypeError('Only numeric dtypes are allowed in tensordot')
 
     if x1.device != x2.device:
-        raise RuntimeError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
 
     return Array._new(np.tensordot(x1._array, x2._array, axes=axes), device=x1.device)
 
@@ -68,7 +68,7 @@ def vecdot(x1: Array, x2: Array, /, *, axis: int = -1) -> Array:
             raise ValueError("axis is out of bounds for x1 and x2")
 
     if x1.device != x2.device:
-        raise RuntimeError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
 
     # In versions of the standard prior to 2023.12, vecdot applied axis after
     # broadcasting. This is different from applying it before broadcasting

array_api_strict/_linear_algebra_functions.py

@@ -94,7 +94,7 @@ def repeat(
         if repeats.dtype not in _integer_dtypes:
             raise TypeError("The repeats array must have an integer dtype")
         if x.device != repeats.device:
-            raise RuntimeError(f"Arrays from two different devices ({x.device} and {repeats.device}) can not be combined.")
+            raise ValueError(f"Arrays from two different devices ({x.device} and {repeats.device}) can not be combined.")
     elif isinstance(repeats, int):
         repeats = asarray(repeats)
     else:

array_api_strict/_manipulation_functions.py

@@ -63,7 +63,7 @@ def searchsorted(
         raise TypeError("Only real numeric dtypes are allowed in searchsorted")
 
     if x1.device != x2.device:
-        raise RuntimeError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
+        raise ValueError(f"Arrays from two different devices ({x1.device} and {x2.device}) can not be combined.")
 
     sorter = sorter._array if sorter is not None else None
     # TODO: The sort order of nans and signed zeros is implementation

array_api_strict/_searching_functions.py

@@ -31,14 +31,14 @@ def test_take_device():
 
     x = xp.asarray([2, 3])
     indices = xp.asarray([1, 1, 0], device=xp.Device("device1"))
-    with pytest.raises(RuntimeError, match="Arrays from two different devices"):
+    with pytest.raises(ValueError, match="Arrays from two different devices"):
         xp.take(x, indices)
 
     x = xp.asarray([2, 3], device=xp.Device("device1"))
     indices = xp.asarray([1, 1, 0])
-    with pytest.raises(RuntimeError, match="Arrays from two different devices"):
+    with pytest.raises(ValueError, match="Arrays from two different devices"):
         xp.take(x, indices)
 
     x = xp.asarray([2, 3], device=xp.Device("device1"))
     indices = xp.asarray([1, 1, 0], device=xp.Device("device1"))
-    xp.take(x, indices)
+    xp.take(x, indices)