Fix notes and device type override

Author: steff456

spec/API_specification/signatures/array_object.py

@@ -1,4 +1,5 @@
-from ._types import array, dtype, device, Optional, Tuple, Union, Any, PyCapsule, Enum, ellipsis
+from ._types import array, dtype, Optional, Tuple, Union, Any, PyCapsule, Enum, ellipsis
+from ._types import device as Device
 
 class array():
     def __init__(self) -> None:
@@ -18,7 +19,7 @@ def dtype() -> dtype:
         """
 
     @property
-    def device() -> device:
+    def device() -> Device:
         """
         Hardware device the array data resides on.
 
@@ -244,13 +245,25 @@ def __dlpack__(self: array, /, *, stream: Optional[Union[int, Any]] = None) -> P
 
             For other device types which do have a stream, queue or similar synchronization mechanism, the most appropriate type to use for `stream` is not yet determined. E.g., for SYCL one may want to use an object containing an in-order ``cl::sycl::queue``. This is allowed when libraries agree on such a convention, and may be standardized in a future version of this API standard.
 
-            **Note**
+            **Tip**
 
-            Support for a ``stream`` value other than ``None`` is optional and implementation-dependent.
+            It is recommended that implementers explicitly handle streams. If
+            they use the legacy default stream, specifying ``1`` (CUDA) or ``0``
+            (ROCm) is preferred. ``None`` is a safe default for developers who do
+            not want to think about stream handling at all, potentially at the
+            cost of more synchronization than necessary.
 
-            Device-specific notes:
+        Returns
+        -------
+        capsule: PyCapsule
+            a DLPack capsule for the array. See :ref:`data-interchange` for details.
+
+        Notes
+        -----
+        - Support for a ``stream`` value other than ``None`` is optional and implementation-dependent.
+        - Device-specific notes:
 
-            **CUDA**
+        **CUDA**
 
             -   ``None``: producer must assume the legacy default stream (default).
             -   ``1``: the legacy default stream.
@@ -259,26 +272,13 @@ def __dlpack__(self: array, /, *, stream: Optional[Union[int, Any]] = None) -> P
 
             ``0`` is disallowed due to its ambiguity: ``0`` could mean either ``None``, ``1``, or ``2``.
 
-            **ROCm**
+        **ROCm**
 
             -   ``None``: producer must assume the legacy default stream (default).
             -   ``0``: the default stream.
             -   ``> 2``: stream number represented as a Python integer.
 
             Using ``1`` and ``2`` is not supported.
-
-            **Tip**
-
-            It is recommended that implementers explicitly handle streams. If
-            they use the legacy default stream, specifying ``1`` (CUDA) or ``0``
-            (ROCm) is preferred. ``None`` is a safe default for developers who do
-            not want to think about stream handling at all, potentially at the
-            cost of more synchronization than necessary.
-
-        Returns
-        -------
-        capsule: PyCapsule
-            a DLPack capsule for the array. See :ref:`data-interchange` for details.
         """
 
     def __dlpack_device__(self: array, /) -> Tuple[Enum, int]:
@@ -925,7 +925,7 @@ def __xor__(self: array, other: Union[int, bool, array], /) -> array:
         - Element-wise results must equal the results returned by the equivalent element-wise function :ref:`function-bitwise_xor`.
         """
 
-    def to_device(self: array, device: device, /, *, stream: Optional[Union[int, Any]] = None) -> array:
+    def to_device(self: array, device: Device, /, *, stream: Optional[Union[int, Any]] = None) -> array:
         """
         Copy the array from the device on which it currently resides to the specified ``device``.