Merge branch 'main' into at

Author: crusaderky

src/array_api_extra/_funcs.py

@@ -7,7 +7,7 @@
 from collections.abc import Callable  # pylint: disable=import-error
 from typing import ClassVar, Literal
 
-from ._lib import _utils
+from ._lib import _compat, _utils
 from ._lib._compat import (
     array_namespace,
     is_jax_array,
@@ -212,7 +212,7 @@ def create_diagonal(
         err_msg = "`x` must be 1-dimensional."
         raise ValueError(err_msg)
     n = x.shape[0] + abs(offset)
-    diag = xp.zeros(n**2, dtype=x.dtype, device=x.device)
+    diag = xp.zeros(n**2, dtype=x.dtype, device=_compat.device(x))
     i = offset if offset >= 0 else abs(offset) * n
     diag[i : min(n * (n - offset), diag.shape[0]) : n + 1] = x
     return xp.reshape(diag, (n, n))
@@ -552,7 +552,7 @@ def sinc(x: Array, /, *, xp: ModuleType | None = None) -> Array:
     y = xp.pi * xp.where(
         xp.astype(x, xp.bool),
         x,
-        xp.asarray(xp.finfo(x.dtype).eps, dtype=x.dtype, device=x.device),
+        xp.asarray(xp.finfo(x.dtype).eps, dtype=x.dtype, device=_compat.device(x)),
     )
     return xp.sin(y) / y