Convert .pxi include files to .pxd/.pyx in dpnp/tensor (#2913)

vlad-perevezentsev · web-flow · commit 0878f310bf45 · 2026-06-01T01:41:59.000+02:00
This PR proposes to replace Cython textual includes with proper module
imports in `dpnp/tensor`
.pxi files are converted into corresponding .pxd and .pyx modules for
_slicing.pxi, _stride_utils.pxi and _types.pxi`

This change replaces the include `.pxi` pattern with standard Cython
cimport statements and improving modularity
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ This release is compatible with NumPy 2.4.5.
 * Changed `dpnp.meshgrid` and `dpnp.tensor.meshgrid` to return a tuple instead of a list, aligning with NumPy 2.5+ behavior and 2025.12 version of the Python array API standard [#2854](https://github.com/IntelPython/dpnp/pull/2854)
 * Updated `searchsorted` implementations to align with the 2025.12 array API spec [gh-2902](https://github.com/IntelPython/dpnp/pull/2902)
 * Updated tests to align with NumPy 2.4.5 compatibility [gh-2920](https://github.com/IntelPython/dpnp/pull/2920)
+* Replaced `.pxi` includes in `dpnp.tensor` with modular `.pxd`/`.pyx` Cython imports [#2913](https://github.com/IntelPython/dpnp/pull/2913)
 
 ### Deprecated
 
diff --git a/dpnp/backend/include/dpnp4pybind11.hpp b/dpnp/backend/include/dpnp4pybind11.hpp
@@ -32,9 +32,10 @@
 #include "dpctl4pybind11.hpp"
 
 // Include generated Cython headers for usm_ndarray
-// (struct definition and constants only)
 #include "dpnp/tensor/_usmarray.h"
 #include "dpnp/tensor/_usmarray_api.h"
+// Include usm_ndarray constants (flags, type numbers)
+#include "../../tensor/include/usm_ndarray_constants.h"
 
 #include <array>
 #include <cassert>
@@ -191,47 +192,47 @@ class dpnp_capi
         this->UsmNDArray_MakeSimpleFromPtr_ = UsmNDArray_MakeSimpleFromPtr;
         this->UsmNDArray_MakeFromPtr_ = UsmNDArray_MakeFromPtr;
 
-        // constants
-        this->USM_ARRAY_C_CONTIGUOUS_ = USM_ARRAY_C_CONTIGUOUS;
-        this->USM_ARRAY_F_CONTIGUOUS_ = USM_ARRAY_F_CONTIGUOUS;
-        this->USM_ARRAY_WRITABLE_ = USM_ARRAY_WRITABLE;
-        this->UAR_BOOL_ = UAR_BOOL;
-        this->UAR_BYTE_ = UAR_BYTE;
-        this->UAR_UBYTE_ = UAR_UBYTE;
-        this->UAR_SHORT_ = UAR_SHORT;
-        this->UAR_USHORT_ = UAR_USHORT;
-        this->UAR_INT_ = UAR_INT;
-        this->UAR_UINT_ = UAR_UINT;
-        this->UAR_LONG_ = UAR_LONG;
-        this->UAR_ULONG_ = UAR_ULONG;
-        this->UAR_LONGLONG_ = UAR_LONGLONG;
-        this->UAR_ULONGLONG_ = UAR_ULONGLONG;
-        this->UAR_FLOAT_ = UAR_FLOAT;
-        this->UAR_DOUBLE_ = UAR_DOUBLE;
-        this->UAR_CFLOAT_ = UAR_CFLOAT;
-        this->UAR_CDOUBLE_ = UAR_CDOUBLE;
-        this->UAR_TYPE_SENTINEL_ = UAR_TYPE_SENTINEL;
-        this->UAR_HALF_ = UAR_HALF;
+        // constants from usm_ndarray_constants.h
+        this->USM_ARRAY_C_CONTIGUOUS_ = USM_ARRAY_C_CONTIGUOUS_VALUE;
+        this->USM_ARRAY_F_CONTIGUOUS_ = USM_ARRAY_F_CONTIGUOUS_VALUE;
+        this->USM_ARRAY_WRITABLE_ = USM_ARRAY_WRITABLE_VALUE;
+        this->UAR_BOOL_ = UAR_BOOL_VALUE;
+        this->UAR_BYTE_ = UAR_BYTE_VALUE;
+        this->UAR_UBYTE_ = UAR_UBYTE_VALUE;
+        this->UAR_SHORT_ = UAR_SHORT_VALUE;
+        this->UAR_USHORT_ = UAR_USHORT_VALUE;
+        this->UAR_INT_ = UAR_INT_VALUE;
+        this->UAR_UINT_ = UAR_UINT_VALUE;
+        this->UAR_LONG_ = UAR_LONG_VALUE;
+        this->UAR_ULONG_ = UAR_ULONG_VALUE;
+        this->UAR_LONGLONG_ = UAR_LONGLONG_VALUE;
+        this->UAR_ULONGLONG_ = UAR_ULONGLONG_VALUE;
+        this->UAR_FLOAT_ = UAR_FLOAT_VALUE;
+        this->UAR_DOUBLE_ = UAR_DOUBLE_VALUE;
+        this->UAR_CFLOAT_ = UAR_CFLOAT_VALUE;
+        this->UAR_CDOUBLE_ = UAR_CDOUBLE_VALUE;
+        this->UAR_TYPE_SENTINEL_ = UAR_TYPE_SENTINEL_VALUE;
+        this->UAR_HALF_ = UAR_HALF_VALUE;
 
         // deduced disjoint types
-        this->UAR_INT8_ = UAR_BYTE;
-        this->UAR_UINT8_ = UAR_UBYTE;
-        this->UAR_INT16_ = UAR_SHORT;
-        this->UAR_UINT16_ = UAR_USHORT;
+        this->UAR_INT8_ = UAR_BYTE_VALUE;
+        this->UAR_UINT8_ = UAR_UBYTE_VALUE;
+        this->UAR_INT16_ = UAR_SHORT_VALUE;
+        this->UAR_UINT16_ = UAR_USHORT_VALUE;
         this->UAR_INT32_ =
             platform_typeid_lookup<std::int32_t, long, int, short>(
-                UAR_LONG, UAR_INT, UAR_SHORT);
+                UAR_LONG_VALUE, UAR_INT_VALUE, UAR_SHORT_VALUE);
         this->UAR_UINT32_ =
             platform_typeid_lookup<std::uint32_t, unsigned long, unsigned int,
-                                   unsigned short>(UAR_ULONG, UAR_UINT,
-                                                   UAR_USHORT);
+                                   unsigned short>(
+                UAR_ULONG_VALUE, UAR_UINT_VALUE, UAR_USHORT_VALUE);
         this->UAR_INT64_ =
             platform_typeid_lookup<std::int64_t, long, long long, int>(
-                UAR_LONG, UAR_LONGLONG, UAR_INT);
+                UAR_LONG_VALUE, UAR_LONGLONG_VALUE, UAR_INT_VALUE);
         this->UAR_UINT64_ =
             platform_typeid_lookup<std::uint64_t, unsigned long,
                                    unsigned long long, unsigned int>(
-                UAR_ULONG, UAR_ULONGLONG, UAR_UINT);
+                UAR_ULONG_VALUE, UAR_ULONGLONG_VALUE, UAR_UINT_VALUE);
 
         py::object py_default_usm_memory =
             ::dpctl::detail::dpctl_capi::get().default_usm_memory_pyobj();
diff --git a/dpnp/tensor/_slicing.pxd b/dpnp/tensor/_slicing.pxd
@@ -0,0 +1,42 @@
+# *****************************************************************************
+# Copyright (c) 2026, Intel Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# - Neither the name of the copyright holder nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+# *****************************************************************************
+
+# distutils: language = c++
+# cython: language_level=3
+
+cdef bint _is_buffer(object o)
+
+cdef Py_ssize_t _slice_len(
+    Py_ssize_t sl_start,
+    Py_ssize_t sl_stop,
+    Py_ssize_t sl_step
+)
+
+cdef bint _is_integral(object x) except *
+
+cdef bint _is_boolean(object x) except *
diff --git a/dpnp/tensor/_slicing.pyx b/dpnp/tensor/_slicing.pyx
@@ -26,11 +26,15 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 # *****************************************************************************
 
-import numbers
+# distutils: language = c++
+# cython: language_level=3
+
 from operator import index
 from cpython.buffer cimport PyObject_CheckBuffer
 from numpy import ndarray
 
+from ._usmarray cimport usm_ndarray
+
 
 cdef bint _is_buffer(object o):
     return PyObject_CheckBuffer(o)
diff --git a/dpnp/tensor/_stride_utils.pxd b/dpnp/tensor/_stride_utils.pxd
@@ -0,0 +1,54 @@
+# *****************************************************************************
+# Copyright (c) 2026, Intel Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# - Neither the name of the copyright holder nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+# *****************************************************************************
+
+# distutils: language = c++
+# cython: language_level=3
+
+cdef int ERROR_MALLOC
+cdef int ERROR_INTERNAL
+cdef int ERROR_INCORRECT_ORDER
+cdef int ERROR_UNEXPECTED_STRIDES
+
+cdef Py_ssize_t shape_to_elem_count(int nd, Py_ssize_t *shape_arr)
+
+cdef int _from_input_shape_strides(
+    int nd, object shape, object strides, int itemsize, char order,
+    Py_ssize_t **shape_ptr, Py_ssize_t **strides_ptr,
+    Py_ssize_t *nelems, Py_ssize_t *min_disp, Py_ssize_t *max_disp,
+    int *contig
+)
+
+cdef object _make_int_tuple(int nd, const Py_ssize_t *ary)
+
+cdef object _make_reversed_int_tuple(int nd, const Py_ssize_t *ary)
+
+cdef object _c_contig_strides(int nd, Py_ssize_t *shape)
+
+cdef object _f_contig_strides(int nd, Py_ssize_t *shape)
+
+cdef object _swap_last_two(tuple t)
diff --git a/dpnp/tensor/_stride_utils.pyx b/dpnp/tensor/_stride_utils.pyx
@@ -29,20 +29,23 @@
 # distutils: language = c++
 # cython: language_level=3
 
-from cpython.mem cimport PyMem_Malloc
+from cpython.mem cimport PyMem_Free, PyMem_Malloc
 from cpython.ref cimport Py_INCREF
 from cpython.tuple cimport PyTuple_New, PyTuple_SetItem
 
 
+cdef extern from "usm_ndarray_constants.h":
+    int USM_ARRAY_C_CONTIGUOUS_VALUE
+    int USM_ARRAY_F_CONTIGUOUS_VALUE
+
+cdef int USM_ARRAY_C_CONTIGUOUS = USM_ARRAY_C_CONTIGUOUS_VALUE
+cdef int USM_ARRAY_F_CONTIGUOUS = USM_ARRAY_F_CONTIGUOUS_VALUE
+
 cdef int ERROR_MALLOC = 1
 cdef int ERROR_INTERNAL = -1
 cdef int ERROR_INCORRECT_ORDER = 2
 cdef int ERROR_UNEXPECTED_STRIDES = 3
 
-cdef int USM_ARRAY_C_CONTIGUOUS = 1
-cdef int USM_ARRAY_F_CONTIGUOUS = 2
-cdef int USM_ARRAY_WRITABLE = 4
-
 
 cdef Py_ssize_t shape_to_elem_count(int nd, Py_ssize_t *shape_arr):
     """
diff --git a/dpnp/tensor/_types.pxd b/dpnp/tensor/_types.pxd
@@ -0,0 +1,41 @@
+# *****************************************************************************
+# Copyright (c) 2026, Intel Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# - Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# - Neither the name of the copyright holder nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+# *****************************************************************************
+
+# distutils: language = c++
+# cython: language_level=3
+
+
+cdef int type_bytesize(int typenum)
+
+cdef str _make_typestr(int typenum)
+
+cdef int typenum_from_format(str s)
+
+cdef int descr_to_typenum(object dtype)
+
+cdef int dtype_to_typenum(dtype)
diff --git a/dpnp/tensor/_types.pyx b/dpnp/tensor/_types.pyx
@@ -26,25 +26,11 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 # *****************************************************************************
 
-# these typenum values are aligned to values in NumPy
-cdef:
-    int UAR_BOOL = 0  # pragma: no cover
-    int UAR_BYTE = 1  # pragma: no cover
-    int UAR_UBYTE = 2  # pragma: no cover
-    int UAR_SHORT = 3  # pragma: no cover
-    int UAR_USHORT = 4  # pragma: no cover
-    int UAR_INT = 5  # pragma: no cover
-    int UAR_UINT = 6  # pragma: no cover
-    int UAR_LONG = 7  # pragma: no cover
-    int UAR_ULONG = 8  # pragma: no cover
-    int UAR_LONGLONG = 9  # pragma: no cover
-    int UAR_ULONGLONG = 10  # pragma: no cover
-    int UAR_FLOAT = 11  # pragma: no cover
-    int UAR_DOUBLE = 12  # pragma: no cover
-    int UAR_CFLOAT = 14  # pragma: no cover
-    int UAR_CDOUBLE = 15  # pragma: no cover
-    int UAR_TYPE_SENTINEL = 17  # pragma: no cover
-    int UAR_HALF = 23  # pragma: no cover
+# distutils: language = c++
+# cython: language_level=3
+
+import numpy as np
+
 
 cdef int type_bytesize(int typenum):
     """
diff --git a/dpnp/tensor/_usmarray.pxd b/dpnp/tensor/_usmarray.pxd
@@ -32,6 +32,29 @@
 cimport dpctl
 
 
+cdef extern from "usm_ndarray_constants.h":
+    int USM_ARRAY_C_CONTIGUOUS_VALUE
+    int USM_ARRAY_F_CONTIGUOUS_VALUE
+    int USM_ARRAY_WRITABLE_VALUE
+
+    int UAR_BOOL_VALUE
+    int UAR_BYTE_VALUE
+    int UAR_UBYTE_VALUE
+    int UAR_SHORT_VALUE
+    int UAR_USHORT_VALUE
+    int UAR_INT_VALUE
+    int UAR_UINT_VALUE
+    int UAR_LONG_VALUE
+    int UAR_ULONG_VALUE
+    int UAR_LONGLONG_VALUE
+    int UAR_ULONGLONG_VALUE
+    int UAR_FLOAT_VALUE
+    int UAR_DOUBLE_VALUE
+    int UAR_CFLOAT_VALUE
+    int UAR_CDOUBLE_VALUE
+    int UAR_TYPE_SENTINEL_VALUE
+    int UAR_HALF_VALUE
+
 cdef public api int USM_ARRAY_C_CONTIGUOUS
 cdef public api int USM_ARRAY_F_CONTIGUOUS
 cdef public api int USM_ARRAY_WRITABLE
diff --git a/dpnp/tensor/_usmarray.pyx b/dpnp/tensor/_usmarray.pyx
diff --git a/dpnp/tensor/include/usm_ndarray_constants.h b/dpnp/tensor/include/usm_ndarray_constants.h
diff --git a/dpnp/tests/tensor/test_usm_ndarray_ctor.py b/dpnp/tests/tensor/test_usm_ndarray_ctor.py
