File mayavi-pr1303-cython-np2.patch of Package mayavi
From f5543b6b78f691168c8697253031d646dd4d871c Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 28 May 2024 13:37:01 -0400
Subject: [PATCH 1/3] MAINT: Compile with Cython 3.0.10
---
tvtk/src/array_ext.c | 1236 +++++++++++++++++++++++++++++++-----------
1 file changed, 931 insertions(+), 305 deletions(-)
Index: mayavi-4.8.2/tvtk/src/array_ext.c
===================================================================
--- mayavi-4.8.2.orig/tvtk/src/array_ext.c
+++ mayavi-4.8.2/tvtk/src/array_ext.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 3.0.8 */
+/* Generated by Cython 3.0.10 */
#ifndef PY_SSIZE_T_CLEAN
#define PY_SSIZE_T_CLEAN
@@ -24,10 +24,10 @@
#else
#define __PYX_EXTRA_ABI_MODULE_NAME ""
#endif
-#define CYTHON_ABI "3_0_8" __PYX_EXTRA_ABI_MODULE_NAME
+#define CYTHON_ABI "3_0_10" __PYX_EXTRA_ABI_MODULE_NAME
#define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
#define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
-#define CYTHON_HEX_VERSION 0x030008F0
+#define CYTHON_HEX_VERSION 0x03000AF0
#define CYTHON_FUTURE_DIVISION 1
#include <stddef.h>
#ifndef offsetof
@@ -119,6 +119,8 @@
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
#define CYTHON_UPDATE_DESCRIPTOR_DOC 0
#endif
+ #undef CYTHON_USE_FREELISTS
+ #define CYTHON_USE_FREELISTS 0
#elif defined(PYPY_VERSION)
#define CYTHON_COMPILING_IN_PYPY 1
#define CYTHON_COMPILING_IN_CPYTHON 0
@@ -180,6 +182,8 @@
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
#define CYTHON_UPDATE_DESCRIPTOR_DOC 0
#endif
+ #undef CYTHON_USE_FREELISTS
+ #define CYTHON_USE_FREELISTS 0
#elif defined(CYTHON_LIMITED_API)
#ifdef Py_LIMITED_API
#undef __PYX_LIMITED_VERSION_HEX
@@ -241,6 +245,8 @@
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
#define CYTHON_UPDATE_DESCRIPTOR_DOC 0
#endif
+ #undef CYTHON_USE_FREELISTS
+ #define CYTHON_USE_FREELISTS 0
#elif defined(Py_GIL_DISABLED) || defined(Py_NOGIL)
#define CYTHON_COMPILING_IN_PYPY 0
#define CYTHON_COMPILING_IN_CPYTHON 0
@@ -250,11 +256,17 @@
#ifndef CYTHON_USE_TYPE_SLOTS
#define CYTHON_USE_TYPE_SLOTS 1
#endif
+ #ifndef CYTHON_USE_TYPE_SPECS
+ #define CYTHON_USE_TYPE_SPECS 0
+ #endif
#undef CYTHON_USE_PYTYPE_LOOKUP
#define CYTHON_USE_PYTYPE_LOOKUP 0
#ifndef CYTHON_USE_ASYNC_SLOTS
#define CYTHON_USE_ASYNC_SLOTS 1
#endif
+ #ifndef CYTHON_USE_PYLONG_INTERNALS
+ #define CYTHON_USE_PYLONG_INTERNALS 0
+ #endif
#undef CYTHON_USE_PYLIST_INTERNALS
#define CYTHON_USE_PYLIST_INTERNALS 0
#ifndef CYTHON_USE_UNICODE_INTERNALS
@@ -262,8 +274,6 @@
#endif
#undef CYTHON_USE_UNICODE_WRITER
#define CYTHON_USE_UNICODE_WRITER 0
- #undef CYTHON_USE_PYLONG_INTERNALS
- #define CYTHON_USE_PYLONG_INTERNALS 0
#ifndef CYTHON_AVOID_BORROWED_REFS
#define CYTHON_AVOID_BORROWED_REFS 0
#endif
@@ -275,11 +285,22 @@
#endif
#undef CYTHON_FAST_THREAD_STATE
#define CYTHON_FAST_THREAD_STATE 0
+ #undef CYTHON_FAST_GIL
+ #define CYTHON_FAST_GIL 0
+ #ifndef CYTHON_METH_FASTCALL
+ #define CYTHON_METH_FASTCALL 1
+ #endif
#undef CYTHON_FAST_PYCALL
#define CYTHON_FAST_PYCALL 0
+ #ifndef CYTHON_PEP487_INIT_SUBCLASS
+ #define CYTHON_PEP487_INIT_SUBCLASS 1
+ #endif
#ifndef CYTHON_PEP489_MULTI_PHASE_INIT
#define CYTHON_PEP489_MULTI_PHASE_INIT 1
#endif
+ #ifndef CYTHON_USE_MODULE_STATE
+ #define CYTHON_USE_MODULE_STATE 0
+ #endif
#ifndef CYTHON_USE_TP_FINALIZE
#define CYTHON_USE_TP_FINALIZE 1
#endif
@@ -287,6 +308,12 @@
#define CYTHON_USE_DICT_VERSIONS 0
#undef CYTHON_USE_EXC_INFO_STACK
#define CYTHON_USE_EXC_INFO_STACK 0
+ #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
+ #define CYTHON_UPDATE_DESCRIPTOR_DOC 1
+ #endif
+ #ifndef CYTHON_USE_FREELISTS
+ #define CYTHON_USE_FREELISTS 0
+ #endif
#else
#define CYTHON_COMPILING_IN_PYPY 0
#define CYTHON_COMPILING_IN_CPYTHON 1
@@ -377,6 +404,9 @@
#ifndef CYTHON_UPDATE_DESCRIPTOR_DOC
#define CYTHON_UPDATE_DESCRIPTOR_DOC 1
#endif
+ #ifndef CYTHON_USE_FREELISTS
+ #define CYTHON_USE_FREELISTS 1
+ #endif
#endif
#if !defined(CYTHON_FAST_PYCCALL)
#define CYTHON_FAST_PYCCALL (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1)
@@ -720,8 +750,13 @@
typedef PyObject *(*__Pyx_PyCFunctionFastWithKeywords) (PyObject *self, PyObject *const *args,
Py_ssize_t nargs, PyObject *kwnames);
#else
- #define __Pyx_PyCFunctionFast _PyCFunctionFast
- #define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
+ #if PY_VERSION_HEX >= 0x030d00A4
+ # define __Pyx_PyCFunctionFast PyCFunctionFast
+ # define __Pyx_PyCFunctionFastWithKeywords PyCFunctionFastWithKeywords
+ #else
+ # define __Pyx_PyCFunctionFast _PyCFunctionFast
+ # define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
+ #endif
#endif
#if CYTHON_METH_FASTCALL
#define __Pyx_METH_FASTCALL METH_FASTCALL
@@ -1073,7 +1108,7 @@ static CYTHON_INLINE PyObject * __Pyx_Py
#define __Pyx_PyBytes_GET_SIZE(o) PyBytes_Size(o)
#define __Pyx_PyByteArray_GET_SIZE(o) PyByteArray_Size(o)
#endif
-#if PY_VERSION_HEX >= 0x030d00A1
+#if __PYX_LIMITED_VERSION_HEX >= 0x030d00A1
#define __Pyx_PyImport_AddModuleRef(name) PyImport_AddModuleRef(name)
#else
static CYTHON_INLINE PyObject *__Pyx_PyImport_AddModuleRef(const char *name) {
@@ -1160,7 +1195,7 @@ static CYTHON_INLINE float __PYX_NAN() {
#endif
#define __PYX_MARK_ERR_POS(f_index, lineno) \
- { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; }
+ { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; }
#define __PYX_ERR(f_index, lineno, Ln_error) \
{ __PYX_MARK_ERR_POS(f_index, lineno) goto Ln_error; }
@@ -1273,24 +1308,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyU
#define __Pyx_PyByteArray_FromCString(s) __Pyx_PyByteArray_FromString((const char*)s)
#define __Pyx_PyStr_FromCString(s) __Pyx_PyStr_FromString((const char*)s)
#define __Pyx_PyUnicode_FromCString(s) __Pyx_PyUnicode_FromString((const char*)s)
-#if CYTHON_COMPILING_IN_LIMITED_API
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const wchar_t *u)
-{
- const wchar_t *u_end = u;
- while (*u_end++) ;
- return (size_t)(u_end - u - 1);
-}
-#else
-static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u)
-{
- const Py_UNICODE *u_end = u;
- while (*u_end++) ;
- return (size_t)(u_end - u - 1);
-}
-#endif
#define __Pyx_PyUnicode_FromOrdinal(o) PyUnicode_FromOrdinal((int)o)
-#define __Pyx_PyUnicode_FromUnicode(u) PyUnicode_FromUnicode(u, __Pyx_Py_UNICODE_strlen(u))
-#define __Pyx_PyUnicode_FromUnicodeAndLength PyUnicode_FromUnicode
#define __Pyx_PyUnicode_AsUnicode PyUnicode_AsUnicode
#define __Pyx_NewRef(obj) (Py_INCREF(obj), obj)
#define __Pyx_Owned_Py_None(b) __Pyx_NewRef(Py_None)
@@ -1493,7 +1511,7 @@ static const char *__pyx_f[] = {
/* #### Code section: numeric_typedefs ### */
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":730
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":770
* # in Cython to enable them only on the right systems.
*
* ctypedef npy_int8 int8_t # <<<<<<<<<<<<<<
@@ -1502,7 +1520,7 @@ static const char *__pyx_f[] = {
*/
typedef npy_int8 __pyx_t_5numpy_int8_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":731
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771
*
* ctypedef npy_int8 int8_t
* ctypedef npy_int16 int16_t # <<<<<<<<<<<<<<
@@ -1511,7 +1529,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
*/
typedef npy_int16 __pyx_t_5numpy_int16_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":732
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":772
* ctypedef npy_int8 int8_t
* ctypedef npy_int16 int16_t
* ctypedef npy_int32 int32_t # <<<<<<<<<<<<<<
@@ -1520,7 +1538,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t
*/
typedef npy_int32 __pyx_t_5numpy_int32_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":733
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773
* ctypedef npy_int16 int16_t
* ctypedef npy_int32 int32_t
* ctypedef npy_int64 int64_t # <<<<<<<<<<<<<<
@@ -1529,7 +1547,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t
*/
typedef npy_int64 __pyx_t_5numpy_int64_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":737
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777
* #ctypedef npy_int128 int128_t
*
* ctypedef npy_uint8 uint8_t # <<<<<<<<<<<<<<
@@ -1538,7 +1556,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t
*/
typedef npy_uint8 __pyx_t_5numpy_uint8_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":738
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":778
*
* ctypedef npy_uint8 uint8_t
* ctypedef npy_uint16 uint16_t # <<<<<<<<<<<<<<
@@ -1547,7 +1565,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t
*/
typedef npy_uint16 __pyx_t_5numpy_uint16_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":739
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779
* ctypedef npy_uint8 uint8_t
* ctypedef npy_uint16 uint16_t
* ctypedef npy_uint32 uint32_t # <<<<<<<<<<<<<<
@@ -1556,7 +1574,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16
*/
typedef npy_uint32 __pyx_t_5numpy_uint32_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":740
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780
* ctypedef npy_uint16 uint16_t
* ctypedef npy_uint32 uint32_t
* ctypedef npy_uint64 uint64_t # <<<<<<<<<<<<<<
@@ -1565,7 +1583,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32
*/
typedef npy_uint64 __pyx_t_5numpy_uint64_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":744
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":784
* #ctypedef npy_uint128 uint128_t
*
* ctypedef npy_float32 float32_t # <<<<<<<<<<<<<<
@@ -1574,7 +1592,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64
*/
typedef npy_float32 __pyx_t_5numpy_float32_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":745
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785
*
* ctypedef npy_float32 float32_t
* ctypedef npy_float64 float64_t # <<<<<<<<<<<<<<
@@ -1583,43 +1601,25 @@ typedef npy_float32 __pyx_t_5numpy_float
*/
typedef npy_float64 __pyx_t_5numpy_float64_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":754
- * # The int types are mapped a bit surprising --
- * # numpy.int corresponds to 'l' and numpy.long to 'q'
- * ctypedef npy_long int_t # <<<<<<<<<<<<<<
- * ctypedef npy_longlong longlong_t
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792
+ * ctypedef double complex complex128_t
*
- */
-typedef npy_long __pyx_t_5numpy_int_t;
-
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":755
- * # numpy.int corresponds to 'l' and numpy.long to 'q'
- * ctypedef npy_long int_t
* ctypedef npy_longlong longlong_t # <<<<<<<<<<<<<<
- *
- * ctypedef npy_ulong uint_t
- */
-typedef npy_longlong __pyx_t_5numpy_longlong_t;
-
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":757
- * ctypedef npy_longlong longlong_t
- *
- * ctypedef npy_ulong uint_t # <<<<<<<<<<<<<<
* ctypedef npy_ulonglong ulonglong_t
*
*/
-typedef npy_ulong __pyx_t_5numpy_uint_t;
+typedef npy_longlong __pyx_t_5numpy_longlong_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":758
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":793
*
- * ctypedef npy_ulong uint_t
+ * ctypedef npy_longlong longlong_t
* ctypedef npy_ulonglong ulonglong_t # <<<<<<<<<<<<<<
*
* ctypedef npy_intp intp_t
*/
typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":760
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":795
* ctypedef npy_ulonglong ulonglong_t
*
* ctypedef npy_intp intp_t # <<<<<<<<<<<<<<
@@ -1628,7 +1628,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulo
*/
typedef npy_intp __pyx_t_5numpy_intp_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":761
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":796
*
* ctypedef npy_intp intp_t
* ctypedef npy_uintp uintp_t # <<<<<<<<<<<<<<
@@ -1637,7 +1637,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
*/
typedef npy_uintp __pyx_t_5numpy_uintp_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":763
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":798
* ctypedef npy_uintp uintp_t
*
* ctypedef npy_double float_t # <<<<<<<<<<<<<<
@@ -1646,7 +1646,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t
*/
typedef npy_double __pyx_t_5numpy_float_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":764
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":799
*
* ctypedef npy_double float_t
* ctypedef npy_double double_t # <<<<<<<<<<<<<<
@@ -1655,12 +1655,12 @@ typedef npy_double __pyx_t_5numpy_float_
*/
typedef npy_double __pyx_t_5numpy_double_t;
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":765
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":800
* ctypedef npy_double float_t
* ctypedef npy_double double_t
* ctypedef npy_longdouble longdouble_t # <<<<<<<<<<<<<<
*
- * ctypedef npy_cfloat cfloat_t
+ * ctypedef float complex cfloat_t
*/
typedef npy_longdouble __pyx_t_5numpy_longdouble_t;
/* #### Code section: complex_type_declarations ### */
@@ -1688,45 +1688,39 @@ static CYTHON_INLINE __pyx_t_float_compl
#endif
static CYTHON_INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(double, double);
+/* Declarations.proto */
+#if CYTHON_CCOMPLEX && (1) && (!0 || __cplusplus)
+ #ifdef __cplusplus
+ typedef ::std::complex< long double > __pyx_t_long_double_complex;
+ #else
+ typedef long double _Complex __pyx_t_long_double_complex;
+ #endif
+#else
+ typedef struct { long double real, imag; } __pyx_t_long_double_complex;
+#endif
+static CYTHON_INLINE __pyx_t_long_double_complex __pyx_t_long_double_complex_from_parts(long double, long double);
+
/* #### Code section: type_declarations ### */
/*--- Type declarations ---*/
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":767
- * ctypedef npy_longdouble longdouble_t
- *
- * ctypedef npy_cfloat cfloat_t # <<<<<<<<<<<<<<
- * ctypedef npy_cdouble cdouble_t
- * ctypedef npy_clongdouble clongdouble_t
- */
-typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
-
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":768
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1096
*
- * ctypedef npy_cfloat cfloat_t
- * ctypedef npy_cdouble cdouble_t # <<<<<<<<<<<<<<
- * ctypedef npy_clongdouble clongdouble_t
+ * # Iterator API added in v1.6
+ * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil # <<<<<<<<<<<<<<
+ * ctypedef void (*NpyIter_GetMultiIndexFunc)(NpyIter* it, npy_intp* outcoords) noexcept nogil
*
*/
-typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
+typedef int (*__pyx_t_5numpy_NpyIter_IterNextFunc)(NpyIter *);
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":769
- * ctypedef npy_cfloat cfloat_t
- * ctypedef npy_cdouble cdouble_t
- * ctypedef npy_clongdouble clongdouble_t # <<<<<<<<<<<<<<
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1097
+ * # Iterator API added in v1.6
+ * ctypedef int (*NpyIter_IterNextFunc)(NpyIter* it) noexcept nogil
+ * ctypedef void (*NpyIter_GetMultiIndexFunc)(NpyIter* it, npy_intp* outcoords) noexcept nogil # <<<<<<<<<<<<<<
*
- * ctypedef npy_cdouble complex_t
+ * cdef extern from "numpy/arrayobject.h":
*/
-typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t;
-
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":771
- * ctypedef npy_clongdouble clongdouble_t
- *
- * ctypedef npy_cdouble complex_t # <<<<<<<<<<<<<<
- *
- * cdef inline object PyArray_MultiIterNew1(a):
- */
-typedef npy_cdouble __pyx_t_5numpy_complex_t;
+typedef void (*__pyx_t_5numpy_NpyIter_GetMultiIndexFunc)(NpyIter *, npy_intp *);
/* #### Code section: utility_code_proto ### */
/* --- Runtime support code (head) --- */
@@ -2163,22 +2157,22 @@ static CYTHON_INLINE int __Pyx_TypeTest(
static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg);
/* TypeImport.proto */
-#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_8
-#define __PYX_HAVE_RT_ImportType_proto_3_0_8
+#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_10
+#define __PYX_HAVE_RT_ImportType_proto_3_0_10
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
#include <stdalign.h>
#endif
#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L
-#define __PYX_GET_STRUCT_ALIGNMENT_3_0_8(s) alignof(s)
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_10(s) alignof(s)
#else
-#define __PYX_GET_STRUCT_ALIGNMENT_3_0_8(s) sizeof(void*)
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_10(s) sizeof(void*)
#endif
-enum __Pyx_ImportType_CheckSize_3_0_8 {
- __Pyx_ImportType_CheckSize_Error_3_0_8 = 0,
- __Pyx_ImportType_CheckSize_Warn_3_0_8 = 1,
- __Pyx_ImportType_CheckSize_Ignore_3_0_8 = 2
+enum __Pyx_ImportType_CheckSize_3_0_10 {
+ __Pyx_ImportType_CheckSize_Error_3_0_10 = 0,
+ __Pyx_ImportType_CheckSize_Warn_3_0_10 = 1,
+ __Pyx_ImportType_CheckSize_Ignore_3_0_10 = 2
};
-static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_8 check_size);
+static PyTypeObject *__Pyx_ImportType_3_0_10(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_10 check_size);
#endif
/* IncludeStructmemberH.proto */
@@ -2460,6 +2454,44 @@ static void __Pyx_AddTraceback(const cha
#endif
#endif
+/* Arithmetic.proto */
+#if CYTHON_CCOMPLEX && (1) && (!0 || __cplusplus)
+ #define __Pyx_c_eq_long__double(a, b) ((a)==(b))
+ #define __Pyx_c_sum_long__double(a, b) ((a)+(b))
+ #define __Pyx_c_diff_long__double(a, b) ((a)-(b))
+ #define __Pyx_c_prod_long__double(a, b) ((a)*(b))
+ #define __Pyx_c_quot_long__double(a, b) ((a)/(b))
+ #define __Pyx_c_neg_long__double(a) (-(a))
+ #ifdef __cplusplus
+ #define __Pyx_c_is_zero_long__double(z) ((z)==(long double)0)
+ #define __Pyx_c_conj_long__double(z) (::std::conj(z))
+ #if 1
+ #define __Pyx_c_abs_long__double(z) (::std::abs(z))
+ #define __Pyx_c_pow_long__double(a, b) (::std::pow(a, b))
+ #endif
+ #else
+ #define __Pyx_c_is_zero_long__double(z) ((z)==0)
+ #define __Pyx_c_conj_long__double(z) (conjl(z))
+ #if 1
+ #define __Pyx_c_abs_long__double(z) (cabsl(z))
+ #define __Pyx_c_pow_long__double(a, b) (cpowl(a, b))
+ #endif
+ #endif
+#else
+ static CYTHON_INLINE int __Pyx_c_eq_long__double(__pyx_t_long_double_complex, __pyx_t_long_double_complex);
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_sum_long__double(__pyx_t_long_double_complex, __pyx_t_long_double_complex);
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_diff_long__double(__pyx_t_long_double_complex, __pyx_t_long_double_complex);
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_prod_long__double(__pyx_t_long_double_complex, __pyx_t_long_double_complex);
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_quot_long__double(__pyx_t_long_double_complex, __pyx_t_long_double_complex);
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_neg_long__double(__pyx_t_long_double_complex);
+ static CYTHON_INLINE int __Pyx_c_is_zero_long__double(__pyx_t_long_double_complex);
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_conj_long__double(__pyx_t_long_double_complex);
+ #if 1
+ static CYTHON_INLINE long double __Pyx_c_abs_long__double(__pyx_t_long_double_complex);
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_pow_long__double(__pyx_t_long_double_complex, __pyx_t_long_double_complex);
+ #endif
+#endif
+
/* CIntToPy.proto */
static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value);
@@ -2507,6 +2539,18 @@ static int __Pyx_check_binary_version(un
static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
/* #### Code section: module_declarations ### */
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_Descr *__pyx_v_self); /* proto*/
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray_Descr *__pyx_v_self); /* proto*/
+static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Descr *__pyx_v_self); /* proto*/
+static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr *__pyx_v_self); /* proto*/
+static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarray(PyArray_Descr *__pyx_v_self); /* proto*/
+static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr *__pyx_v_self); /* proto*/
+static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMultiIterObject *__pyx_v_self); /* proto*/
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiIterObject *__pyx_v_self); /* proto*/
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMultiIterObject *__pyx_v_self); /* proto*/
+static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject *__pyx_v_self); /* proto*/
+static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions(PyArrayMultiIterObject *__pyx_v_self); /* proto*/
+static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiIterObject *__pyx_v_self); /* proto*/
static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self); /* proto*/
static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArrayObject *__pyx_v_self); /* proto*/
static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self); /* proto*/
@@ -2587,9 +2631,9 @@ static const char __pyx_k_cline_in_trace
static const char __pyx_k_out_array_must_be_contiguous[] = "out_array must be contiguous.";
static const char __pyx_k_Unsupported_VTK_ID_TYPE_SIZE_d[] = "Unsupported VTK_ID_TYPE_SIZE=%d";
static const char __pyx_k_A_Cython_extension_module_for_n[] = "\nA Cython extension module for numpy. Currently this extension module\nallows us to massage a 2D scipy array into a form usable as a\n`vtkIdTypeArray`. This is then used to set the cells of a\n`vtkCellArray` instance.\n";
-static const char __pyx_k_numpy_core_multiarray_failed_to[] = "numpy.core.multiarray failed to import";
static const char __pyx_k_id_array_must_be_a_two_dimension[] = "id_array must be a two dimensional array.";
-static const char __pyx_k_numpy_core_umath_failed_to_impor[] = "numpy.core.umath failed to import";
+static const char __pyx_k_numpy__core_multiarray_failed_to[] = "numpy._core.multiarray failed to import";
+static const char __pyx_k_numpy__core_umath_failed_to_impo[] = "numpy._core.umath failed to import";
static const char __pyx_k_out_array_size_is_incorrect_expe[] = "out_array size is incorrect, expected: ";
/* #### Code section: decls ### */
static PyObject *__pyx_pf_9array_ext_set_id_type_array(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_id_array, PyObject *__pyx_v_out_array); /* proto */
@@ -2684,8 +2728,8 @@ typedef struct {
PyObject *__pyx_n_s_main;
PyObject *__pyx_n_s_name;
PyObject *__pyx_n_s_numpy;
- PyObject *__pyx_kp_u_numpy_core_multiarray_failed_to;
- PyObject *__pyx_kp_u_numpy_core_umath_failed_to_impor;
+ PyObject *__pyx_kp_u_numpy__core_multiarray_failed_to;
+ PyObject *__pyx_kp_u_numpy__core_umath_failed_to_impo;
PyObject *__pyx_n_s_out_array;
PyObject *__pyx_kp_u_out_array_must_be_contiguous;
PyObject *__pyx_kp_u_out_array_size_is_incorrect_expe;
@@ -2791,8 +2835,8 @@ static int __pyx_m_clear(PyObject *m) {
Py_CLEAR(clear_module_state->__pyx_n_s_main);
Py_CLEAR(clear_module_state->__pyx_n_s_name);
Py_CLEAR(clear_module_state->__pyx_n_s_numpy);
- Py_CLEAR(clear_module_state->__pyx_kp_u_numpy_core_multiarray_failed_to);
- Py_CLEAR(clear_module_state->__pyx_kp_u_numpy_core_umath_failed_to_impor);
+ Py_CLEAR(clear_module_state->__pyx_kp_u_numpy__core_multiarray_failed_to);
+ Py_CLEAR(clear_module_state->__pyx_kp_u_numpy__core_umath_failed_to_impo);
Py_CLEAR(clear_module_state->__pyx_n_s_out_array);
Py_CLEAR(clear_module_state->__pyx_kp_u_out_array_must_be_contiguous);
Py_CLEAR(clear_module_state->__pyx_kp_u_out_array_size_is_incorrect_expe);
@@ -2876,8 +2920,8 @@ static int __pyx_m_traverse(PyObject *m,
Py_VISIT(traverse_module_state->__pyx_n_s_main);
Py_VISIT(traverse_module_state->__pyx_n_s_name);
Py_VISIT(traverse_module_state->__pyx_n_s_numpy);
- Py_VISIT(traverse_module_state->__pyx_kp_u_numpy_core_multiarray_failed_to);
- Py_VISIT(traverse_module_state->__pyx_kp_u_numpy_core_umath_failed_to_impor);
+ Py_VISIT(traverse_module_state->__pyx_kp_u_numpy__core_multiarray_failed_to);
+ Py_VISIT(traverse_module_state->__pyx_kp_u_numpy__core_umath_failed_to_impo);
Py_VISIT(traverse_module_state->__pyx_n_s_out_array);
Py_VISIT(traverse_module_state->__pyx_kp_u_out_array_must_be_contiguous);
Py_VISIT(traverse_module_state->__pyx_kp_u_out_array_size_is_incorrect_expe);
@@ -2989,8 +3033,8 @@ static int __pyx_m_traverse(PyObject *m,
#define __pyx_n_s_main __pyx_mstate_global->__pyx_n_s_main
#define __pyx_n_s_name __pyx_mstate_global->__pyx_n_s_name
#define __pyx_n_s_numpy __pyx_mstate_global->__pyx_n_s_numpy
-#define __pyx_kp_u_numpy_core_multiarray_failed_to __pyx_mstate_global->__pyx_kp_u_numpy_core_multiarray_failed_to
-#define __pyx_kp_u_numpy_core_umath_failed_to_impor __pyx_mstate_global->__pyx_kp_u_numpy_core_umath_failed_to_impor
+#define __pyx_kp_u_numpy__core_multiarray_failed_to __pyx_mstate_global->__pyx_kp_u_numpy__core_multiarray_failed_to
+#define __pyx_kp_u_numpy__core_umath_failed_to_impo __pyx_mstate_global->__pyx_kp_u_numpy__core_umath_failed_to_impo
#define __pyx_n_s_out_array __pyx_mstate_global->__pyx_n_s_out_array
#define __pyx_kp_u_out_array_must_be_contiguous __pyx_mstate_global->__pyx_kp_u_out_array_must_be_contiguous
#define __pyx_kp_u_out_array_size_is_incorrect_expe __pyx_mstate_global->__pyx_kp_u_out_array_size_is_incorrect_expe
@@ -3012,10 +3056,434 @@ static int __pyx_m_traverse(PyObject *m,
#define __pyx_codeobj__5 __pyx_mstate_global->__pyx_codeobj__5
/* #### Code section: module_code ### */
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+ *
+ * @property
+ * cdef inline npy_intp itemsize(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * return PyDataType_ELSIZE(self)
+ *
+ */
+
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_Descr *__pyx_v_self) {
+ npy_intp __pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":287
+ * @property
+ * cdef inline npy_intp itemsize(self) noexcept nogil:
+ * return PyDataType_ELSIZE(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __pyx_r = PyDataType_ELSIZE(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":286
+ *
+ * @property
+ * cdef inline npy_intp itemsize(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * return PyDataType_ELSIZE(self)
+ *
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
+ *
+ * @property
+ * cdef inline npy_intp alignment(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * return PyDataType_ALIGNMENT(self)
+ *
+ */
+
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray_Descr *__pyx_v_self) {
+ npy_intp __pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":291
+ * @property
+ * cdef inline npy_intp alignment(self) noexcept nogil:
+ * return PyDataType_ALIGNMENT(self) # <<<<<<<<<<<<<<
+ *
+ * # Use fields/names with care as they may be NULL. You must check
+ */
+ __pyx_r = PyDataType_ALIGNMENT(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290
*
* @property
- * cdef inline PyObject* base(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_intp alignment(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * return PyDataType_ALIGNMENT(self)
+ *
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+ * # for this using PyDataType_HASFIELDS.
+ * @property
+ * cdef inline object fields(self): # <<<<<<<<<<<<<<
+ * return <object>PyDataType_FIELDS(self)
+ *
+ */
+
+static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Descr *__pyx_v_self) {
+ PyObject *__pyx_r = NULL;
+ __Pyx_RefNannyDeclarations
+ PyObject *__pyx_t_1;
+ __Pyx_RefNannySetupContext("fields", 1);
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":297
+ * @property
+ * cdef inline object fields(self):
+ * return <object>PyDataType_FIELDS(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __Pyx_XDECREF(__pyx_r);
+ __pyx_t_1 = PyDataType_FIELDS(__pyx_v_self);
+ __Pyx_INCREF(((PyObject *)__pyx_t_1));
+ __pyx_r = ((PyObject *)__pyx_t_1);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":296
+ * # for this using PyDataType_HASFIELDS.
+ * @property
+ * cdef inline object fields(self): # <<<<<<<<<<<<<<
+ * return <object>PyDataType_FIELDS(self)
+ *
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ __Pyx_XGIVEREF(__pyx_r);
+ __Pyx_RefNannyFinishContext();
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+ *
+ * @property
+ * cdef inline tuple names(self): # <<<<<<<<<<<<<<
+ * return <tuple>PyDataType_NAMES(self)
+ *
+ */
+
+static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr *__pyx_v_self) {
+ PyObject *__pyx_r = NULL;
+ __Pyx_RefNannyDeclarations
+ PyObject *__pyx_t_1;
+ __Pyx_RefNannySetupContext("names", 1);
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":301
+ * @property
+ * cdef inline tuple names(self):
+ * return <tuple>PyDataType_NAMES(self) # <<<<<<<<<<<<<<
+ *
+ * # Use PyDataType_HASSUBARRAY to test whether this field is
+ */
+ __Pyx_XDECREF(__pyx_r);
+ __pyx_t_1 = PyDataType_NAMES(__pyx_v_self);
+ __Pyx_INCREF(((PyObject*)__pyx_t_1));
+ __pyx_r = ((PyObject*)__pyx_t_1);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":300
+ *
+ * @property
+ * cdef inline tuple names(self): # <<<<<<<<<<<<<<
+ * return <tuple>PyDataType_NAMES(self)
+ *
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ __Pyx_XGIVEREF(__pyx_r);
+ __Pyx_RefNannyFinishContext();
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+ * # this field via the inline helper method PyDataType_SHAPE.
+ * @property
+ * cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * return PyDataType_SUBARRAY(self)
+ *
+ */
+
+static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarray(PyArray_Descr *__pyx_v_self) {
+ PyArray_ArrayDescr *__pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":308
+ * @property
+ * cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil:
+ * return PyDataType_SUBARRAY(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __pyx_r = PyDataType_SUBARRAY(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":307
+ * # this field via the inline helper method PyDataType_SHAPE.
+ * @property
+ * cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * return PyDataType_SUBARRAY(self)
+ *
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+ *
+ * @property
+ * cdef inline npy_uint64 flags(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The data types flags."""
+ * return PyDataType_FLAGS(self)
+ */
+
+static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr *__pyx_v_self) {
+ npy_uint64 __pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":313
+ * cdef inline npy_uint64 flags(self) noexcept nogil:
+ * """The data types flags."""
+ * return PyDataType_FLAGS(self) # <<<<<<<<<<<<<<
+ *
+ *
+ */
+ __pyx_r = PyDataType_FLAGS(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":311
+ *
+ * @property
+ * cdef inline npy_uint64 flags(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The data types flags."""
+ * return PyDataType_FLAGS(self)
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+ *
+ * @property
+ * cdef inline int numiter(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The number of arrays that need to be broadcast to the same shape."""
+ * return PyArray_MultiIter_NUMITER(self)
+ */
+
+static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMultiIterObject *__pyx_v_self) {
+ int __pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":325
+ * cdef inline int numiter(self) noexcept nogil:
+ * """The number of arrays that need to be broadcast to the same shape."""
+ * return PyArray_MultiIter_NUMITER(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __pyx_r = PyArray_MultiIter_NUMITER(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":323
+ *
+ * @property
+ * cdef inline int numiter(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The number of arrays that need to be broadcast to the same shape."""
+ * return PyArray_MultiIter_NUMITER(self)
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+ *
+ * @property
+ * cdef inline npy_intp size(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The total broadcasted size."""
+ * return PyArray_MultiIter_SIZE(self)
+ */
+
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiIterObject *__pyx_v_self) {
+ npy_intp __pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":330
+ * cdef inline npy_intp size(self) noexcept nogil:
+ * """The total broadcasted size."""
+ * return PyArray_MultiIter_SIZE(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __pyx_r = PyArray_MultiIter_SIZE(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":328
+ *
+ * @property
+ * cdef inline npy_intp size(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The total broadcasted size."""
+ * return PyArray_MultiIter_SIZE(self)
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+ *
+ * @property
+ * cdef inline npy_intp index(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The current (1-d) index into the broadcasted result."""
+ * return PyArray_MultiIter_INDEX(self)
+ */
+
+static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMultiIterObject *__pyx_v_self) {
+ npy_intp __pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":335
+ * cdef inline npy_intp index(self) noexcept nogil:
+ * """The current (1-d) index into the broadcasted result."""
+ * return PyArray_MultiIter_INDEX(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __pyx_r = PyArray_MultiIter_INDEX(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":333
+ *
+ * @property
+ * cdef inline npy_intp index(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The current (1-d) index into the broadcasted result."""
+ * return PyArray_MultiIter_INDEX(self)
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+ *
+ * @property
+ * cdef inline int nd(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The number of dimensions in the broadcasted result."""
+ * return PyArray_MultiIter_NDIM(self)
+ */
+
+static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject *__pyx_v_self) {
+ int __pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":340
+ * cdef inline int nd(self) noexcept nogil:
+ * """The number of dimensions in the broadcasted result."""
+ * return PyArray_MultiIter_NDIM(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __pyx_r = PyArray_MultiIter_NDIM(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":338
+ *
+ * @property
+ * cdef inline int nd(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The number of dimensions in the broadcasted result."""
+ * return PyArray_MultiIter_NDIM(self)
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+ *
+ * @property
+ * cdef inline npy_intp* dimensions(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The shape of the broadcasted result."""
+ * return PyArray_MultiIter_DIMS(self)
+ */
+
+static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions(PyArrayMultiIterObject *__pyx_v_self) {
+ npy_intp *__pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":345
+ * cdef inline npy_intp* dimensions(self) noexcept nogil:
+ * """The shape of the broadcasted result."""
+ * return PyArray_MultiIter_DIMS(self) # <<<<<<<<<<<<<<
+ *
+ * @property
+ */
+ __pyx_r = PyArray_MultiIter_DIMS(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":343
+ *
+ * @property
+ * cdef inline npy_intp* dimensions(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """The shape of the broadcasted result."""
+ * return PyArray_MultiIter_DIMS(self)
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+ *
+ * @property
+ * cdef inline void** iters(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """An array of iterator objects that holds the iterators for the arrays to be broadcast together.
+ * On return, the iterators are adjusted for broadcasting."""
+ */
+
+static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiIterObject *__pyx_v_self) {
+ void **__pyx_r;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":351
+ * """An array of iterator objects that holds the iterators for the arrays to be broadcast together.
+ * On return, the iterators are adjusted for broadcasting."""
+ * return PyArray_MultiIter_ITERS(self) # <<<<<<<<<<<<<<
+ *
+ *
+ */
+ __pyx_r = PyArray_MultiIter_ITERS(__pyx_v_self);
+ goto __pyx_L0;
+
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":348
+ *
+ * @property
+ * cdef inline void** iters(self) noexcept nogil: # <<<<<<<<<<<<<<
+ * """An array of iterator objects that holds the iterators for the arrays to be broadcast together.
+ * On return, the iterators are adjusted for broadcasting."""
+ */
+
+ /* function exit code */
+ __pyx_L0:;
+ return __pyx_r;
+}
+
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
+ *
+ * @property
+ * cdef inline PyObject* base(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns a borrowed reference to the object owning the data/memory.
* """
*/
@@ -3023,7 +3491,7 @@ static int __pyx_m_traverse(PyObject *m,
static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) {
PyObject *__pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":248
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":369
* """Returns a borrowed reference to the object owning the data/memory.
* """
* return PyArray_BASE(self) # <<<<<<<<<<<<<<
@@ -3033,10 +3501,10 @@ static CYTHON_INLINE PyObject *__pyx_f_5
__pyx_r = PyArray_BASE(__pyx_v_self);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":366
*
* @property
- * cdef inline PyObject* base(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline PyObject* base(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns a borrowed reference to the object owning the data/memory.
* """
*/
@@ -3046,7 +3514,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
*
* @property
* cdef inline dtype descr(self): # <<<<<<<<<<<<<<
@@ -3060,7 +3528,7 @@ static CYTHON_INLINE PyArray_Descr *__py
PyArray_Descr *__pyx_t_1;
__Pyx_RefNannySetupContext("descr", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":254
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":375
* """Returns an owned reference to the dtype of the array.
* """
* return <dtype>PyArray_DESCR(self) # <<<<<<<<<<<<<<
@@ -3073,7 +3541,7 @@ static CYTHON_INLINE PyArray_Descr *__py
__pyx_r = ((PyArray_Descr *)__pyx_t_1);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":372
*
* @property
* cdef inline dtype descr(self): # <<<<<<<<<<<<<<
@@ -3088,10 +3556,10 @@ static CYTHON_INLINE PyArray_Descr *__py
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
*
* @property
- * cdef inline int ndim(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline int ndim(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns the number of dimensions in the array.
* """
*/
@@ -3099,7 +3567,7 @@ static CYTHON_INLINE PyArray_Descr *__py
static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) {
int __pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":260
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":381
* """Returns the number of dimensions in the array.
* """
* return PyArray_NDIM(self) # <<<<<<<<<<<<<<
@@ -3109,10 +3577,10 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__pyx_r = PyArray_NDIM(__pyx_v_self);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":378
*
* @property
- * cdef inline int ndim(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline int ndim(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns the number of dimensions in the array.
* """
*/
@@ -3122,10 +3590,10 @@ static CYTHON_INLINE int __pyx_f_5numpy_
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
*
* @property
- * cdef inline npy_intp *shape(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_intp *shape(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns a pointer to the dimensions/shape of the array.
* The number of elements matches the number of dimensions of the array (ndim).
*/
@@ -3133,7 +3601,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) {
npy_intp *__pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":268
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":389
* Can return NULL for 0-dimensional arrays.
* """
* return PyArray_DIMS(self) # <<<<<<<<<<<<<<
@@ -3143,10 +3611,10 @@ static CYTHON_INLINE npy_intp *__pyx_f_5
__pyx_r = PyArray_DIMS(__pyx_v_self);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":384
*
* @property
- * cdef inline npy_intp *shape(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_intp *shape(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns a pointer to the dimensions/shape of the array.
* The number of elements matches the number of dimensions of the array (ndim).
*/
@@ -3156,10 +3624,10 @@ static CYTHON_INLINE npy_intp *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
*
* @property
- * cdef inline npy_intp *strides(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_intp *strides(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns a pointer to the strides of the array.
* The number of elements matches the number of dimensions of the array (ndim).
*/
@@ -3167,7 +3635,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5
static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) {
npy_intp *__pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":275
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":396
* The number of elements matches the number of dimensions of the array (ndim).
* """
* return PyArray_STRIDES(self) # <<<<<<<<<<<<<<
@@ -3177,10 +3645,10 @@ static CYTHON_INLINE npy_intp *__pyx_f_5
__pyx_r = PyArray_STRIDES(__pyx_v_self);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":392
*
* @property
- * cdef inline npy_intp *strides(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_intp *strides(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns a pointer to the strides of the array.
* The number of elements matches the number of dimensions of the array (ndim).
*/
@@ -3190,10 +3658,10 @@ static CYTHON_INLINE npy_intp *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
*
* @property
- * cdef inline npy_intp size(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_intp size(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns the total size (in number of elements) of the array.
* """
*/
@@ -3201,7 +3669,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5
static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) {
npy_intp __pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":281
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":402
* """Returns the total size (in number of elements) of the array.
* """
* return PyArray_SIZE(self) # <<<<<<<<<<<<<<
@@ -3211,10 +3679,10 @@ static CYTHON_INLINE npy_intp __pyx_f_5n
__pyx_r = PyArray_SIZE(__pyx_v_self);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":399
*
* @property
- * cdef inline npy_intp size(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_intp size(self) noexcept nogil: # <<<<<<<<<<<<<<
* """Returns the total size (in number of elements) of the array.
* """
*/
@@ -3224,10 +3692,10 @@ static CYTHON_INLINE npy_intp __pyx_f_5n
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
*
* @property
- * cdef inline char* data(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline char* data(self) noexcept nogil: # <<<<<<<<<<<<<<
* """The pointer to the data buffer as a char*.
* This is provided for legacy reasons to avoid direct struct field access.
*/
@@ -3235,20 +3703,20 @@ static CYTHON_INLINE npy_intp __pyx_f_5n
static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) {
char *__pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":290
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":411
* of `PyArray_DATA()` instead, which returns a 'void*'.
* """
* return PyArray_BYTES(self) # <<<<<<<<<<<<<<
*
- * ctypedef unsigned char npy_bool
+ *
*/
__pyx_r = PyArray_BYTES(__pyx_v_self);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":405
*
* @property
- * cdef inline char* data(self) nogil: # <<<<<<<<<<<<<<
+ * cdef inline char* data(self) noexcept nogil: # <<<<<<<<<<<<<<
* """The pointer to the data buffer as a char*.
* This is provided for legacy reasons to avoid direct struct field access.
*/
@@ -3258,8 +3726,8 @@ static CYTHON_INLINE char *__pyx_f_5nump
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":773
- * ctypedef npy_cdouble complex_t
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+ * ctypedef long double complex clongdouble_t
*
* cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<<
* return PyArray_MultiIterNew(1, <void*>a)
@@ -3275,7 +3743,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":774
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":808
*
* cdef inline object PyArray_MultiIterNew1(a):
* return PyArray_MultiIterNew(1, <void*>a) # <<<<<<<<<<<<<<
@@ -3283,14 +3751,14 @@ static CYTHON_INLINE PyObject *__pyx_f_5
* cdef inline object PyArray_MultiIterNew2(a, b):
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 774, __pyx_L1_error)
+ __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 808, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":773
- * ctypedef npy_cdouble complex_t
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":807
+ * ctypedef long double complex clongdouble_t
*
* cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<<
* return PyArray_MultiIterNew(1, <void*>a)
@@ -3308,7 +3776,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
* return PyArray_MultiIterNew(1, <void*>a)
*
* cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<<
@@ -3325,7 +3793,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":777
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":811
*
* cdef inline object PyArray_MultiIterNew2(a, b):
* return PyArray_MultiIterNew(2, <void*>a, <void*>b) # <<<<<<<<<<<<<<
@@ -3333,13 +3801,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5
* cdef inline object PyArray_MultiIterNew3(a, b, c):
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 777, __pyx_L1_error)
+ __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 811, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":810
* return PyArray_MultiIterNew(1, <void*>a)
*
* cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<<
@@ -3358,7 +3826,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
* return PyArray_MultiIterNew(2, <void*>a, <void*>b)
*
* cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<<
@@ -3375,7 +3843,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":780
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":814
*
* cdef inline object PyArray_MultiIterNew3(a, b, c):
* return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c) # <<<<<<<<<<<<<<
@@ -3383,13 +3851,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5
* cdef inline object PyArray_MultiIterNew4(a, b, c, d):
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 780, __pyx_L1_error)
+ __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 814, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":813
* return PyArray_MultiIterNew(2, <void*>a, <void*>b)
*
* cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<<
@@ -3408,7 +3876,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
* return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
*
* cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<<
@@ -3425,7 +3893,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":783
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":817
*
* cdef inline object PyArray_MultiIterNew4(a, b, c, d):
* return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d) # <<<<<<<<<<<<<<
@@ -3433,13 +3901,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5
* cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 783, __pyx_L1_error)
+ __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 817, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":816
* return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
*
* cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<<
@@ -3458,7 +3926,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
* return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
*
* cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<<
@@ -3475,7 +3943,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":786
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":820
*
* cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
* return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e) # <<<<<<<<<<<<<<
@@ -3483,13 +3951,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5
* cdef inline tuple PyDataType_SHAPE(dtype d):
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 786, __pyx_L1_error)
+ __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 820, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":819
* return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
*
* cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<<
@@ -3508,7 +3976,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
* return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
*
* cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<<
@@ -3520,9 +3988,10 @@ static CYTHON_INLINE PyObject *__pyx_f_5
PyObject *__pyx_r = NULL;
__Pyx_RefNannyDeclarations
int __pyx_t_1;
+ PyObject *__pyx_t_2;
__Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
*
* cdef inline tuple PyDataType_SHAPE(dtype d):
* if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<<
@@ -3532,7 +4001,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
__pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
if (__pyx_t_1) {
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":790
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":824
* cdef inline tuple PyDataType_SHAPE(dtype d):
* if PyDataType_HASSUBARRAY(d):
* return <tuple>d.subarray.shape # <<<<<<<<<<<<<<
@@ -3540,11 +4009,12 @@ static CYTHON_INLINE PyObject *__pyx_f_5
* return ()
*/
__Pyx_XDECREF(__pyx_r);
- __Pyx_INCREF(((PyObject*)__pyx_v_d->subarray->shape));
- __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape);
+ __pyx_t_2 = __pyx_f_5numpy_5dtype_8subarray_subarray(__pyx_v_d)->shape;
+ __Pyx_INCREF(((PyObject*)__pyx_t_2));
+ __pyx_r = ((PyObject*)__pyx_t_2);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":823
*
* cdef inline tuple PyDataType_SHAPE(dtype d):
* if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<<
@@ -3553,7 +4023,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
*/
}
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":792
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":826
* return <tuple>d.subarray.shape
* else:
* return () # <<<<<<<<<<<<<<
@@ -3567,7 +4037,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
goto __pyx_L0;
}
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":822
* return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
*
* cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<<
@@ -3582,10 +4052,10 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":968
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
* int _import_umath() except -1
*
- * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<<
+ * cdef inline void set_array_base(ndarray arr, object base) except *: # <<<<<<<<<<<<<<
* Py_INCREF(base) # important to do this before stealing the reference below!
* PyArray_SetBaseObject(arr, base)
*/
@@ -3596,28 +4066,28 @@ static CYTHON_INLINE void __pyx_f_5numpy
const char *__pyx_filename = NULL;
int __pyx_clineno = 0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":969
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011
*
- * cdef inline void set_array_base(ndarray arr, object base):
+ * cdef inline void set_array_base(ndarray arr, object base) except *:
* Py_INCREF(base) # important to do this before stealing the reference below! # <<<<<<<<<<<<<<
* PyArray_SetBaseObject(arr, base)
*
*/
Py_INCREF(__pyx_v_base);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":970
- * cdef inline void set_array_base(ndarray arr, object base):
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1012
+ * cdef inline void set_array_base(ndarray arr, object base) except *:
* Py_INCREF(base) # important to do this before stealing the reference below!
* PyArray_SetBaseObject(arr, base) # <<<<<<<<<<<<<<
*
* cdef inline object get_array_base(ndarray arr):
*/
- __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(1, 970, __pyx_L1_error)
+ __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(1, 1012, __pyx_L1_error)
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":968
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1010
* int _import_umath() except -1
*
- * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<<
+ * cdef inline void set_array_base(ndarray arr, object base) except *: # <<<<<<<<<<<<<<
* Py_INCREF(base) # important to do this before stealing the reference below!
* PyArray_SetBaseObject(arr, base)
*/
@@ -3629,7 +4099,7 @@ static CYTHON_INLINE void __pyx_f_5numpy
__pyx_L0:;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
* PyArray_SetBaseObject(arr, base)
*
* cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<<
@@ -3644,7 +4114,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
int __pyx_t_1;
__Pyx_RefNannySetupContext("get_array_base", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1015
*
* cdef inline object get_array_base(ndarray arr):
* base = PyArray_BASE(arr) # <<<<<<<<<<<<<<
@@ -3653,7 +4123,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
*/
__pyx_v_base = PyArray_BASE(__pyx_v_arr);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
* cdef inline object get_array_base(ndarray arr):
* base = PyArray_BASE(arr)
* if base is NULL: # <<<<<<<<<<<<<<
@@ -3663,7 +4133,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
__pyx_t_1 = (__pyx_v_base == NULL);
if (__pyx_t_1) {
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":975
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1017
* base = PyArray_BASE(arr)
* if base is NULL:
* return None # <<<<<<<<<<<<<<
@@ -3674,7 +4144,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
__pyx_r = Py_None; __Pyx_INCREF(Py_None);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1016
* cdef inline object get_array_base(ndarray arr):
* base = PyArray_BASE(arr)
* if base is NULL: # <<<<<<<<<<<<<<
@@ -3683,7 +4153,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
*/
}
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":976
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1018
* if base is NULL:
* return None
* return <object>base # <<<<<<<<<<<<<<
@@ -3695,7 +4165,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
__pyx_r = ((PyObject *)__pyx_v_base);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014
* PyArray_SetBaseObject(arr, base)
*
* cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<<
@@ -3710,7 +4180,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
* # Versions of the import_* functions which are more suitable for
* # Cython code.
* cdef inline int import_array() except -1: # <<<<<<<<<<<<<<
@@ -3734,7 +4204,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("import_array", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
* # Cython code.
* cdef inline int import_array() except -1:
* try: # <<<<<<<<<<<<<<
@@ -3750,16 +4220,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__Pyx_XGOTREF(__pyx_t_3);
/*try:*/ {
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1024
* cdef inline int import_array() except -1:
* try:
* __pyx_import_array() # <<<<<<<<<<<<<<
* except Exception:
- * raise ImportError("numpy.core.multiarray failed to import")
+ * raise ImportError("numpy._core.multiarray failed to import")
*/
- __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 982, __pyx_L3_error)
+ __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 1024, __pyx_L3_error)
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
* # Cython code.
* cdef inline int import_array() except -1:
* try: # <<<<<<<<<<<<<<
@@ -3773,37 +4243,37 @@ static CYTHON_INLINE int __pyx_f_5numpy_
goto __pyx_L8_try_end;
__pyx_L3_error:;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1025
* try:
* __pyx_import_array()
* except Exception: # <<<<<<<<<<<<<<
- * raise ImportError("numpy.core.multiarray failed to import")
+ * raise ImportError("numpy._core.multiarray failed to import")
*
*/
__pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));
if (__pyx_t_4) {
__Pyx_AddTraceback("numpy.import_array", __pyx_clineno, __pyx_lineno, __pyx_filename);
- if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(1, 983, __pyx_L5_except_error)
+ if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(1, 1025, __pyx_L5_except_error)
__Pyx_XGOTREF(__pyx_t_5);
__Pyx_XGOTREF(__pyx_t_6);
__Pyx_XGOTREF(__pyx_t_7);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":984
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
* __pyx_import_array()
* except Exception:
- * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<<
+ * raise ImportError("numpy._core.multiarray failed to import") # <<<<<<<<<<<<<<
*
* cdef inline int import_umath() except -1:
*/
- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 984, __pyx_L5_except_error)
+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 1026, __pyx_L5_except_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_Raise(__pyx_t_8, 0, 0, 0);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- __PYX_ERR(1, 984, __pyx_L5_except_error)
+ __PYX_ERR(1, 1026, __pyx_L5_except_error)
}
goto __pyx_L5_except_error;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1023
* # Cython code.
* cdef inline int import_array() except -1:
* try: # <<<<<<<<<<<<<<
@@ -3819,7 +4289,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__pyx_L8_try_end:;
}
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1022
* # Versions of the import_* functions which are more suitable for
* # Cython code.
* cdef inline int import_array() except -1: # <<<<<<<<<<<<<<
@@ -3842,8 +4312,8 @@ static CYTHON_INLINE int __pyx_f_5numpy_
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
- * raise ImportError("numpy.core.multiarray failed to import")
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+ * raise ImportError("numpy._core.multiarray failed to import")
*
* cdef inline int import_umath() except -1: # <<<<<<<<<<<<<<
* try:
@@ -3866,7 +4336,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("import_umath", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
*
* cdef inline int import_umath() except -1:
* try: # <<<<<<<<<<<<<<
@@ -3882,16 +4352,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__Pyx_XGOTREF(__pyx_t_3);
/*try:*/ {
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1030
* cdef inline int import_umath() except -1:
* try:
* _import_umath() # <<<<<<<<<<<<<<
* except Exception:
- * raise ImportError("numpy.core.umath failed to import")
+ * raise ImportError("numpy._core.umath failed to import")
*/
- __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 988, __pyx_L3_error)
+ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 1030, __pyx_L3_error)
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
*
* cdef inline int import_umath() except -1:
* try: # <<<<<<<<<<<<<<
@@ -3905,37 +4375,37 @@ static CYTHON_INLINE int __pyx_f_5numpy_
goto __pyx_L8_try_end;
__pyx_L3_error:;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1031
* try:
* _import_umath()
* except Exception: # <<<<<<<<<<<<<<
- * raise ImportError("numpy.core.umath failed to import")
+ * raise ImportError("numpy._core.umath failed to import")
*
*/
__pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));
if (__pyx_t_4) {
__Pyx_AddTraceback("numpy.import_umath", __pyx_clineno, __pyx_lineno, __pyx_filename);
- if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(1, 989, __pyx_L5_except_error)
+ if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(1, 1031, __pyx_L5_except_error)
__Pyx_XGOTREF(__pyx_t_5);
__Pyx_XGOTREF(__pyx_t_6);
__Pyx_XGOTREF(__pyx_t_7);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":990
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
* _import_umath()
* except Exception:
- * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<<
+ * raise ImportError("numpy._core.umath failed to import") # <<<<<<<<<<<<<<
*
* cdef inline int import_ufunc() except -1:
*/
- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 990, __pyx_L5_except_error)
+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 1032, __pyx_L5_except_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_Raise(__pyx_t_8, 0, 0, 0);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- __PYX_ERR(1, 990, __pyx_L5_except_error)
+ __PYX_ERR(1, 1032, __pyx_L5_except_error)
}
goto __pyx_L5_except_error;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029
*
* cdef inline int import_umath() except -1:
* try: # <<<<<<<<<<<<<<
@@ -3951,8 +4421,8 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__pyx_L8_try_end:;
}
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
- * raise ImportError("numpy.core.multiarray failed to import")
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1028
+ * raise ImportError("numpy._core.multiarray failed to import")
*
* cdef inline int import_umath() except -1: # <<<<<<<<<<<<<<
* try:
@@ -3974,8 +4444,8 @@ static CYTHON_INLINE int __pyx_f_5numpy_
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
- * raise ImportError("numpy.core.umath failed to import")
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+ * raise ImportError("numpy._core.umath failed to import")
*
* cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<<
* try:
@@ -3998,7 +4468,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
int __pyx_clineno = 0;
__Pyx_RefNannySetupContext("import_ufunc", 1);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
*
* cdef inline int import_ufunc() except -1:
* try: # <<<<<<<<<<<<<<
@@ -4014,16 +4484,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__Pyx_XGOTREF(__pyx_t_3);
/*try:*/ {
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036
* cdef inline int import_ufunc() except -1:
* try:
* _import_umath() # <<<<<<<<<<<<<<
* except Exception:
- * raise ImportError("numpy.core.umath failed to import")
+ * raise ImportError("numpy._core.umath failed to import")
*/
- __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 994, __pyx_L3_error)
+ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 1036, __pyx_L3_error)
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
*
* cdef inline int import_ufunc() except -1:
* try: # <<<<<<<<<<<<<<
@@ -4037,37 +4507,37 @@ static CYTHON_INLINE int __pyx_f_5numpy_
goto __pyx_L8_try_end;
__pyx_L3_error:;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1037
* try:
* _import_umath()
* except Exception: # <<<<<<<<<<<<<<
- * raise ImportError("numpy.core.umath failed to import")
+ * raise ImportError("numpy._core.umath failed to import")
*
*/
__pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));
if (__pyx_t_4) {
__Pyx_AddTraceback("numpy.import_ufunc", __pyx_clineno, __pyx_lineno, __pyx_filename);
- if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(1, 995, __pyx_L5_except_error)
+ if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(1, 1037, __pyx_L5_except_error)
__Pyx_XGOTREF(__pyx_t_5);
__Pyx_XGOTREF(__pyx_t_6);
__Pyx_XGOTREF(__pyx_t_7);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":996
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1038
* _import_umath()
* except Exception:
- * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<<
+ * raise ImportError("numpy._core.umath failed to import") # <<<<<<<<<<<<<<
*
*
*/
- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 996, __pyx_L5_except_error)
+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 1038, __pyx_L5_except_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_Raise(__pyx_t_8, 0, 0, 0);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- __PYX_ERR(1, 996, __pyx_L5_except_error)
+ __PYX_ERR(1, 1038, __pyx_L5_except_error)
}
goto __pyx_L5_except_error;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1035
*
* cdef inline int import_ufunc() except -1:
* try: # <<<<<<<<<<<<<<
@@ -4083,8 +4553,8 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__pyx_L8_try_end:;
}
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
- * raise ImportError("numpy.core.umath failed to import")
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1034
+ * raise ImportError("numpy._core.umath failed to import")
*
* cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<<
* try:
@@ -4106,10 +4576,10 @@ static CYTHON_INLINE int __pyx_f_5numpy_
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":999
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
*
*
- * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<<
+ * cdef inline bint is_timedelta64_object(object obj) noexcept: # <<<<<<<<<<<<<<
* """
* Cython equivalent of `isinstance(obj, np.timedelta64)`
*/
@@ -4117,7 +4587,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
int __pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1011
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1053
* bool
* """
* return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<<
@@ -4127,10 +4597,10 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":999
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1041
*
*
- * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<<
+ * cdef inline bint is_timedelta64_object(object obj) noexcept: # <<<<<<<<<<<<<<
* """
* Cython equivalent of `isinstance(obj, np.timedelta64)`
*/
@@ -4140,10 +4610,10 @@ static CYTHON_INLINE int __pyx_f_5numpy_
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1014
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
*
*
- * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<<
+ * cdef inline bint is_datetime64_object(object obj) noexcept: # <<<<<<<<<<<<<<
* """
* Cython equivalent of `isinstance(obj, np.datetime64)`
*/
@@ -4151,7 +4621,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
int __pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1026
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1068
* bool
* """
* return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<<
@@ -4161,10 +4631,10 @@ static CYTHON_INLINE int __pyx_f_5numpy_
__pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1014
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1056
*
*
- * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<<
+ * cdef inline bint is_datetime64_object(object obj) noexcept: # <<<<<<<<<<<<<<
* """
* Cython equivalent of `isinstance(obj, np.datetime64)`
*/
@@ -4174,10 +4644,10 @@ static CYTHON_INLINE int __pyx_f_5numpy_
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1029
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
*
*
- * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<<
* """
* returns the int64 value underlying scalar numpy datetime64 object
*/
@@ -4185,7 +4655,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_
static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
npy_datetime __pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1036
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1078
* also needed. That can be found using `get_datetime64_unit`.
* """
* return (<PyDatetimeScalarObject*>obj).obval # <<<<<<<<<<<<<<
@@ -4195,10 +4665,10 @@ static CYTHON_INLINE npy_datetime __pyx_
__pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1029
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1071
*
*
- * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<<
* """
* returns the int64 value underlying scalar numpy datetime64 object
*/
@@ -4208,10 +4678,10 @@ static CYTHON_INLINE npy_datetime __pyx_
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1039
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
*
*
- * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<<
* """
* returns the int64 value underlying scalar numpy timedelta64 object
*/
@@ -4219,7 +4689,7 @@ static CYTHON_INLINE npy_datetime __pyx_
static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
npy_timedelta __pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1043
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1085
* returns the int64 value underlying scalar numpy timedelta64 object
* """
* return (<PyTimedeltaScalarObject*>obj).obval # <<<<<<<<<<<<<<
@@ -4229,10 +4699,10 @@ static CYTHON_INLINE npy_timedelta __pyx
__pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1039
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1081
*
*
- * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<<
+ * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<<
* """
* returns the int64 value underlying scalar numpy timedelta64 object
*/
@@ -4242,10 +4712,10 @@ static CYTHON_INLINE npy_timedelta __pyx
return __pyx_r;
}
-/* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1046
+/* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
*
*
- * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<<
+ * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil: # <<<<<<<<<<<<<<
* """
* returns the unit part of the dtype for a numpy datetime64 object.
*/
@@ -4253,18 +4723,20 @@ static CYTHON_INLINE npy_timedelta __pyx
static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
NPY_DATETIMEUNIT __pyx_r;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1050
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1092
* returns the unit part of the dtype for a numpy datetime64 object.
* """
* return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base # <<<<<<<<<<<<<<
+ *
+ *
*/
__pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
goto __pyx_L0;
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1046
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1088
*
*
- * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<<
+ * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil: # <<<<<<<<<<<<<<
* """
* returns the unit part of the dtype for a numpy datetime64 object.
*/
@@ -5254,8 +5726,8 @@ static int __Pyx_CreateStringTabAndInitS
{&__pyx_n_s_main, __pyx_k_main, sizeof(__pyx_k_main), 0, 0, 1, 1},
{&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1},
{&__pyx_n_s_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 0, 0, 1, 1},
- {&__pyx_kp_u_numpy_core_multiarray_failed_to, __pyx_k_numpy_core_multiarray_failed_to, sizeof(__pyx_k_numpy_core_multiarray_failed_to), 0, 1, 0, 0},
- {&__pyx_kp_u_numpy_core_umath_failed_to_impor, __pyx_k_numpy_core_umath_failed_to_impor, sizeof(__pyx_k_numpy_core_umath_failed_to_impor), 0, 1, 0, 0},
+ {&__pyx_kp_u_numpy__core_multiarray_failed_to, __pyx_k_numpy__core_multiarray_failed_to, sizeof(__pyx_k_numpy__core_multiarray_failed_to), 0, 1, 0, 0},
+ {&__pyx_kp_u_numpy__core_umath_failed_to_impo, __pyx_k_numpy__core_umath_failed_to_impo, sizeof(__pyx_k_numpy__core_umath_failed_to_impo), 0, 1, 0, 0},
{&__pyx_n_s_out_array, __pyx_k_out_array, sizeof(__pyx_k_out_array), 0, 0, 1, 1},
{&__pyx_kp_u_out_array_must_be_contiguous, __pyx_k_out_array_must_be_contiguous, sizeof(__pyx_k_out_array_must_be_contiguous), 0, 1, 0, 0},
{&__pyx_kp_u_out_array_size_is_incorrect_expe, __pyx_k_out_array_size_is_incorrect_expe, sizeof(__pyx_k_out_array_size_is_incorrect_expe), 0, 1, 0, 0},
@@ -5276,7 +5748,7 @@ static int __Pyx_CreateStringTabAndInitS
static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
__pyx_builtin_AssertionError = __Pyx_GetBuiltinName(__pyx_n_s_AssertionError); if (!__pyx_builtin_AssertionError) __PYX_ERR(0, 122, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 141, __pyx_L1_error)
- __pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_n_s_ImportError); if (!__pyx_builtin_ImportError) __PYX_ERR(1, 984, __pyx_L1_error)
+ __pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_n_s_ImportError); if (!__pyx_builtin_ImportError) __PYX_ERR(1, 1026, __pyx_L1_error)
return 0;
__pyx_L1_error:;
return -1;
@@ -5287,25 +5759,25 @@ static CYTHON_SMALL_CODE int __Pyx_InitC
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":984
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026
* __pyx_import_array()
* except Exception:
- * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<<
+ * raise ImportError("numpy._core.multiarray failed to import") # <<<<<<<<<<<<<<
*
* cdef inline int import_umath() except -1:
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_u_numpy_core_multiarray_failed_to); if (unlikely(!__pyx_tuple_)) __PYX_ERR(1, 984, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_u_numpy__core_multiarray_failed_to); if (unlikely(!__pyx_tuple_)) __PYX_ERR(1, 1026, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "../../../virtualenvs/base/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":990
+ /* "../../../virtualenvs/base/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1032
* _import_umath()
* except Exception:
- * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<<
+ * raise ImportError("numpy._core.umath failed to import") # <<<<<<<<<<<<<<
*
* cdef inline int import_ufunc() except -1:
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_umath_failed_to_impor); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(1, 990, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_u_numpy__core_umath_failed_to_impo); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(1, 1032, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
@@ -5393,7 +5865,7 @@ static int __Pyx_modinit_type_init_code(
/*--- Type init code ---*/
__pyx_t_1 = PyImport_ImportModule("numpy"); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 29, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_ptype_9array_ext_ndarray = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "ndarray", sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArrayObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_9array_ext_ndarray) __PYX_ERR(0, 29, __pyx_L1_error)
+ __pyx_ptype_9array_ext_ndarray = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "ndarray", sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyArrayObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_9array_ext_ndarray) __PYX_ERR(0, 29, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_RefNannyFinishContext();
return 0;
@@ -5413,33 +5885,33 @@ static int __Pyx_modinit_type_import_cod
/*--- Type import code ---*/
__pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 9, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_0_8(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type",
+ __pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_0_10(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type",
#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000
- sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyTypeObject),
+ sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyTypeObject),
#elif CYTHON_COMPILING_IN_LIMITED_API
- sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyTypeObject),
+ sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyTypeObject),
#else
- sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyHeapTypeObject),
+ sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyHeapTypeObject),
#endif
- __Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_7cpython_4type_type) __PYX_ERR(2, 9, __pyx_L1_error)
+ __Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_7cpython_4type_type) __PYX_ERR(2, 9, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyImport_ImportModule("numpy"); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 202, __pyx_L1_error)
+ __pyx_t_1 = PyImport_ImportModule("numpy"); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 271, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_ptype_5numpy_dtype = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "dtype", sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArray_Descr),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_dtype) __PYX_ERR(1, 202, __pyx_L1_error)
- __pyx_ptype_5numpy_flatiter = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "flatiter", sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArrayIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_flatiter) __PYX_ERR(1, 225, __pyx_L1_error)
- __pyx_ptype_5numpy_broadcast = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "broadcast", sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArrayMultiIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_broadcast) __PYX_ERR(1, 229, __pyx_L1_error)
- __pyx_ptype_5numpy_ndarray = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "ndarray", sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyArrayObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_ndarray) __PYX_ERR(1, 238, __pyx_L1_error)
- __pyx_ptype_5numpy_generic = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "generic", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_generic) __PYX_ERR(1, 809, __pyx_L1_error)
- __pyx_ptype_5numpy_number = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "number", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_number) __PYX_ERR(1, 811, __pyx_L1_error)
- __pyx_ptype_5numpy_integer = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "integer", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_integer) __PYX_ERR(1, 813, __pyx_L1_error)
- __pyx_ptype_5numpy_signedinteger = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "signedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_signedinteger) __PYX_ERR(1, 815, __pyx_L1_error)
- __pyx_ptype_5numpy_unsignedinteger = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "unsignedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_unsignedinteger) __PYX_ERR(1, 817, __pyx_L1_error)
- __pyx_ptype_5numpy_inexact = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "inexact", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_inexact) __PYX_ERR(1, 819, __pyx_L1_error)
- __pyx_ptype_5numpy_floating = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "floating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_floating) __PYX_ERR(1, 821, __pyx_L1_error)
- __pyx_ptype_5numpy_complexfloating = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "complexfloating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_complexfloating) __PYX_ERR(1, 823, __pyx_L1_error)
- __pyx_ptype_5numpy_flexible = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "flexible", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_flexible) __PYX_ERR(1, 825, __pyx_L1_error)
- __pyx_ptype_5numpy_character = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "character", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_8); if (!__pyx_ptype_5numpy_character) __PYX_ERR(1, 827, __pyx_L1_error)
- __pyx_ptype_5numpy_ufunc = __Pyx_ImportType_3_0_8(__pyx_t_1, "numpy", "ufunc", sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_8(PyUFuncObject),__Pyx_ImportType_CheckSize_Ignore_3_0_8); if (!__pyx_ptype_5numpy_ufunc) __PYX_ERR(1, 866, __pyx_L1_error)
+ __pyx_ptype_5numpy_dtype = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "dtype", sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyArray_Descr),__Pyx_ImportType_CheckSize_Ignore_3_0_10); if (!__pyx_ptype_5numpy_dtype) __PYX_ERR(1, 271, __pyx_L1_error)
+ __pyx_ptype_5numpy_flatiter = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "flatiter", sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyArrayIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_10); if (!__pyx_ptype_5numpy_flatiter) __PYX_ERR(1, 316, __pyx_L1_error)
+ __pyx_ptype_5numpy_broadcast = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "broadcast", sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyArrayMultiIterObject),__Pyx_ImportType_CheckSize_Ignore_3_0_10); if (!__pyx_ptype_5numpy_broadcast) __PYX_ERR(1, 320, __pyx_L1_error)
+ __pyx_ptype_5numpy_ndarray = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "ndarray", sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyArrayObject),__Pyx_ImportType_CheckSize_Ignore_3_0_10); if (!__pyx_ptype_5numpy_ndarray) __PYX_ERR(1, 359, __pyx_L1_error)
+ __pyx_ptype_5numpy_generic = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "generic", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_generic) __PYX_ERR(1, 848, __pyx_L1_error)
+ __pyx_ptype_5numpy_number = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "number", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_number) __PYX_ERR(1, 850, __pyx_L1_error)
+ __pyx_ptype_5numpy_integer = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "integer", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_integer) __PYX_ERR(1, 852, __pyx_L1_error)
+ __pyx_ptype_5numpy_signedinteger = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "signedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_signedinteger) __PYX_ERR(1, 854, __pyx_L1_error)
+ __pyx_ptype_5numpy_unsignedinteger = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "unsignedinteger", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_unsignedinteger) __PYX_ERR(1, 856, __pyx_L1_error)
+ __pyx_ptype_5numpy_inexact = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "inexact", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_inexact) __PYX_ERR(1, 858, __pyx_L1_error)
+ __pyx_ptype_5numpy_floating = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "floating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_floating) __PYX_ERR(1, 860, __pyx_L1_error)
+ __pyx_ptype_5numpy_complexfloating = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "complexfloating", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_complexfloating) __PYX_ERR(1, 862, __pyx_L1_error)
+ __pyx_ptype_5numpy_flexible = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "flexible", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_flexible) __PYX_ERR(1, 864, __pyx_L1_error)
+ __pyx_ptype_5numpy_character = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "character", sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyObject),__Pyx_ImportType_CheckSize_Warn_3_0_10); if (!__pyx_ptype_5numpy_character) __PYX_ERR(1, 866, __pyx_L1_error)
+ __pyx_ptype_5numpy_ufunc = __Pyx_ImportType_3_0_10(__pyx_t_1, "numpy", "ufunc", sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_10(PyUFuncObject),__Pyx_ImportType_CheckSize_Ignore_3_0_10); if (!__pyx_ptype_5numpy_ufunc) __PYX_ERR(1, 930, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_RefNannyFinishContext();
return 0;
@@ -7696,10 +8168,10 @@ static CYTHON_INLINE PyObject* __Pyx_PyO
}
/* TypeImport */
-#ifndef __PYX_HAVE_RT_ImportType_3_0_8
-#define __PYX_HAVE_RT_ImportType_3_0_8
-static PyTypeObject *__Pyx_ImportType_3_0_8(PyObject *module, const char *module_name, const char *class_name,
- size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_8 check_size)
+#ifndef __PYX_HAVE_RT_ImportType_3_0_10
+#define __PYX_HAVE_RT_ImportType_3_0_10
+static PyTypeObject *__Pyx_ImportType_3_0_10(PyObject *module, const char *module_name, const char *class_name,
+ size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_10 check_size)
{
PyObject *result = 0;
char warning[200];
@@ -7753,7 +8225,7 @@ static PyTypeObject *__Pyx_ImportType_3_
module_name, class_name, size, basicsize+itemsize);
goto bad;
}
- if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_8 &&
+ if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_10 &&
((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) {
PyErr_Format(PyExc_ValueError,
"%.200s.%.200s size changed, may indicate binary incompatibility. "
@@ -7761,7 +8233,7 @@ static PyTypeObject *__Pyx_ImportType_3_
module_name, class_name, size, basicsize, basicsize+itemsize);
goto bad;
}
- else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_8 && (size_t)basicsize > size) {
+ else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_10 && (size_t)basicsize > size) {
PyOS_snprintf(warning, sizeof(warning),
"%s.%s size changed, may indicate binary incompatibility. "
"Expected %zd from C header, got %zd from PyObject",
@@ -8834,7 +9306,7 @@ static PyObject * __Pyx_CyFunction_Vecto
default:
return NULL;
}
- return ((_PyCFunctionFastWithKeywords)(void(*)(void))def->ml_meth)(self, args, nargs, kwnames);
+ return ((__Pyx_PyCFunctionFastWithKeywords)(void(*)(void))def->ml_meth)(self, args, nargs, kwnames);
}
static PyObject * __Pyx_CyFunction_Vectorcall_FASTCALL_KEYWORDS_METHOD(PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
{
@@ -9648,6 +10120,160 @@ bad:
return z;
}
#endif
+#endif
+
+/* Declarations */
+#if CYTHON_CCOMPLEX && (1) && (!0 || __cplusplus)
+ #ifdef __cplusplus
+ static CYTHON_INLINE __pyx_t_long_double_complex __pyx_t_long_double_complex_from_parts(long double x, long double y) {
+ return ::std::complex< long double >(x, y);
+ }
+ #else
+ static CYTHON_INLINE __pyx_t_long_double_complex __pyx_t_long_double_complex_from_parts(long double x, long double y) {
+ return x + y*(__pyx_t_long_double_complex)_Complex_I;
+ }
+ #endif
+#else
+ static CYTHON_INLINE __pyx_t_long_double_complex __pyx_t_long_double_complex_from_parts(long double x, long double y) {
+ __pyx_t_long_double_complex z;
+ z.real = x;
+ z.imag = y;
+ return z;
+ }
+#endif
+
+/* Arithmetic */
+#if CYTHON_CCOMPLEX && (1) && (!0 || __cplusplus)
+#else
+ static CYTHON_INLINE int __Pyx_c_eq_long__double(__pyx_t_long_double_complex a, __pyx_t_long_double_complex b) {
+ return (a.real == b.real) && (a.imag == b.imag);
+ }
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_sum_long__double(__pyx_t_long_double_complex a, __pyx_t_long_double_complex b) {
+ __pyx_t_long_double_complex z;
+ z.real = a.real + b.real;
+ z.imag = a.imag + b.imag;
+ return z;
+ }
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_diff_long__double(__pyx_t_long_double_complex a, __pyx_t_long_double_complex b) {
+ __pyx_t_long_double_complex z;
+ z.real = a.real - b.real;
+ z.imag = a.imag - b.imag;
+ return z;
+ }
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_prod_long__double(__pyx_t_long_double_complex a, __pyx_t_long_double_complex b) {
+ __pyx_t_long_double_complex z;
+ z.real = a.real * b.real - a.imag * b.imag;
+ z.imag = a.real * b.imag + a.imag * b.real;
+ return z;
+ }
+ #if 1
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_quot_long__double(__pyx_t_long_double_complex a, __pyx_t_long_double_complex b) {
+ if (b.imag == 0) {
+ return __pyx_t_long_double_complex_from_parts(a.real / b.real, a.imag / b.real);
+ } else if (fabsl(b.real) >= fabsl(b.imag)) {
+ if (b.real == 0 && b.imag == 0) {
+ return __pyx_t_long_double_complex_from_parts(a.real / b.real, a.imag / b.imag);
+ } else {
+ long double r = b.imag / b.real;
+ long double s = (long double)(1.0) / (b.real + b.imag * r);
+ return __pyx_t_long_double_complex_from_parts(
+ (a.real + a.imag * r) * s, (a.imag - a.real * r) * s);
+ }
+ } else {
+ long double r = b.real / b.imag;
+ long double s = (long double)(1.0) / (b.imag + b.real * r);
+ return __pyx_t_long_double_complex_from_parts(
+ (a.real * r + a.imag) * s, (a.imag * r - a.real) * s);
+ }
+ }
+ #else
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_quot_long__double(__pyx_t_long_double_complex a, __pyx_t_long_double_complex b) {
+ if (b.imag == 0) {
+ return __pyx_t_long_double_complex_from_parts(a.real / b.real, a.imag / b.real);
+ } else {
+ long double denom = b.real * b.real + b.imag * b.imag;
+ return __pyx_t_long_double_complex_from_parts(
+ (a.real * b.real + a.imag * b.imag) / denom,
+ (a.imag * b.real - a.real * b.imag) / denom);
+ }
+ }
+ #endif
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_neg_long__double(__pyx_t_long_double_complex a) {
+ __pyx_t_long_double_complex z;
+ z.real = -a.real;
+ z.imag = -a.imag;
+ return z;
+ }
+ static CYTHON_INLINE int __Pyx_c_is_zero_long__double(__pyx_t_long_double_complex a) {
+ return (a.real == 0) && (a.imag == 0);
+ }
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_conj_long__double(__pyx_t_long_double_complex a) {
+ __pyx_t_long_double_complex z;
+ z.real = a.real;
+ z.imag = -a.imag;
+ return z;
+ }
+ #if 1
+ static CYTHON_INLINE long double __Pyx_c_abs_long__double(__pyx_t_long_double_complex z) {
+ #if !defined(HAVE_HYPOT) || defined(_MSC_VER)
+ return sqrtl(z.real*z.real + z.imag*z.imag);
+ #else
+ return hypotl(z.real, z.imag);
+ #endif
+ }
+ static CYTHON_INLINE __pyx_t_long_double_complex __Pyx_c_pow_long__double(__pyx_t_long_double_complex a, __pyx_t_long_double_complex b) {
+ __pyx_t_long_double_complex z;
+ long double r, lnr, theta, z_r, z_theta;
+ if (b.imag == 0 && b.real == (int)b.real) {
+ if (b.real < 0) {
+ long double denom = a.real * a.real + a.imag * a.imag;
+ a.real = a.real / denom;
+ a.imag = -a.imag / denom;
+ b.real = -b.real;
+ }
+ switch ((int)b.real) {
+ case 0:
+ z.real = 1;
+ z.imag = 0;
+ return z;
+ case 1:
+ return a;
+ case 2:
+ return __Pyx_c_prod_long__double(a, a);
+ case 3:
+ z = __Pyx_c_prod_long__double(a, a);
+ return __Pyx_c_prod_long__double(z, a);
+ case 4:
+ z = __Pyx_c_prod_long__double(a, a);
+ return __Pyx_c_prod_long__double(z, z);
+ }
+ }
+ if (a.imag == 0) {
+ if (a.real == 0) {
+ return a;
+ } else if ((b.imag == 0) && (a.real >= 0)) {
+ z.real = powl(a.real, b.real);
+ z.imag = 0;
+ return z;
+ } else if (a.real > 0) {
+ r = a.real;
+ theta = 0;
+ } else {
+ r = -a.real;
+ theta = atan2l(0.0, -1.0);
+ }
+ } else {
+ r = __Pyx_c_abs_long__double(a);
+ theta = atan2l(a.imag, a.real);
+ }
+ lnr = logl(r);
+ z_r = expl(lnr * b.real - theta * b.imag);
+ z_theta = theta * b.real + lnr * b.imag;
+ z.real = z_r * cosl(z_theta);
+ z.imag = z_r * sinl(z_theta);
+ return z;
+ }
+ #endif
#endif
/* CIntToPy */
Index: mayavi-4.8.2/pyproject.toml
===================================================================
--- mayavi-4.8.2.orig/pyproject.toml
+++ mayavi-4.8.2/pyproject.toml
@@ -1,6 +1,6 @@
[build-system]
requires = [
- "oldest-supported-numpy",
+ "numpy>=2.0.0rc2,<3",
"setuptools",
"vtk",
"wheel"
Index: mayavi-4.8.2/setup.py
===================================================================
--- mayavi-4.8.2.orig/setup.py
+++ mayavi-4.8.2/setup.py
@@ -325,7 +325,7 @@ if __name__ == '__main__':
author="Prabhu Ramachandran, et al.",
author_email="prabhu@aero.iitb.ac.in",
maintainer='ETS Developers',
- python_requires='>=3.8',
+ python_requires='>=3.9',
maintainer_email='mayavi-users@lists.sf.net',
url='http://docs.enthought.com/mayavi/mayavi/',
classifiers=[c.strip() for c in """\