Merge branch 'move_usm_ndarray' into move_dpctl_ext_to_dpnp_tensor

Author: vlad-perevezentsev

dpnp/__init__.py

@@ -60,6 +60,9 @@
                 [os.getenv("PATH", ""), dll_path]
             )
 
+# TODO: revert to `from dpctl.tensor...`
+# when dpnp fully migrates dpctl/tensor
+from dpctl_ext.tensor import __array_api_version__, DLDeviceType
 
 from .dpnp_array import dpnp_array as ndarray
 from .dpnp_array_api_info import __array_namespace_info__

dpnp/dpnp_iface_statistics.py

@@ -50,13 +50,13 @@
 import dpnp.backend.extensions.statistics._statistics_impl as statistics_ext
 import dpnp.tensor as dpt
 import dpnp.tensor._tensor_elementwise_impl as ti
-from dpnp.dpnp_utils.dpnp_utils_common import (
-    result_type_for_device,
-    to_supported_dtypes,
-)
 from dpnp.tensor._numpy_helper import normalize_axis_index
 
 from .dpnp_utils import get_usm_allocations
+from .dpnp_utils.dpnp_utils_common import (
+    result_type_for_device,
+    to_supported_dtypes,
+)
 from .dpnp_utils.dpnp_utils_reduction import dpnp_wrap_reduction_call
 from .dpnp_utils.dpnp_utils_statistics import dpnp_cov, dpnp_median
 

dpnp/tensor/_dlpack.pyx

@@ -1086,7 +1086,7 @@ def from_dlpack(x, /, *, device=None, copy=None):
         .. code-block:: python
 
             import dpctl
-            import dpctl.tensor as dpt
+            import dpctl_ext.tensor as dpt
 
             class Container:
                 "Helper class implementing `__dlpack__` protocol"

dpnp/tensor/_usmarray.pyx

@@ -465,7 +465,7 @@ cdef class usm_ndarray:
 
             .. code-block:: python
 
-                from dpctl import tensor
+                from dpctl_ext import tensor
 
                 x = tensor.ones((3, 10, 7))
                 y = tensor.flip(x[:, 1::2], axis=1)
@@ -659,7 +659,7 @@ cdef class usm_ndarray:
 
             .. code-block:: python
 
-                from dpctl import tensor
+                from dpctl_ext import tensor
 
                 x = tensor.arange(899)
                 x.shape = (29, 31)
@@ -764,7 +764,7 @@ cdef class usm_ndarray:
 
             .. code-block:: python
 
-                from dpctl import tensor
+                from dpctl_ext import tensor
 
                 x = tensor.zeros((20, 30))
                 xv = x[10:, :15]
@@ -877,7 +877,7 @@ cdef class usm_ndarray:
 
             .. code-block:: python
 
-                >>> from dpctl import tensor
+                >>> from dpctl_ext import tensor
                 >>> x = tensor.ones(10)
                 >>> x.device
                 Device(level_zero:gpu:0)
@@ -928,7 +928,7 @@ cdef class usm_ndarray:
 
             .. code-block:: python
 
-                from dpctl import tensor
+                from dpctl_ext import tensor
 
                 # Create complex array from
                 # arrays of real and imaginary parts
@@ -957,7 +957,7 @@ cdef class usm_ndarray:
 
             .. code-block:: python
 
-                from dpctl import tensor
+                from dpctl_ext import tensor
 
                 # Reset imaginary part of complex array
 
@@ -1049,7 +1049,7 @@ cdef class usm_ndarray:
             .. code-block:: python
 
                 import dpctl
-                import dpctl.tensor as dpt
+                import dpctl_ext.tensor as dpt
 
                 x = dpt.full(10**6, 2, dtype="int64")
                 q_prof = dpctl.SyclQueue(

dpnp/tensor/include/dlpack/README.md

@@ -1,7 +1,7 @@
 # DLPack header
 
-The header `dlpack.h` downloaded from `https://github.com/dmlc/dlpack.git` remote at tag v1.0rc commit [`62100c1`](https://github.com/dmlc/dlpack/commit/62100c123144ae7a80061f4220be2dbd3cbaefc7).
+The header `dlpack.h` downloaded from `https://github.com/dmlc/dlpack.git` remote at tag v1.3 commit [`84d107b`](https://github.com/dmlc/dlpack/commit/84d107bf416c6bab9ae68ad285876600d230490d).
 
-The file can also be viewed using github web interface at https://github.com/dmlc/dlpack/blob/62100c123144ae7a80061f4220be2dbd3cbaefc7/include/dlpack/dlpack.h
+The file can also be viewed using github web interface at https://github.com/dmlc/dlpack/blob/v1.3/include/dlpack/dlpack.h
 
 License file was retrieved from https://github.com/dmlc/dlpack/blob/main/LICENSE

dpnp/tensor/include/dlpack/dlpack.h

@@ -19,7 +19,7 @@
 #define DLPACK_MAJOR_VERSION 1
 
 /*! \brief The current minor version of dlpack */
-#define DLPACK_MINOR_VERSION 2
+#define DLPACK_MINOR_VERSION 3
 
 /*! \brief DLPACK_DLL prefix for windows */
 #ifdef _WIN32
@@ -397,7 +397,7 @@ typedef enum
     } DLManagedTensorVersioned;
 
     //----------------------------------------------------------------------
-    // DLPack `__c_dlpack_exchange_api__` fast exchange protocol definitions
+    // DLPack `__dlpack_c_exchange_api__` fast exchange protocol definitions
     //----------------------------------------------------------------------
     /*!
      * \brief Request a producer library to create a new tensor.
@@ -442,6 +442,7 @@ typedef enum
      *
      * \param py_object The Python object to convert. Must have the same type
      *        as the one the `DLPackExchangeAPI` was discovered from.
+     * \param out The output DLManagedTensorVersioned.
      * \return The owning DLManagedTensorVersioned* or NULL on failure with a
      *         Python exception set. If the data cannot be described using
      * DLPack this should be a BufferError if possible. \note - As a C function,
@@ -561,17 +562,24 @@ typedef enum
      * \brief Framework-specific function pointers table for DLPack exchange.
      *
      * Additionally to `__dlpack__()` we define a C function table sharable by
-     * Python implementations via `__c_dlpack_exchange_api__`.
-     * This attribute must be set on the type as a Python integer compatible
-     * with `PyLong_FromVoidPtr`/`PyLong_AsVoidPtr`.
+     *
+     * Python implementations via `__dlpack_c_exchange_api__`.
+     * This attribute must be set on the type as a Python PyCapsule
+     * with name "dlpack_exchange_api".
      *
      * A consumer library may use a pattern such as:
      *
      * \code
      *
-     * PyObject *api_obj = type(tensor_obj).__c_dlpack_exchange_api__;  // as
-     * C-code MyDLPackExchangeAPI *api = PyLong_AsVoidPtr(api_obj); if (api ==
-     * NULL && PyErr_Occurred()) { goto handle_error; }
+     *  PyObject *api_capsule = PyObject_GetAttrString(
+     *    (PyObject *)Py_TYPE(tensor_obj), "__dlpack_c_exchange_api__")
+     *  );
+     *  if (api_capsule == NULL) { goto handle_error; }
+     *  MyDLPackExchangeAPI *api = (MyDLPackExchangeAPI *)PyCapsule_GetPointer(
+     *    api_capsule, "dlpack_exchange_api"
+     *  );
+     *  Py_DECREF(api_capsule);
+     *  if (api == NULL) { goto handle_error; }
      *
      * \endcode
      *
@@ -652,7 +660,7 @@ typedef enum
         /*!
          * \brief Producer function pointer for DLPackManagedTensorToPyObject
          *        This function must be not NULL.
-         * \sa DLPackManagedTensorToPyObject
+         * \sa DLPackManagedTensorToPyObjectNoSync
          */
         DLPackManagedTensorToPyObjectNoSync managed_tensor_to_py_object_no_sync;
         /*!