diff --git a/pyprophet/io/_base.py b/pyprophet/io/_base.py index e971999..17091c2 100644 --- a/pyprophet/io/_base.py +++ b/pyprophet/io/_base.py @@ -528,7 +528,11 @@ def _save_tsv_weights(self, weights): def _save_bin_weights(self, weights): """ - Save the model weights to a binary file. + Save the model weights to a binary file with metadata. + + For XGBoost/HistGradientBoosting classifiers, saves the model along with + metadata including ss_main_score and feature names to ensure proper + feature alignment when applying weights. Args: weights: Model weights or trained object. @@ -537,8 +541,16 @@ def _save_bin_weights(self, weights): f"trained_model_path_{self.level}" ) if trained_weights_path is not None: + # For XGBoost/HistGradientBoosting, wrap model with metadata + # to ensure feature alignment when applying weights + model_data = { + "model": weights, + "ss_main_score": self.config.runner.ss_main_score, + "classifier": self.classifier, + "level": self.level, + } with open(trained_weights_path, "wb") as file: - self.persisted_weights = pickle.dump(weights, file) + pickle.dump(model_data, file) logger.success("%s written." % trained_weights_path) else: logger.error(f"Trained model path {trained_weights_path} not found. ") diff --git a/pyprophet/io/scoring/osw.py b/pyprophet/io/scoring/osw.py index 32e1d0f..3877015 100644 --- a/pyprophet/io/scoring/osw.py +++ b/pyprophet/io/scoring/osw.py @@ -723,9 +723,17 @@ def save_weights(self, weights): weights.to_sql("PYPROPHET_WEIGHTS", con, index=False, if_exists="append") - elif self.classifier == "XGBoost": + elif self.classifier == "XGBoost" or self.classifier == "HistGradientBoosting": con = sqlite3.connect(self.outfile) + # Wrap model with metadata for feature alignment + model_data = { + "model": weights, + "ss_main_score": self.config.runner.ss_main_score, + "classifier": self.classifier, + "level": self.level, + } + c = con.cursor() if self.glyco and self.level in ["ms2", "ms1ms2"]: c.execute( @@ -743,7 +751,7 @@ def save_weights(self, weights): c.execute( "INSERT INTO GLYCOPEPTIDEPROPHET_XGB VALUES(?, ?)", - [self.level, pickle.dumps(weights)], + [self.level, pickle.dumps(model_data)], ) else: c.execute( @@ -758,7 +766,7 @@ def save_weights(self, weights): c.execute( "INSERT INTO PYPROPHET_XGB VALUES(?, ?)", - [self.level, pickle.dumps(weights)], + [self.level, pickle.dumps(model_data)], ) con.commit() c.close() diff --git a/pyprophet/scoring/_optimized.c b/pyprophet/scoring/_optimized.c index 9360c47..af3380d 100644 --- a/pyprophet/scoring/_optimized.c +++ b/pyprophet/scoring/_optimized.c @@ -1,4 +1,4 @@ -/* Generated by Cython 3.2.1 */ +/* Generated by Cython 3.1.2 */ /* BEGIN: Cython Metadata { @@ -35,8 +35,8 @@ END: Cython Metadata */ #elif PY_VERSION_HEX < 0x03080000 #error Cython requires Python 3.8+. #else -#define __PYX_ABI_VERSION "3_2_1" -#define CYTHON_HEX_VERSION 0x030201F0 +#define __PYX_ABI_VERSION "3_1_2" +#define CYTHON_HEX_VERSION 0x030102F0 #define CYTHON_FUTURE_DIVISION 1 /* CModulePreamble */ #include @@ -409,6 +409,9 @@ END: Cython Metadata */ enum { __pyx_check_sizeof_voidp = 1 / (int)(SIZEOF_VOID_P == sizeof(void*)) }; #endif #endif +#ifndef CYTHON_LOCK_AND_GIL_DEADLOCK_AVOIDANCE_TIME + #define CYTHON_LOCK_AND_GIL_DEADLOCK_AVOIDANCE_TIME 100 +#endif #ifndef __has_attribute #define __has_attribute(x) 0 #endif @@ -1297,6 +1300,7 @@ static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*); typedef sdigit __Pyx_compact_pylong; typedef digit __Pyx_compact_upylong; #endif + static CYTHON_INLINE int __Pyx_PyLong_CompactAsLong(PyObject *x, long *return_value); #if PY_VERSION_HEX >= 0x030C00A5 #define __Pyx_PyLong_Digits(x) (((PyLongObject*)x)->long_value.ob_digit) #else @@ -1373,7 +1377,7 @@ static const char *__pyx_filename; static const char* const __pyx_f[] = { "pyprophet/scoring/_optimized.pyx", "", - "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd", + "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd", "cpython/type.pxd", }; /* #### Code section: utility_code_proto_before_types ### */ @@ -1626,7 +1630,7 @@ typedef struct { /* #### Code section: numeric_typedefs ### */ -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":743 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":787 * # in Cython to enable them only on the right systems. * * ctypedef npy_int8 int8_t # <<<<<<<<<<<<<< @@ -1635,7 +1639,7 @@ typedef struct { */ typedef npy_int8 __pyx_t_5numpy_int8_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":744 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":788 * * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t # <<<<<<<<<<<<<< @@ -1644,7 +1648,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t; */ typedef npy_int16 __pyx_t_5numpy_int16_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":745 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":789 * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t # <<<<<<<<<<<<<< @@ -1653,7 +1657,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t; */ typedef npy_int32 __pyx_t_5numpy_int32_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":746 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":790 * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t * ctypedef npy_int64 int64_t # <<<<<<<<<<<<<< @@ -1662,8 +1666,8 @@ typedef npy_int32 __pyx_t_5numpy_int32_t; */ typedef npy_int64 __pyx_t_5numpy_int64_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":748 - * ctypedef npy_int64 int64_t +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":794 + * #ctypedef npy_int128 int128_t * * ctypedef npy_uint8 uint8_t # <<<<<<<<<<<<<< * ctypedef npy_uint16 uint16_t @@ -1671,7 +1675,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t; */ typedef npy_uint8 __pyx_t_5numpy_uint8_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":749 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":795 * * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t # <<<<<<<<<<<<<< @@ -1680,7 +1684,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t; */ typedef npy_uint16 __pyx_t_5numpy_uint16_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":750 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":796 * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t # <<<<<<<<<<<<<< @@ -1689,7 +1693,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t; */ typedef npy_uint32 __pyx_t_5numpy_uint32_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":751 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":797 * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t * ctypedef npy_uint64 uint64_t # <<<<<<<<<<<<<< @@ -1698,8 +1702,8 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t; */ typedef npy_uint64 __pyx_t_5numpy_uint64_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":753 - * ctypedef npy_uint64 uint64_t +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":801 + * #ctypedef npy_uint128 uint128_t * * ctypedef npy_float32 float32_t # <<<<<<<<<<<<<< * ctypedef npy_float64 float64_t @@ -1707,7 +1711,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t; */ typedef npy_float32 __pyx_t_5numpy_float32_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":754 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":802 * * ctypedef npy_float32 float32_t * ctypedef npy_float64 float64_t # <<<<<<<<<<<<<< @@ -1716,7 +1720,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t; */ typedef npy_float64 __pyx_t_5numpy_float64_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":761 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":809 * ctypedef double complex complex128_t * * ctypedef npy_longlong longlong_t # <<<<<<<<<<<<<< @@ -1725,7 +1729,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t; */ typedef npy_longlong __pyx_t_5numpy_longlong_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":762 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":810 * * ctypedef npy_longlong longlong_t * ctypedef npy_ulonglong ulonglong_t # <<<<<<<<<<<<<< @@ -1734,7 +1738,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t; */ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":764 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":812 * ctypedef npy_ulonglong ulonglong_t * * ctypedef npy_intp intp_t # <<<<<<<<<<<<<< @@ -1743,7 +1747,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; */ typedef npy_intp __pyx_t_5numpy_intp_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":765 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":813 * * ctypedef npy_intp intp_t * ctypedef npy_uintp uintp_t # <<<<<<<<<<<<<< @@ -1752,7 +1756,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t; */ typedef npy_uintp __pyx_t_5numpy_uintp_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":767 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":815 * ctypedef npy_uintp uintp_t * * ctypedef npy_double float_t # <<<<<<<<<<<<<< @@ -1761,7 +1765,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t; */ typedef npy_double __pyx_t_5numpy_float_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":768 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":816 * * ctypedef npy_double float_t * ctypedef npy_double double_t # <<<<<<<<<<<<<< @@ -1770,7 +1774,7 @@ typedef npy_double __pyx_t_5numpy_float_t; */ typedef npy_double __pyx_t_5numpy_double_t; -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":769 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":817 * ctypedef npy_double float_t * ctypedef npy_double double_t * ctypedef npy_longdouble longdouble_t # <<<<<<<<<<<<<< @@ -2718,22 +2722,22 @@ static int __Pyx__DelItemOnTypeDict(PyTypeObject *tp, PyObject *k); static int __Pyx_setup_reduce(PyObject* type_obj); /* TypeImport.proto */ -#ifndef __PYX_HAVE_RT_ImportType_proto_3_2_1 -#define __PYX_HAVE_RT_ImportType_proto_3_2_1 +#ifndef __PYX_HAVE_RT_ImportType_proto_3_1_2 +#define __PYX_HAVE_RT_ImportType_proto_3_1_2 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #include #endif #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L -#define __PYX_GET_STRUCT_ALIGNMENT_3_2_1(s) alignof(s) +#define __PYX_GET_STRUCT_ALIGNMENT_3_1_2(s) alignof(s) #else -#define __PYX_GET_STRUCT_ALIGNMENT_3_2_1(s) sizeof(void*) +#define __PYX_GET_STRUCT_ALIGNMENT_3_1_2(s) sizeof(void*) #endif -enum __Pyx_ImportType_CheckSize_3_2_1 { - __Pyx_ImportType_CheckSize_Error_3_2_1 = 0, - __Pyx_ImportType_CheckSize_Warn_3_2_1 = 1, - __Pyx_ImportType_CheckSize_Ignore_3_2_1 = 2 +enum __Pyx_ImportType_CheckSize_3_1_2 { + __Pyx_ImportType_CheckSize_Error_3_1_2 = 0, + __Pyx_ImportType_CheckSize_Warn_3_1_2 = 1, + __Pyx_ImportType_CheckSize_Ignore_3_1_2 = 2 }; -static PyTypeObject *__Pyx_ImportType_3_2_1(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_2_1 check_size); +static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_2 check_size); #endif /* dict_setdefault.proto (used by FetchCommonType) */ @@ -3351,6 +3355,193 @@ static PyObject *__pyx_builtin_enumerate; static PyObject *__pyx_builtin_Ellipsis; static PyObject *__pyx_builtin_id; /* #### Code section: string_decls ### */ +static const char __pyx_k_[] = ": "; +static const char __pyx_k_O[] = "O"; +static const char __pyx_k_c[] = "c"; +static const char __pyx_k_i[] = "i"; +static const char __pyx_k_j[] = "j"; +static const char __pyx_k_n[] = "n"; +static const char __pyx_k_x[] = "x"; +static const char __pyx_k__2[] = "."; +static const char __pyx_k__3[] = ">"; +static const char __pyx_k__4[] = "'"; +static const char __pyx_k__5[] = ")"; +static const char __pyx_k__6[] = "?"; +static const char __pyx_k_af[] = "af"; +static const char __pyx_k_g0[] = "g0"; +static const char __pyx_k_gc[] = "gc"; +static const char __pyx_k_i0[] = "i0"; +static const char __pyx_k_i1[] = "i1"; +static const char __pyx_k_id[] = "id"; +static const char __pyx_k_ix[] = "ix"; +static const char __pyx_k_np[] = "np"; +static const char __pyx_k_sc[] = "sc"; +static const char __pyx_k_abc[] = "abc"; +static const char __pyx_k_and[] = " and "; +static const char __pyx_k_got[] = " (got "; +static const char __pyx_k_low[] = "low"; +static const char __pyx_k_mid[] = "mid"; +static const char __pyx_k_new[] = "__new__"; +static const char __pyx_k_obj[] = "obj"; +static const char __pyx_k_pop[] = "pop"; +static const char __pyx_k_val[] = "val"; +static const char __pyx_k_base[] = "base"; +static const char __pyx_k_dict[] = "__dict__"; +static const char __pyx_k_dist[] = "dist"; +static const char __pyx_k_func[] = "__func__"; +static const char __pyx_k_high[] = "high"; +static const char __pyx_k_id_2[] = "id_"; +static const char __pyx_k_imax[] = "imax"; +static const char __pyx_k_imin[] = "imin"; +static const char __pyx_k_main[] = "__main__"; +static const char __pyx_k_mode[] = "mode"; +static const char __pyx_k_name[] = "name"; +static const char __pyx_k_ndim[] = "ndim"; +static const char __pyx_k_pack[] = "pack"; +static const char __pyx_k_rank[] = "rank"; +static const char __pyx_k_size[] = "size"; +static const char __pyx_k_sp_i[] = "sp_i"; +static const char __pyx_k_spec[] = "__spec__"; +static const char __pyx_k_step[] = "step"; +static const char __pyx_k_stop[] = "stop"; +static const char __pyx_k_test[] = "__test__"; +static const char __pyx_k_view[] = "view"; +static const char __pyx_k_ASCII[] = "ASCII"; +static const char __pyx_k_at_0x[] = " at 0x"; +static const char __pyx_k_basis[] = "basis"; +static const char __pyx_k_class[] = "__class__"; +static const char __pyx_k_count[] = "count"; +static const char __pyx_k_dtype[] = "dtype"; +static const char __pyx_k_error[] = "error"; +static const char __pyx_k_flags[] = "flags"; +static const char __pyx_k_index[] = "index"; +static const char __pyx_k_int64[] = "int64"; +static const char __pyx_k_numpy[] = "numpy"; +static const char __pyx_k_range[] = "range"; +static const char __pyx_k_ranks[] = "ranks"; +static const char __pyx_k_shape[] = "shape"; +static const char __pyx_k_start[] = "start"; +static const char __pyx_k_zeros[] = "zeros"; +static const char __pyx_k_best_j[] = "best_j"; +static const char __pyx_k_enable[] = "enable"; +static const char __pyx_k_encode[] = "encode"; +static const char __pyx_k_format[] = "format"; +static const char __pyx_k_import[] = "__import__"; +static const char __pyx_k_module[] = "__module__"; +static const char __pyx_k_name_2[] = "__name__"; +static const char __pyx_k_object[] = " object>"; +static const char __pyx_k_pickle[] = "pickle"; +static const char __pyx_k_rank32[] = "rank32"; +static const char __pyx_k_reduce[] = "__reduce__"; +static const char __pyx_k_result[] = "result"; +static const char __pyx_k_scores[] = "scores"; +static const char __pyx_k_struct[] = "struct"; +static const char __pyx_k_tg_ids[] = "tg_ids"; +static const char __pyx_k_uint32[] = "uint32"; +static const char __pyx_k_unpack[] = "unpack"; +static const char __pyx_k_update[] = "update"; +static const char __pyx_k_values[] = "values"; +static const char __pyx_k_cresult[] = "cresult"; +static const char __pyx_k_disable[] = "disable"; +static const char __pyx_k_float64[] = "float64"; +static const char __pyx_k_fortran[] = "fortran"; +static const char __pyx_k_memview[] = "memview"; +static const char __pyx_k_sum_all[] = "sum_all"; +static const char __pyx_k_Ellipsis[] = "Ellipsis"; +static const char __pyx_k_Sequence[] = "Sequence"; +static const char __pyx_k_add_note[] = "add_note"; +static const char __pyx_k_getstate[] = "__getstate__"; +static const char __pyx_k_inp_view[] = "inp_view"; +static const char __pyx_k_itemsize[] = "itemsize"; +static const char __pyx_k_operator[] = "operator"; +static const char __pyx_k_pyx_type[] = "__pyx_type"; +static const char __pyx_k_qualname[] = "__qualname__"; +static const char __pyx_k_register[] = "register"; +static const char __pyx_k_res_view[] = "res_view"; +static const char __pyx_k_set_name[] = "__set_name__"; +static const char __pyx_k_setstate[] = "__setstate__"; +static const char __pyx_k_TypeError[] = "TypeError"; +static const char __pyx_k_best_dist[] = "best_dist"; +static const char __pyx_k_enumerate[] = "enumerate"; +static const char __pyx_k_final_val[] = "final_val"; +static const char __pyx_k_isenabled[] = "isenabled"; +static const char __pyx_k_num_basis[] = "num_basis"; +static const char __pyx_k_pyx_state[] = "__pyx_state"; +static const char __pyx_k_reduce_ex[] = "__reduce_ex__"; +static const char __pyx_k_IndexError[] = "IndexError"; +static const char __pyx_k_ValueError[] = "ValueError"; +static const char __pyx_k_pyx_vtable[] = "__pyx_vtable__"; +static const char __pyx_k_sort_order[] = "sort_order"; +static const char __pyx_k_zeros_like[] = "zeros_like"; +static const char __pyx_k_ImportError[] = "ImportError"; +static const char __pyx_k_MemoryError[] = "MemoryError"; +static const char __pyx_k_PickleError[] = "PickleError"; +static const char __pyx_k_current_max[] = "current_max"; +static const char __pyx_k_num_samples[] = "num_samples"; +static const char __pyx_k_current_imax[] = "current_imax"; +static const char __pyx_k_initializing[] = "_initializing"; +static const char __pyx_k_is_coroutine[] = "_is_coroutine"; +static const char __pyx_k_pyx_checksum[] = "__pyx_checksum"; +static const char __pyx_k_MemoryView_of[] = "PyDataType_FIELDS(self) # <<<<<<<<<<<<<< @@ -17147,7 +17338,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc __pyx_r = ((PyObject *)__pyx_t_1); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":252 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":296 * # Use fields/names with care as they may be NULL. You must check * # for this using PyDataType_HASFIELDS. * @property # <<<<<<<<<<<<<< @@ -17162,7 +17353,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":256 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":300 * return PyDataType_FIELDS(self) * * @property # <<<<<<<<<<<<<< @@ -17176,7 +17367,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr PyObject *__pyx_t_1; __Pyx_RefNannySetupContext("names", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":258 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":302 * @property * cdef inline tuple names(self): * return PyDataType_NAMES(self) # <<<<<<<<<<<<<< @@ -17189,7 +17380,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr __pyx_r = ((PyObject*)__pyx_t_1); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":256 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":300 * return PyDataType_FIELDS(self) * * @property # <<<<<<<<<<<<<< @@ -17204,7 +17395,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":263 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":307 * # valid (the pointer can be NULL). Most users should access * # this field via the inline helper method PyDataType_SHAPE. * @property # <<<<<<<<<<<<<< @@ -17215,7 +17406,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarray(PyArray_Descr *__pyx_v_self) { PyArray_ArrayDescr *__pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":265 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":309 * @property * cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil: * return PyDataType_SUBARRAY(self) # <<<<<<<<<<<<<< @@ -17225,7 +17416,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra __pyx_r = PyDataType_SUBARRAY(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":263 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":307 * # valid (the pointer can be NULL). Most users should access * # this field via the inline helper method PyDataType_SHAPE. * @property # <<<<<<<<<<<<<< @@ -17238,7 +17429,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":267 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":311 * return PyDataType_SUBARRAY(self) * * @property # <<<<<<<<<<<<<< @@ -17249,7 +17440,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr *__pyx_v_self) { npy_uint64 __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":270 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":314 * cdef inline npy_uint64 flags(self) noexcept nogil: * """The data types flags.""" * return PyDataType_FLAGS(self) # <<<<<<<<<<<<<< @@ -17259,7 +17450,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr __pyx_r = PyDataType_FLAGS(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":267 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":311 * return PyDataType_SUBARRAY(self) * * @property # <<<<<<<<<<<<<< @@ -17272,7 +17463,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":279 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":323 * ctypedef class numpy.broadcast [object PyArrayMultiIterObject, check_size ignore]: * * @property # <<<<<<<<<<<<<< @@ -17283,7 +17474,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMultiIterObject *__pyx_v_self) { int __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":282 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":326 * 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) # <<<<<<<<<<<<<< @@ -17293,7 +17484,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti __pyx_r = PyArray_MultiIter_NUMITER(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":279 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":323 * ctypedef class numpy.broadcast [object PyArrayMultiIterObject, check_size ignore]: * * @property # <<<<<<<<<<<<<< @@ -17306,7 +17497,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":284 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":328 * return PyArray_MultiIter_NUMITER(self) * * @property # <<<<<<<<<<<<<< @@ -17317,7 +17508,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiIterObject *__pyx_v_self) { npy_intp __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":287 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":331 * cdef inline npy_intp size(self) noexcept nogil: * """The total broadcasted size.""" * return PyArray_MultiIter_SIZE(self) # <<<<<<<<<<<<<< @@ -17327,7 +17518,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI __pyx_r = PyArray_MultiIter_SIZE(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":284 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":328 * return PyArray_MultiIter_NUMITER(self) * * @property # <<<<<<<<<<<<<< @@ -17340,7 +17531,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":289 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":333 * return PyArray_MultiIter_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17351,7 +17542,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMultiIterObject *__pyx_v_self) { npy_intp __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":292 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":336 * cdef inline npy_intp index(self) noexcept nogil: * """The current (1-d) index into the broadcasted result.""" * return PyArray_MultiIter_INDEX(self) # <<<<<<<<<<<<<< @@ -17361,7 +17552,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult __pyx_r = PyArray_MultiIter_INDEX(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":289 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":333 * return PyArray_MultiIter_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17374,7 +17565,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":294 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":338 * return PyArray_MultiIter_INDEX(self) * * @property # <<<<<<<<<<<<<< @@ -17385,7 +17576,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject *__pyx_v_self) { int __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":297 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":341 * cdef inline int nd(self) noexcept nogil: * """The number of dimensions in the broadcasted result.""" * return PyArray_MultiIter_NDIM(self) # <<<<<<<<<<<<<< @@ -17395,7 +17586,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject __pyx_r = PyArray_MultiIter_NDIM(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":294 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":338 * return PyArray_MultiIter_INDEX(self) * * @property # <<<<<<<<<<<<<< @@ -17408,7 +17599,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":299 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":343 * return PyArray_MultiIter_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17419,7 +17610,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions(PyArrayMultiIterObject *__pyx_v_self) { npy_intp *__pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":302 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":346 * cdef inline npy_intp* dimensions(self) noexcept nogil: * """The shape of the broadcasted result.""" * return PyArray_MultiIter_DIMS(self) # <<<<<<<<<<<<<< @@ -17429,7 +17620,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions __pyx_r = PyArray_MultiIter_DIMS(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":299 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":343 * return PyArray_MultiIter_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17442,7 +17633,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":304 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":348 * return PyArray_MultiIter_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17453,7 +17644,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiIterObject *__pyx_v_self) { void **__pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":308 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":352 * """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) # <<<<<<<<<<<<<< @@ -17463,7 +17654,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI __pyx_r = PyArray_MultiIter_ITERS(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":304 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":348 * return PyArray_MultiIter_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17476,7 +17667,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":322 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":366 * # Instead, we use properties that map to the corresponding C-API functions. * * @property # <<<<<<<<<<<<<< @@ -17487,7 +17678,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) { PyObject *__pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":326 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":370 * """Returns a borrowed reference to the object owning the data/memory. * """ * return PyArray_BASE(self) # <<<<<<<<<<<<<< @@ -17497,7 +17688,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject __pyx_r = PyArray_BASE(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":322 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":366 * # Instead, we use properties that map to the corresponding C-API functions. * * @property # <<<<<<<<<<<<<< @@ -17510,7 +17701,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":328 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":372 * return PyArray_BASE(self) * * @property # <<<<<<<<<<<<<< @@ -17524,7 +17715,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray PyArray_Descr *__pyx_t_1; __Pyx_RefNannySetupContext("descr", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":332 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":376 * """Returns an owned reference to the dtype of the array. * """ * return PyArray_DESCR(self) # <<<<<<<<<<<<<< @@ -17537,7 +17728,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray __pyx_r = ((PyArray_Descr *)__pyx_t_1); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":328 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":372 * return PyArray_BASE(self) * * @property # <<<<<<<<<<<<<< @@ -17552,7 +17743,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":334 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":378 * return PyArray_DESCR(self) * * @property # <<<<<<<<<<<<<< @@ -17563,7 +17754,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) { int __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":338 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":382 * """Returns the number of dimensions in the array. * """ * return PyArray_NDIM(self) # <<<<<<<<<<<<<< @@ -17573,7 +17764,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx __pyx_r = PyArray_NDIM(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":334 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":378 * return PyArray_DESCR(self) * * @property # <<<<<<<<<<<<<< @@ -17586,7 +17777,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":340 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":384 * return PyArray_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17597,7 +17788,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) { npy_intp *__pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":346 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":390 * Can return NULL for 0-dimensional arrays. * """ * return PyArray_DIMS(self) # <<<<<<<<<<<<<< @@ -17607,7 +17798,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec __pyx_r = PyArray_DIMS(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":340 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":384 * return PyArray_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17620,7 +17811,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":348 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":392 * return PyArray_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17631,7 +17822,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) { npy_intp *__pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":353 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":397 * The number of elements matches the number of dimensions of the array (ndim). * """ * return PyArray_STRIDES(self) # <<<<<<<<<<<<<< @@ -17641,7 +17832,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO __pyx_r = PyArray_STRIDES(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":348 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":392 * return PyArray_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17654,7 +17845,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":355 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":399 * return PyArray_STRIDES(self) * * @property # <<<<<<<<<<<<<< @@ -17665,7 +17856,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) { npy_intp __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":359 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":403 * """Returns the total size (in number of elements) of the array. * """ * return PyArray_SIZE(self) # <<<<<<<<<<<<<< @@ -17675,7 +17866,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject * __pyx_r = PyArray_SIZE(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":355 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":399 * return PyArray_STRIDES(self) * * @property # <<<<<<<<<<<<<< @@ -17688,7 +17879,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject * return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":361 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":405 * return PyArray_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17699,7 +17890,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject * static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) { char *__pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":368 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":412 * of `PyArray_DATA()` instead, which returns a 'void*'. * """ * return PyArray_BYTES(self) # <<<<<<<<<<<<<< @@ -17709,7 +17900,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p __pyx_r = PyArray_BYTES(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":361 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":405 * return PyArray_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17722,7 +17913,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":776 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":824 * ctypedef long double complex clongdouble_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -17739,7 +17930,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":777 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":825 * * cdef inline object PyArray_MultiIterNew1(a): * return PyArray_MultiIterNew(1, a) # <<<<<<<<<<<<<< @@ -17753,7 +17944,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":776 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":824 * ctypedef long double complex clongdouble_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -17772,7 +17963,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":779 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":827 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -17789,7 +17980,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":780 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":828 * * cdef inline object PyArray_MultiIterNew2(a, b): * return PyArray_MultiIterNew(2, a, b) # <<<<<<<<<<<<<< @@ -17803,7 +17994,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":779 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":827 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -17822,7 +18013,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":782 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":830 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -17839,7 +18030,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":783 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":831 * * cdef inline object PyArray_MultiIterNew3(a, b, c): * return PyArray_MultiIterNew(3, a, b, c) # <<<<<<<<<<<<<< @@ -17853,7 +18044,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":782 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":830 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -17872,7 +18063,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":785 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":833 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -17889,7 +18080,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":786 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":834 * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): * return PyArray_MultiIterNew(4, a, b, c, d) # <<<<<<<<<<<<<< @@ -17903,7 +18094,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":785 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":833 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -17922,7 +18113,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":788 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":836 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -17939,7 +18130,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":789 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":837 * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): * return PyArray_MultiIterNew(5, a, b, c, d, e) # <<<<<<<<<<<<<< @@ -17953,7 +18144,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":788 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":836 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -17972,7 +18163,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":791 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":839 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -17987,7 +18178,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ PyObject *__pyx_t_2; __Pyx_RefNannySetupContext("PyDataType_SHAPE", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":792 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":840 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -17997,7 +18188,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d); if (__pyx_t_1) { - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":793 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":841 * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): * return d.subarray.shape # <<<<<<<<<<<<<< @@ -18010,7 +18201,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_r = ((PyObject*)__pyx_t_2); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":792 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":840 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -18019,7 +18210,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ */ } - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":795 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":843 * return d.subarray.shape * else: * return () # <<<<<<<<<<<<<< @@ -18033,7 +18224,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ goto __pyx_L0; } - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":791 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":839 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -18048,7 +18239,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":994 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1035 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base) except *: # <<<<<<<<<<<<<< @@ -18062,7 +18253,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a const char *__pyx_filename = NULL; int __pyx_clineno = 0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":995 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1036 * * cdef inline void set_array_base(ndarray arr, object base) except *: * Py_INCREF(base) # important to do this before stealing the reference below! # <<<<<<<<<<<<<< @@ -18071,7 +18262,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ Py_INCREF(__pyx_v_base); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":996 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1037 * 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) # <<<<<<<<<<<<<< @@ -18080,7 +18271,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 996, __pyx_L1_error) - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":994 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1035 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base) except *: # <<<<<<<<<<<<<< @@ -18095,7 +18286,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __pyx_L0:; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":998 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1039 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -18110,7 +18301,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py int __pyx_t_1; __Pyx_RefNannySetupContext("get_array_base", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":999 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1040 * * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) # <<<<<<<<<<<<<< @@ -18119,7 +18310,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ __pyx_v_base = PyArray_BASE(__pyx_v_arr); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1000 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1041 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -18129,7 +18320,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_t_1 = (__pyx_v_base == NULL); if (__pyx_t_1) { - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1001 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1042 * base = PyArray_BASE(arr) * if base is NULL: * return None # <<<<<<<<<<<<<< @@ -18140,7 +18331,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1000 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1041 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -18149,7 +18340,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ } - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1002 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1043 * if base is NULL: * return None * return base # <<<<<<<<<<<<<< @@ -18161,7 +18352,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = ((PyObject *)__pyx_v_base); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":998 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1039 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -18176,7 +18367,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1006 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1047 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -18202,7 +18393,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_array", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1007 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1048 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -18218,7 +18409,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1008 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1049 * cdef inline int import_array() except -1: * try: * __pyx_import_array() # <<<<<<<<<<<<<< @@ -18227,7 +18418,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { */ __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1008, __pyx_L3_error) - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1007 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1048 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -18241,7 +18432,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1009 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1050 * try: * __pyx_import_array() * except Exception: # <<<<<<<<<<<<<< @@ -18256,7 +18447,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1010 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1051 * __pyx_import_array() * except Exception: * raise ImportError("numpy._core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -18269,7 +18460,8 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { PyObject *__pyx_callargs[2] = {__pyx_t_9, __pyx_mstate_global->__pyx_kp_u_numpy__core_multiarray_failed_to}; __pyx_t_8 = __Pyx_PyObject_FastCall((PyObject*)(((PyTypeObject*)PyExc_ImportError)), __pyx_callargs+__pyx_t_10, (2-__pyx_t_10) | (__pyx_t_10*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1010, __pyx_L5_except_error) + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; + if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1051, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_8); } __Pyx_Raise(__pyx_t_8, 0, 0, 0); @@ -18278,7 +18470,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { } goto __pyx_L5_except_error; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1007 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1048 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -18294,7 +18486,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_L8_try_end:; } - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1006 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1047 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -18318,7 +18510,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1012 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1053 * raise ImportError("numpy._core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -18344,7 +18536,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_umath", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1013 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1054 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -18360,7 +18552,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1014 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1055 * cdef inline int import_umath() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -18369,7 +18561,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1014, __pyx_L3_error) - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1013 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1054 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -18383,7 +18575,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1015 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1056 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -18398,7 +18590,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1016 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1057 * _import_umath() * except Exception: * raise ImportError("numpy._core.umath failed to import") # <<<<<<<<<<<<<< @@ -18411,7 +18603,8 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { PyObject *__pyx_callargs[2] = {__pyx_t_9, __pyx_mstate_global->__pyx_kp_u_numpy__core_umath_failed_to_impo}; __pyx_t_8 = __Pyx_PyObject_FastCall((PyObject*)(((PyTypeObject*)PyExc_ImportError)), __pyx_callargs+__pyx_t_10, (2-__pyx_t_10) | (__pyx_t_10*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1016, __pyx_L5_except_error) + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; + if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1057, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_8); } __Pyx_Raise(__pyx_t_8, 0, 0, 0); @@ -18420,7 +18613,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { } goto __pyx_L5_except_error; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1013 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1054 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -18436,7 +18629,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_L8_try_end:; } - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1012 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1053 * raise ImportError("numpy._core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -18460,7 +18653,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1018 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1059 * raise ImportError("numpy._core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -18486,7 +18679,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_ufunc", 0); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1019 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1060 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -18502,7 +18695,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1020 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1061 * cdef inline int import_ufunc() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -18511,7 +18704,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1020, __pyx_L3_error) - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1019 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1060 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -18525,7 +18718,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1021 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1062 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -18540,7 +18733,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1022 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1063 * _import_umath() * except Exception: * raise ImportError("numpy._core.umath failed to import") # <<<<<<<<<<<<<< @@ -18553,7 +18746,8 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { PyObject *__pyx_callargs[2] = {__pyx_t_9, __pyx_mstate_global->__pyx_kp_u_numpy__core_umath_failed_to_impo}; __pyx_t_8 = __Pyx_PyObject_FastCall((PyObject*)(((PyTypeObject*)PyExc_ImportError)), __pyx_callargs+__pyx_t_10, (2-__pyx_t_10) | (__pyx_t_10*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1022, __pyx_L5_except_error) + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; + if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1063, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_8); } __Pyx_Raise(__pyx_t_8, 0, 0, 0); @@ -18562,7 +18756,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { } goto __pyx_L5_except_error; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1019 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1060 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -18578,7 +18772,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_L8_try_end:; } - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1018 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1059 * raise ImportError("numpy._core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -18602,7 +18796,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1025 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1066 * * * cdef inline bint is_timedelta64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18613,7 +18807,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) { int __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1037 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1078 * bool * """ * return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<< @@ -18623,7 +18817,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type)); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1025 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1066 * * * cdef inline bint is_timedelta64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18636,7 +18830,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1040 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1081 * * * cdef inline bint is_datetime64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18647,7 +18841,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) { int __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1052 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1093 * bool * """ * return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<< @@ -18657,7 +18851,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type)); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1040 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1081 * * * cdef inline bint is_datetime64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18670,7 +18864,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1055 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1096 * * * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18681,7 +18875,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) { npy_datetime __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1062 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1103 * also needed. That can be found using `get_datetime64_unit`. * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -18691,7 +18885,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1055 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1096 * * * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18704,7 +18898,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1065 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1106 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18715,7 +18909,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) { npy_timedelta __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1069 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1110 * returns the int64 value underlying scalar numpy timedelta64 object * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -18725,7 +18919,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1065 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1106 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18738,7 +18932,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject return __pyx_r; } -/* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1072 +/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1113 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18749,7 +18943,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) { NPY_DATETIMEUNIT __pyx_r; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1076 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1117 * returns the unit part of the dtype for a numpy datetime64 object. * """ * return (obj).obmeta.base # <<<<<<<<<<<<<< @@ -18759,7 +18953,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-bryxb9us/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1072 + /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1113 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18993,8 +19187,8 @@ static PyObject *__pyx_pf_9pyprophet_7scoring_10_optimized_find_nearest_matches( PyObject *__pyx_callargs[2 + ((CYTHON_VECTORCALL) ? 1 : 0)] = {__pyx_t_2, __pyx_t_5}; __pyx_t_3 = __Pyx_MakeVectorcallBuilderKwds(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 17, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < (0)) __PYX_ERR(0, 17, __pyx_L1_error) - __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder((PyObject*)__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); + if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < 0) __PYX_ERR(0, 17, __pyx_L1_error) + __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder(__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -20475,8 +20669,8 @@ static PyObject *__pyx_pf_9pyprophet_7scoring_10_optimized_2count_num_positives( PyObject *__pyx_callargs[2 + ((CYTHON_VECTORCALL) ? 1 : 0)] = {__pyx_t_2, __pyx_t_3}; __pyx_t_5 = __Pyx_MakeVectorcallBuilderKwds(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 141, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_5, __pyx_callargs+2, 0) < (0)) __PYX_ERR(0, 141, __pyx_L1_error) - __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder((PyObject*)__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_5); + if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_5, __pyx_callargs+2, 0) < 0) __PYX_ERR(0, 141, __pyx_L1_error) + __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder(__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_5); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -20816,8 +21010,8 @@ static PyObject *__pyx_pf_9pyprophet_7scoring_10_optimized_4find_top_ranked(CYTH PyObject *__pyx_callargs[2 + ((CYTHON_VECTORCALL) ? 1 : 0)] = {__pyx_t_2, __pyx_t_5}; __pyx_t_3 = __Pyx_MakeVectorcallBuilderKwds(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 158, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < (0)) __PYX_ERR(0, 158, __pyx_L1_error) - __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder((PyObject*)__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); + if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < 0) __PYX_ERR(0, 158, __pyx_L1_error) + __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder(__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -21452,8 +21646,8 @@ static PyObject *__pyx_pf_9pyprophet_7scoring_10_optimized_6rank(CYTHON_UNUSED P PyObject *__pyx_callargs[2 + ((CYTHON_VECTORCALL) ? 1 : 0)] = {__pyx_t_2, __pyx_t_5}; __pyx_t_3 = __Pyx_MakeVectorcallBuilderKwds(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 207, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < (0)) __PYX_ERR(0, 207, __pyx_L1_error) - __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder((PyObject*)__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); + if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < 0) __PYX_ERR(0, 207, __pyx_L1_error) + __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder(__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -21804,8 +21998,8 @@ static PyObject *__pyx_pf_9pyprophet_7scoring_10_optimized_8rank32(CYTHON_UNUSED PyObject *__pyx_callargs[2 + ((CYTHON_VECTORCALL) ? 1 : 0)] = {__pyx_t_2, __pyx_t_5}; __pyx_t_3 = __Pyx_MakeVectorcallBuilderKwds(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 229, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < (0)) __PYX_ERR(0, 229, __pyx_L1_error) - __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder((PyObject*)__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); + if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < 0) __PYX_ERR(0, 229, __pyx_L1_error) + __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder(__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -22165,8 +22359,8 @@ static PyObject *__pyx_pf_9pyprophet_7scoring_10_optimized_10single_chromatogram PyObject *__pyx_callargs[2 + ((CYTHON_VECTORCALL) ? 1 : 0)] = {__pyx_t_2, __pyx_t_5}; __pyx_t_3 = __Pyx_MakeVectorcallBuilderKwds(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 255, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < (0)) __PYX_ERR(0, 255, __pyx_L1_error) - __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder((PyObject*)__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); + if (__Pyx_VectorcallBuilder_AddArg(__pyx_mstate_global->__pyx_n_u_dtype, __pyx_t_6, __pyx_t_3, __pyx_callargs+2, 0) < 0) __PYX_ERR(0, 255, __pyx_L1_error) + __pyx_t_1 = __Pyx_Object_Vectorcall_CallFromBuilder(__pyx_t_4, __pyx_callargs+__pyx_t_7, (2-__pyx_t_7) | (__pyx_t_7*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET), __pyx_t_3); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -23432,12 +23626,9 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { #if !CYTHON_USE_TYPE_SPECS if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_array_type) < (0)) __PYX_ERR(1, 110, __pyx_L1_error) #endif - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount((PyObject*)__pyx_mstate->__pyx_array_type); - #endif - if (__Pyx_SetVtable(__pyx_mstate->__pyx_array_type, __pyx_vtabptr_array) < (0)) __PYX_ERR(1, 110, __pyx_L1_error) - if (__Pyx_MergeVtables(__pyx_mstate->__pyx_array_type) < (0)) __PYX_ERR(1, 110, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_array_type) < (0)) __PYX_ERR(1, 110, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_mstate->__pyx_array_type, __pyx_vtabptr_array) < 0) __PYX_ERR(1, 110, __pyx_L1_error) + if (__Pyx_MergeVtables(__pyx_mstate->__pyx_array_type) < 0) __PYX_ERR(1, 110, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_array_type) < 0) __PYX_ERR(1, 110, __pyx_L1_error) #if CYTHON_USE_TYPE_SPECS __pyx_mstate->__pyx_MemviewEnum_type = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type___pyx_MemviewEnum_spec, NULL); if (unlikely(!__pyx_mstate->__pyx_MemviewEnum_type)) __PYX_ERR(1, 299, __pyx_L1_error) if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type___pyx_MemviewEnum_spec, __pyx_mstate->__pyx_MemviewEnum_type) < (0)) __PYX_ERR(1, 299, __pyx_L1_error) @@ -23447,10 +23638,7 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_MemviewEnum_type) < (0)) __PYX_ERR(1, 299, __pyx_L1_error) - #endif - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount((PyObject*)__pyx_mstate->__pyx_MemviewEnum_type); + if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_MemviewEnum_type) < 0) __PYX_ERR(1, 299, __pyx_L1_error) #endif #if !CYTHON_COMPILING_IN_LIMITED_API if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_mstate->__pyx_MemviewEnum_type->tp_dictoffset && __pyx_mstate->__pyx_MemviewEnum_type->tp_getattro == PyObject_GenericGetAttr)) { @@ -23488,10 +23676,7 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_memoryview_type) < (0)) __PYX_ERR(1, 334, __pyx_L1_error) - #endif - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount((PyObject*)__pyx_mstate->__pyx_memoryview_type); + if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_memoryview_type) < 0) __PYX_ERR(1, 334, __pyx_L1_error) #endif #if !CYTHON_COMPILING_IN_LIMITED_API if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_mstate->__pyx_memoryview_type->tp_dictoffset && __pyx_mstate->__pyx_memoryview_type->tp_getattro == PyObject_GenericGetAttr)) { @@ -23511,8 +23696,8 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { __Pyx_GOTREF(__pyx_t_1); __pyx_mstate->__pyx_memoryviewslice_type = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type___pyx_memoryviewslice_spec, __pyx_t_1); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_mstate->__pyx_memoryviewslice_type)) __PYX_ERR(1, 951, __pyx_L1_error) - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type___pyx_memoryviewslice_spec, __pyx_mstate->__pyx_memoryviewslice_type) < (0)) __PYX_ERR(1, 951, __pyx_L1_error) + if (unlikely(!__pyx_mstate->__pyx_memoryviewslice_type)) __PYX_ERR(1, 950, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type___pyx_memoryviewslice_spec, __pyx_mstate->__pyx_memoryviewslice_type) < 0) __PYX_ERR(1, 950, __pyx_L1_error) #else __pyx_mstate->__pyx_memoryviewslice_type = &__pyx_type___pyx_memoryviewslice; #endif @@ -23520,19 +23705,16 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { __pyx_mstate_global->__pyx_memoryviewslice_type->tp_base = __pyx_mstate_global->__pyx_memoryview_type; #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_memoryviewslice_type) < (0)) __PYX_ERR(1, 951, __pyx_L1_error) - #endif - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount((PyObject*)__pyx_mstate->__pyx_memoryviewslice_type); + if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_memoryviewslice_type) < 0) __PYX_ERR(1, 950, __pyx_L1_error) #endif #if !CYTHON_COMPILING_IN_LIMITED_API if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_mstate->__pyx_memoryviewslice_type->tp_dictoffset && __pyx_mstate->__pyx_memoryviewslice_type->tp_getattro == PyObject_GenericGetAttr)) { __pyx_mstate->__pyx_memoryviewslice_type->tp_getattro = PyObject_GenericGetAttr; } #endif - if (__Pyx_SetVtable(__pyx_mstate->__pyx_memoryviewslice_type, __pyx_vtabptr__memoryviewslice) < (0)) __PYX_ERR(1, 951, __pyx_L1_error) - if (__Pyx_MergeVtables(__pyx_mstate->__pyx_memoryviewslice_type) < (0)) __PYX_ERR(1, 951, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_memoryviewslice_type) < (0)) __PYX_ERR(1, 951, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_mstate->__pyx_memoryviewslice_type, __pyx_vtabptr__memoryviewslice) < 0) __PYX_ERR(1, 950, __pyx_L1_error) + if (__Pyx_MergeVtables(__pyx_mstate->__pyx_memoryviewslice_type) < 0) __PYX_ERR(1, 950, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_memoryviewslice_type) < 0) __PYX_ERR(1, 950, __pyx_L1_error) __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; @@ -23552,153 +23734,153 @@ static int __Pyx_modinit_type_import_code(__pyx_mstatetype *__pyx_mstate) { /*--- Type import code ---*/ __pyx_t_1 = PyImport_ImportModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 9, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_mstate->__pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_2_1(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type", + __pyx_mstate->__pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_1_2(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyTypeObject), + sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyTypeObject), #elif CYTHON_COMPILING_IN_LIMITED_API 0, 0, #else - sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyHeapTypeObject), + sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyHeapTypeObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_7cpython_4type_type) __PYX_ERR(3, 9, __pyx_L1_error) + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_7cpython_4type_type) __PYX_ERR(3, 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(2, 228, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_mstate->__pyx_ptype_5numpy_dtype = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "dtype", + __pyx_mstate->__pyx_ptype_5numpy_dtype = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "dtype", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArray_Descr), + sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArray_Descr), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArray_Descr), + sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArray_Descr), #else - sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArray_Descr), + sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArray_Descr), #endif - __Pyx_ImportType_CheckSize_Ignore_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_dtype) __PYX_ERR(2, 228, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_flatiter = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "flatiter", + __Pyx_ImportType_CheckSize_Ignore_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_dtype) __PYX_ERR(2, 272, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_flatiter = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "flatiter", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayIterObject), + sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayIterObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayIterObject), + sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayIterObject), #else - sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayIterObject), + sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayIterObject), #endif - __Pyx_ImportType_CheckSize_Ignore_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_flatiter) __PYX_ERR(2, 273, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_broadcast = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "broadcast", + __Pyx_ImportType_CheckSize_Ignore_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_flatiter) __PYX_ERR(2, 317, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_broadcast = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "broadcast", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayMultiIterObject), + sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayMultiIterObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayMultiIterObject), + sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayMultiIterObject), #else - sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayMultiIterObject), + sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayMultiIterObject), #endif - __Pyx_ImportType_CheckSize_Ignore_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_broadcast) __PYX_ERR(2, 277, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_ndarray = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "ndarray", + __Pyx_ImportType_CheckSize_Ignore_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_broadcast) __PYX_ERR(2, 321, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_ndarray = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "ndarray", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayObject), + sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayObject), + sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayObject), #else - sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyArrayObject), + sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayObject), #endif - __Pyx_ImportType_CheckSize_Ignore_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_ndarray) __PYX_ERR(2, 316, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_generic = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "generic", + __Pyx_ImportType_CheckSize_Ignore_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_ndarray) __PYX_ERR(2, 360, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_generic = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "generic", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_generic) __PYX_ERR(2, 825, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_number = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "number", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_generic) __PYX_ERR(2, 873, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_number = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "number", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_number) __PYX_ERR(2, 827, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_integer = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "integer", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_number) __PYX_ERR(2, 875, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_integer = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "integer", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_integer) __PYX_ERR(2, 829, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_signedinteger = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "signedinteger", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_integer) __PYX_ERR(2, 877, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_signedinteger = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "signedinteger", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_signedinteger) __PYX_ERR(2, 831, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_unsignedinteger = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "unsignedinteger", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_signedinteger) __PYX_ERR(2, 879, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_unsignedinteger = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "unsignedinteger", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_unsignedinteger) __PYX_ERR(2, 833, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_inexact = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "inexact", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_unsignedinteger) __PYX_ERR(2, 881, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_inexact = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "inexact", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_inexact) __PYX_ERR(2, 835, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_floating = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "floating", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_inexact) __PYX_ERR(2, 883, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_floating = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "floating", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_floating) __PYX_ERR(2, 837, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_complexfloating = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "complexfloating", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_floating) __PYX_ERR(2, 885, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_complexfloating = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "complexfloating", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_complexfloating) __PYX_ERR(2, 839, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_flexible = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "flexible", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_complexfloating) __PYX_ERR(2, 887, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_flexible = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "flexible", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_flexible) __PYX_ERR(2, 841, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_character = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "character", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_flexible) __PYX_ERR(2, 889, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_character = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "character", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_character) __PYX_ERR(2, 843, __pyx_L1_error) - __pyx_mstate->__pyx_ptype_5numpy_ufunc = __Pyx_ImportType_3_2_1(__pyx_t_1, "numpy", "ufunc", + __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_character) __PYX_ERR(2, 891, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_ufunc = __Pyx_ImportType_3_1_2(__pyx_t_1, "numpy", "ufunc", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyUFuncObject), + sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyUFuncObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyUFuncObject), + sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyUFuncObject), #else - sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_2_1(PyUFuncObject), + sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyUFuncObject), #endif - __Pyx_ImportType_CheckSize_Ignore_3_2_1); if (!__pyx_mstate->__pyx_ptype_5numpy_ufunc) __PYX_ERR(2, 907, __pyx_L1_error) + __Pyx_ImportType_CheckSize_Ignore_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_ufunc) __PYX_ERR(2, 955, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_RefNannyFinishContext(); return 0; @@ -23964,8 +24146,10 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec__optimized(PyObject *__pyx_pyinit_ #endif __Pyx_RefNannySetupContext("PyInit__optimized", 0); - __Pyx_init_runtime_version(); - if (__Pyx_check_binary_version(__PYX_LIMITED_VERSION_HEX, __Pyx_get_runtime_version(), CYTHON_COMPILING_IN_LIMITED_API) < (0)) __PYX_ERR(0, 1, __pyx_L1_error) + if (__Pyx_check_binary_version(__PYX_LIMITED_VERSION_HEX, __Pyx_get_runtime_version(), CYTHON_COMPILING_IN_LIMITED_API) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #ifdef __Pxy_PyFrame_Initialize_Offsets + __Pxy_PyFrame_Initialize_Offsets(); + #endif __pyx_mstate->__pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_mstate->__pyx_empty_tuple)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_mstate->__pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_mstate->__pyx_empty_bytes)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_mstate->__pyx_empty_unicode = PyUnicode_FromStringAndSize("", 0); if (unlikely(!__pyx_mstate->__pyx_empty_unicode)) __PYX_ERR(0, 1, __pyx_L1_error) @@ -23973,7 +24157,26 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); /*--- Initialize various global constants etc. ---*/ if (__Pyx_InitConstants(__pyx_mstate) < (0)) __PYX_ERR(0, 1, __pyx_L1_error) stringtab_initialized = 1; - if (__Pyx_InitGlobals() < (0)) __PYX_ERR(0, 1, __pyx_L1_error) + if (__Pyx_InitGlobals() < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #if 0 || defined(__Pyx_CyFunction_USED) || defined(__Pyx_FusedFunction_USED) || defined(__Pyx_Coroutine_USED) || defined(__Pyx_Generator_USED) || defined(__Pyx_AsyncGen_USED) + if (__pyx_CommonTypesMetaclass_init(__pyx_m) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #endif + #ifdef __Pyx_CyFunction_USED + if (__pyx_CyFunction_init(__pyx_m) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #endif + #ifdef __Pyx_FusedFunction_USED + if (__pyx_FusedFunction_init(__pyx_m) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #endif + #ifdef __Pyx_Coroutine_USED + if (__pyx_Coroutine_init(__pyx_m) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #endif + #ifdef __Pyx_Generator_USED + if (__pyx_Generator_init(__pyx_m) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #endif + #ifdef __Pyx_AsyncGen_USED + if (__pyx_AsyncGen_init(__pyx_m) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + #endif + /*--- Library function declarations ---*/ if (__pyx_module_is_main_pyprophet__scoring___optimized) { if (PyObject_SetAttr(__pyx_m, __pyx_mstate_global->__pyx_n_u_name_2, __pyx_mstate_global->__pyx_n_u_main) < (0)) __PYX_ERR(0, 1, __pyx_L1_error) } @@ -24111,10 +24314,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * index = __pyx_collections_abc_Sequence.index * except: */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_count); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 240, __pyx_L10_error) - __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_array_type, __pyx_mstate_global->__pyx_n_u_count, __pyx_t_4) < (0)) __PYX_ERR(1, 240, __pyx_L10_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_count); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 240, __pyx_L10_error) + __Pyx_GOTREF(__pyx_t_5); + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_array_type, __pyx_mstate_global->__pyx_n_u_count, __pyx_t_5) < 0) __PYX_ERR(1, 240, __pyx_L10_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "View.MemoryView":241 * try: @@ -24123,10 +24326,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * except: * pass */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_index); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 241, __pyx_L10_error) - __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_array_type, __pyx_mstate_global->__pyx_n_u_index, __pyx_t_4) < (0)) __PYX_ERR(1, 241, __pyx_L10_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_index); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 241, __pyx_L10_error) + __Pyx_GOTREF(__pyx_t_5); + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_array_type, __pyx_mstate_global->__pyx_n_u_index, __pyx_t_5) < 0) __PYX_ERR(1, 241, __pyx_L10_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "View.MemoryView":239 * @@ -24317,10 +24520,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * index = __pyx_collections_abc_Sequence.index * except: */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_count); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 984, __pyx_L18_error) - __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_memoryviewslice_type, __pyx_mstate_global->__pyx_n_u_count, __pyx_t_4) < (0)) __PYX_ERR(1, 984, __pyx_L18_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_count); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 983, __pyx_L18_error) + __Pyx_GOTREF(__pyx_t_5); + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_memoryviewslice_type, __pyx_mstate_global->__pyx_n_u_count, __pyx_t_5) < 0) __PYX_ERR(1, 983, __pyx_L18_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "View.MemoryView":985 * try: @@ -24329,10 +24532,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * except: * pass */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_index); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 985, __pyx_L18_error) - __Pyx_GOTREF(__pyx_t_4); - if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_memoryviewslice_type, __pyx_mstate_global->__pyx_n_u_index, __pyx_t_4) < (0)) __PYX_ERR(1, 985, __pyx_L18_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_collections_abc_Sequence, __pyx_mstate_global->__pyx_n_u_index); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 984, __pyx_L18_error) + __Pyx_GOTREF(__pyx_t_5); + if (__Pyx_SetItemOnTypeDict(__pyx_mstate_global->__pyx_memoryviewslice_type, __pyx_mstate_global->__pyx_n_u_index, __pyx_t_5) < 0) __PYX_ERR(1, 984, __pyx_L18_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "View.MemoryView":983 * @@ -24484,10 +24687,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * cdef object __pyx_result * __Pyx_CheckUnpickleChecksum(__pyx_checksum, 0x82a3537, 0x6ae9995, 0xb068931, b'name') */ - __pyx_t_4 = PyCFunction_NewEx(&__pyx_mdef_15View_dot_MemoryView_1__pyx_unpickle_Enum, NULL, __pyx_mstate_global->__pyx_n_u_View_MemoryView); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 4, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_pyx_unpickle_Enum, __pyx_t_4) < (0)) __PYX_ERR(1, 4, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = PyCFunction_NewEx(&__pyx_mdef_15View_dot_MemoryView_1__pyx_unpickle_Enum, NULL, __pyx_mstate_global->__pyx_n_u_View_MemoryView); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 1, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_pyx_unpickle_Enum, __pyx_t_5) < 0) __PYX_ERR(1, 1, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":5 * cimport numpy as np @@ -24496,11 +24699,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * import operator * */ - __pyx_t_1 = __Pyx_Import(__pyx_mstate_global->__pyx_n_u_numpy, 0, 0, NULL, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 5, __pyx_L1_error) - __pyx_t_4 = __pyx_t_1; - __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_np, __pyx_t_4) < (0)) __PYX_ERR(0, 5, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_ImportDottedModule(__pyx_mstate_global->__pyx_n_u_numpy, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 5, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_np, __pyx_t_5) < 0) __PYX_ERR(0, 5, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":6 * @@ -24509,11 +24711,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * * */ - __pyx_t_1 = __Pyx_Import(__pyx_mstate_global->__pyx_n_u_operator, 0, 0, NULL, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 6, __pyx_L1_error) - __pyx_t_4 = __pyx_t_1; - __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_operator, __pyx_t_4) < (0)) __PYX_ERR(0, 6, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_ImportDottedModule(__pyx_mstate_global->__pyx_n_u_operator, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 6, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_operator, __pyx_t_5) < 0) __PYX_ERR(0, 6, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":12 * @@ -24522,14 +24723,11 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * @cython.wraparound(False) * def find_nearest_matches(DATA_TYPE[:] basis, DATA_TYPE[:] sample_points, use_sort_order=1): */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_1find_nearest_matches, 0, __pyx_mstate_global->__pyx_n_u_find_nearest_matches, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[0])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 12, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount(__pyx_t_4); - #endif - __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_4, __pyx_mstate_global->__pyx_tuple[2]); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_find_nearest_matches, __pyx_t_4) < (0)) __PYX_ERR(0, 12, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_1find_nearest_matches, 0, __pyx_mstate_global->__pyx_n_u_find_nearest_matches, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[0])); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 12, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_CyFunction_SetDefaultsTuple(__pyx_t_5, __pyx_mstate_global->__pyx_tuple[2]); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_find_nearest_matches, __pyx_t_5) < 0) __PYX_ERR(0, 12, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":135 * @@ -24538,13 +24736,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * @cython.wraparound(False) * def count_num_positives(np.float64_t[:] values): */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_3count_num_positives, 0, __pyx_mstate_global->__pyx_n_u_count_num_positives, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[1])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 135, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount(__pyx_t_4); - #endif - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_count_num_positives, __pyx_t_4) < (0)) __PYX_ERR(0, 135, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_3count_num_positives, 0, __pyx_mstate_global->__pyx_n_u_count_num_positives, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[1])); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 135, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_count_num_positives, __pyx_t_5) < 0) __PYX_ERR(0, 135, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":154 * @@ -24553,13 +24748,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * @cython.wraparound(False) * def find_top_ranked(np.int64_t[:] tg_ids, DATA_TYPE[:] scores): */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_5find_top_ranked, 0, __pyx_mstate_global->__pyx_n_u_find_top_ranked, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[2])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 154, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount(__pyx_t_4); - #endif - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_find_top_ranked, __pyx_t_4) < (0)) __PYX_ERR(0, 154, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_5find_top_ranked, 0, __pyx_mstate_global->__pyx_n_u_find_top_ranked, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[2])); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 154, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_find_top_ranked, __pyx_t_5) < 0) __PYX_ERR(0, 154, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":201 * @@ -24568,13 +24760,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * @cython.wraparound(False) * def rank(np.int64_t[:] tg_ids, DATA_TYPE[:] scores): */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_7rank, 0, __pyx_mstate_global->__pyx_n_u_rank, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[3])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 201, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount(__pyx_t_4); - #endif - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_rank, __pyx_t_4) < (0)) __PYX_ERR(0, 201, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_7rank, 0, __pyx_mstate_global->__pyx_n_u_rank, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[3])); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 201, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_rank, __pyx_t_5) < 0) __PYX_ERR(0, 201, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":223 * @@ -24583,13 +24772,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * @cython.wraparound(False) * def rank32(np.uint32_t[:] tg_ids, DATA_TYPE[:] scores): */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_9rank32, 0, __pyx_mstate_global->__pyx_n_u_rank32, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[4])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 223, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount(__pyx_t_4); - #endif - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_rank32, __pyx_t_4) < (0)) __PYX_ERR(0, 223, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_9rank32, 0, __pyx_mstate_global->__pyx_n_u_rank32, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[4])); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 223, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_rank32, __pyx_t_5) < 0) __PYX_ERR(0, 223, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":245 * @@ -24598,23 +24784,20 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); * @cython.wraparound(False) * def single_chromatogram_hypothesis_fast(np.float64_t[:] inv_pg_pp_true, np.float64_t prior_chrom_null, np.float64_t prior_pg_true): */ - __pyx_t_4 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_11single_chromatogram_hypothesis_fast, 0, __pyx_mstate_global->__pyx_n_u_single_chromatogram_hypothesis_f, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[5])); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 245, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030E0000 - PyUnstable_Object_EnableDeferredRefcount(__pyx_t_4); - #endif - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_single_chromatogram_hypothesis_f, __pyx_t_4) < (0)) __PYX_ERR(0, 245, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_CyFunction_New(&__pyx_mdef_9pyprophet_7scoring_10_optimized_11single_chromatogram_hypothesis_fast, 0, __pyx_mstate_global->__pyx_n_u_single_chromatogram_hypothesis_f, NULL, __pyx_mstate_global->__pyx_n_u_pyprophet_scoring__optimized, __pyx_mstate_global->__pyx_d, ((PyObject *)__pyx_mstate_global->__pyx_codeobj_tab[5])); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 245, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_single_chromatogram_hypothesis_f, __pyx_t_5) < 0) __PYX_ERR(0, 245, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /* "pyprophet/scoring/_optimized.pyx":1 * cimport cython # <<<<<<<<<<<<<< * cimport libc.stdlib * cimport numpy as np */ - __pyx_t_4 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 1, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_test, __pyx_t_4) < (0)) __PYX_ERR(0, 1, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_5 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_test, __pyx_t_5) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; /*--- Wrapped vars code ---*/ @@ -24655,16 +24838,12 @@ static int __Pyx_InitCachedBuiltins(__pyx_mstatetype *__pyx_mstate) { CYTHON_UNUSED_VAR(__pyx_mstate); __pyx_builtin___import__ = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_import); if (!__pyx_builtin___import__) __PYX_ERR(1, 101, __pyx_L1_error) __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 157, __pyx_L1_error) - __pyx_builtin_Ellipsis = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_Ellipsis); if (!__pyx_builtin_Ellipsis) __PYX_ERR(1, 409, __pyx_L1_error) - __pyx_builtin_id = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_id); if (!__pyx_builtin_id) __PYX_ERR(1, 619, __pyx_L1_error) - - /* Cached unbound methods */ - __pyx_mstate->__pyx_umethod_PyDict_Type_items.type = (PyObject*)&PyDict_Type; - __pyx_mstate->__pyx_umethod_PyDict_Type_items.method_name = &__pyx_mstate->__pyx_n_u_items; - __pyx_mstate->__pyx_umethod_PyDict_Type_pop.type = (PyObject*)&PyDict_Type; - __pyx_mstate->__pyx_umethod_PyDict_Type_pop.method_name = &__pyx_mstate->__pyx_n_u_pop; - __pyx_mstate->__pyx_umethod_PyDict_Type_values.type = (PyObject*)&PyDict_Type; - __pyx_mstate->__pyx_umethod_PyDict_Type_values.method_name = &__pyx_mstate->__pyx_n_u_values; + __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(1, 2, __pyx_L1_error) + __pyx_builtin_AssertionError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_AssertionError); if (!__pyx_builtin_AssertionError) __PYX_ERR(1, 373, __pyx_L1_error) + __pyx_builtin_Ellipsis = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_Ellipsis); if (!__pyx_builtin_Ellipsis) __PYX_ERR(1, 408, __pyx_L1_error) + __pyx_builtin_id = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_id); if (!__pyx_builtin_id) __PYX_ERR(1, 618, __pyx_L1_error) + __pyx_builtin_IndexError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_IndexError); if (!__pyx_builtin_IndexError) __PYX_ERR(1, 914, __pyx_L1_error) + __pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_ImportError); if (!__pyx_builtin_ImportError) __PYX_ERR(2, 1051, __pyx_L1_error) return 0; __pyx_L1_error:; return -1; @@ -27940,9 +28119,6 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject ++getset; } } -#else - CYTHON_UNUSED_VAR(__Pyx__SetItemOnTypeDict); -#endif // !CYTHON_COMPILING_IN_PYPY if (changed) PyType_Modified(type); #endif // PY_VERSION_HEX > 0x030900B1 @@ -28049,12 +28225,6 @@ static int __Pyx_PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **me /* PyObjectCallMethod0 (used by PyType_Ready) */ static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name) { -#if CYTHON_VECTORCALL && (__PYX_LIMITED_VERSION_HEX >= 0x030C0000 || (!CYTHON_COMPILING_IN_LIMITED_API && PY_VERSION_HEX >= 0x03090000)) - PyObject *args[1] = {obj}; - (void) __Pyx_PyObject_CallOneArg; - (void) __Pyx_PyObject_CallNoArg; - return PyObject_VectorcallMethod(method_name, args, 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); -#else PyObject *method = NULL, *result = NULL; int is_method = __Pyx_PyObject_GetMethod(obj, method_name, &method); if (likely(is_method)) { @@ -28497,10 +28667,10 @@ static int __Pyx_setup_reduce(PyObject* type_obj) { } /* TypeImport */ -#ifndef __PYX_HAVE_RT_ImportType_3_2_1 -#define __PYX_HAVE_RT_ImportType_3_2_1 -static PyTypeObject *__Pyx_ImportType_3_2_1(PyObject *module, const char *module_name, const char *class_name, - size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_2_1 check_size) +#ifndef __PYX_HAVE_RT_ImportType_3_1_2 +#define __PYX_HAVE_RT_ImportType_3_1_2 +static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject *module, const char *module_name, const char *class_name, + size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_2 check_size) { PyObject *result = 0; Py_ssize_t basicsize; @@ -28556,7 +28726,7 @@ static PyTypeObject *__Pyx_ImportType_3_2_1(PyObject *module, const char *module module_name, class_name, size, basicsize+itemsize); goto bad; } - if (check_size == __Pyx_ImportType_CheckSize_Error_3_2_1 && + if (check_size == __Pyx_ImportType_CheckSize_Error_3_1_2 && ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) { PyErr_Format(PyExc_ValueError, "%.200s.%.200s size changed, may indicate binary incompatibility. " @@ -28564,7 +28734,7 @@ static PyTypeObject *__Pyx_ImportType_3_2_1(PyObject *module, const char *module module_name, class_name, size, basicsize, basicsize+itemsize); goto bad; } - else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_2_1 && (size_t)basicsize > size) { + else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_1_2 && (size_t)basicsize > size) { if (PyErr_WarnFormat(NULL, 0, "%.200s.%.200s size changed, may indicate binary incompatibility. " "Expected %zd from C header, got %zd from PyObject", @@ -28752,8 +28922,8 @@ static PyTypeObject *__Pyx_FetchCommonTypeFromSpec(PyTypeObject *metaclass, PyOb goto done; } -/* CommonTypesMetaclass (used by CythonFunctionShared) */ -static PyObject* __pyx_CommonTypesMetaclass_get_module(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED void* context) { +/* CommonTypesMetaclass */ +PyObject* __pyx_CommonTypesMetaclass_get_module(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED void* context) { return PyUnicode_FromString(__PYX_ABI_MODULE_NAME); } #if __PYX_LIMITED_VERSION_HEX < 0x030A0000 @@ -33424,209 +33594,167 @@ static const char* __Pyx_BufFmt_CheckString(__Pyx_BufFmt_Context* ctx, const cha /* NewCodeObj */ #if CYTHON_COMPILING_IN_LIMITED_API - static PyObject* __Pyx__PyCode_New(int a, int p, int k, int l, int s, int f, - PyObject *code, PyObject *c, PyObject* n, PyObject *v, - PyObject *fv, PyObject *cell, PyObject* fn, - PyObject *name, int fline, PyObject *lnos) { - PyObject *exception_table = NULL; - PyObject *types_module=NULL, *code_type=NULL, *result=NULL; - #if __PYX_LIMITED_VERSION_HEX < 0x030b0000 - PyObject *version_info; - PyObject *py_minor_version = NULL; - #endif - long minor_version = 0; - PyObject *type, *value, *traceback; - PyErr_Fetch(&type, &value, &traceback); - #if __PYX_LIMITED_VERSION_HEX >= 0x030b0000 - minor_version = 11; - #else - if (!(version_info = PySys_GetObject("version_info"))) goto end; - if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end; - minor_version = PyLong_AsLong(py_minor_version); - Py_DECREF(py_minor_version); - if (minor_version == -1 && PyErr_Occurred()) goto end; - #endif - if (!(types_module = PyImport_ImportModule("types"))) goto end; - if (!(code_type = PyObject_GetAttrString(types_module, "CodeType"))) goto end; - if (minor_version <= 7) { - (void)p; - result = PyObject_CallFunction(code_type, "iiiiiOOOOOOiOOO", a, k, l, s, f, code, - c, n, v, fn, name, fline, lnos, fv, cell); - } else if (minor_version <= 10) { - result = PyObject_CallFunction(code_type, "iiiiiiOOOOOOiOOO", a,p, k, l, s, f, code, - c, n, v, fn, name, fline, lnos, fv, cell); - } else { - if (!(exception_table = PyBytes_FromStringAndSize(NULL, 0))) goto end; - result = PyObject_CallFunction(code_type, "iiiiiiOOOOOOOiOOOO", a,p, k, l, s, f, code, - c, n, v, fn, name, name, fline, lnos, exception_table, fv, cell); - } - end: - Py_XDECREF(code_type); - Py_XDECREF(exception_table); - Py_XDECREF(types_module); - if (type) { - PyErr_Restore(type, value, traceback); - } - return result; - } - #elif PY_VERSION_HEX >= 0x030B0000 - static PyCodeObject* __Pyx__PyCode_New(int a, int p, int k, int l, int s, int f, - PyObject *code, PyObject *c, PyObject* n, PyObject *v, - PyObject *fv, PyObject *cell, PyObject* fn, - PyObject *name, int fline, PyObject *lnos) { - PyCodeObject *result; - result = - #if PY_VERSION_HEX >= 0x030C0000 - PyUnstable_Code_NewWithPosOnlyArgs + static PyObject* __Pyx__PyCode_New(int a, int p, int k, int l, int s, int f, + PyObject *code, PyObject *c, PyObject* n, PyObject *v, + PyObject *fv, PyObject *cell, PyObject* fn, + PyObject *name, int fline, PyObject *lnos) { + PyObject *exception_table = NULL; + PyObject *types_module=NULL, *code_type=NULL, *result=NULL; + #if __PYX_LIMITED_VERSION_HEX < 0x030b0000 + PyObject *version_info; + PyObject *py_minor_version = NULL; + #endif + long minor_version = 0; + PyObject *type, *value, *traceback; + PyErr_Fetch(&type, &value, &traceback); + #if __PYX_LIMITED_VERSION_HEX >= 0x030b0000 + minor_version = 11; #else - PyCode_NewWithPosOnlyArgs + if (!(version_info = PySys_GetObject("version_info"))) goto end; + if (!(py_minor_version = PySequence_GetItem(version_info, 1))) goto end; + minor_version = PyLong_AsLong(py_minor_version); + Py_DECREF(py_minor_version); + if (minor_version == -1 && PyErr_Occurred()) goto end; #endif - (a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, name, fline, lnos, __pyx_mstate_global->__pyx_empty_bytes); - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030c00A1 - if (likely(result)) - result->_co_firsttraceable = 0; - #endif - return result; + if (!(types_module = PyImport_ImportModule("types"))) goto end; + if (!(code_type = PyObject_GetAttrString(types_module, "CodeType"))) goto end; + if (minor_version <= 7) { + (void)p; + result = PyObject_CallFunction(code_type, "iiiiiOOOOOOiOOO", a, k, l, s, f, code, + c, n, v, fn, name, fline, lnos, fv, cell); + } else if (minor_version <= 10) { + result = PyObject_CallFunction(code_type, "iiiiiiOOOOOOiOOO", a,p, k, l, s, f, code, + c, n, v, fn, name, fline, lnos, fv, cell); + } else { + if (!(exception_table = PyBytes_FromStringAndSize(NULL, 0))) goto end; + result = PyObject_CallFunction(code_type, "iiiiiiOOOOOOOiOOOO", a,p, k, l, s, f, code, + c, n, v, fn, name, name, fline, lnos, exception_table, fv, cell); + } + end: + Py_XDECREF(code_type); + Py_XDECREF(exception_table); + Py_XDECREF(types_module); + if (type) { + PyErr_Restore(type, value, traceback); + } + return result; } - #elif !CYTHON_COMPILING_IN_PYPY - #define __Pyx__PyCode_New(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\ - PyCode_NewWithPosOnlyArgs(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) - #else - #define __Pyx__PyCode_New(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\ - PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) - #endif - static PyObject* __Pyx_PyCode_New( - const __Pyx_PyCode_New_function_description descr, - PyObject * const *varnames, - PyObject *filename, - PyObject *funcname, - PyObject *line_table, - PyObject *tuple_dedup_map - ) { - PyObject *code_obj = NULL, *varnames_tuple_dedup = NULL, *code_bytes = NULL; - Py_ssize_t var_count = (Py_ssize_t) descr.nlocals; - PyObject *varnames_tuple = PyTuple_New(var_count); - if (unlikely(!varnames_tuple)) return NULL; - for (Py_ssize_t i=0; i < var_count; i++) { - Py_INCREF(varnames[i]); - if (__Pyx_PyTuple_SET_ITEM(varnames_tuple, i, varnames[i]) != (0)) goto done; - } - #if CYTHON_COMPILING_IN_LIMITED_API - varnames_tuple_dedup = PyDict_GetItem(tuple_dedup_map, varnames_tuple); - if (!varnames_tuple_dedup) { - if (unlikely(PyDict_SetItem(tuple_dedup_map, varnames_tuple, varnames_tuple) < 0)) goto done; - varnames_tuple_dedup = varnames_tuple; - } +#elif PY_VERSION_HEX >= 0x030B0000 + static PyCodeObject* __Pyx__PyCode_New(int a, int p, int k, int l, int s, int f, + PyObject *code, PyObject *c, PyObject* n, PyObject *v, + PyObject *fv, PyObject *cell, PyObject* fn, + PyObject *name, int fline, PyObject *lnos) { + PyCodeObject *result; + result = + #if PY_VERSION_HEX >= 0x030C0000 + PyUnstable_Code_NewWithPosOnlyArgs #else - varnames_tuple_dedup = PyDict_SetDefault(tuple_dedup_map, varnames_tuple, varnames_tuple); - if (unlikely(!varnames_tuple_dedup)) goto done; - #endif - #if CYTHON_AVOID_BORROWED_REFS - Py_INCREF(varnames_tuple_dedup); - #endif - if (__PYX_LIMITED_VERSION_HEX >= (0x030b0000) && line_table != NULL && !CYTHON_COMPILING_IN_GRAAL) { - Py_ssize_t line_table_length = __Pyx_PyBytes_GET_SIZE(line_table); - #if !CYTHON_ASSUME_SAFE_SIZE - if (unlikely(line_table_length == -1)) goto done; - #endif - Py_ssize_t code_len = (line_table_length * 2 + 4) & ~3LL; - code_bytes = PyBytes_FromStringAndSize(NULL, code_len); - if (unlikely(!code_bytes)) goto done; - char* c_code_bytes = PyBytes_AsString(code_bytes); - if (unlikely(!c_code_bytes)) goto done; - memset(c_code_bytes, 0, (size_t) code_len); - } - code_obj = (PyObject*) __Pyx__PyCode_New( - (int) descr.argcount, - (int) descr.num_posonly_args, - (int) descr.num_kwonly_args, - (int) descr.nlocals, - 0, - (int) descr.flags, - code_bytes ? code_bytes : __pyx_mstate_global->__pyx_empty_bytes, - __pyx_mstate_global->__pyx_empty_tuple, - __pyx_mstate_global->__pyx_empty_tuple, - varnames_tuple_dedup, - __pyx_mstate_global->__pyx_empty_tuple, - __pyx_mstate_global->__pyx_empty_tuple, - filename, - funcname, - (int) descr.first_line, - (__PYX_LIMITED_VERSION_HEX >= (0x030b0000) && line_table) ? line_table : __pyx_mstate_global->__pyx_empty_bytes - ); - done: - Py_XDECREF(code_bytes); - #if CYTHON_AVOID_BORROWED_REFS - Py_XDECREF(varnames_tuple_dedup); - #endif - Py_DECREF(varnames_tuple); - return code_obj; - } - -/* DecompressString */ - static PyObject *__Pyx_DecompressString(const char *s, Py_ssize_t length, int algo) { - PyObject *module, *decompress, *compressed_bytes, *decompressed; - const char* module_name = algo == 3 ? "compression.zstd" : algo == 2 ? "bz2" : "zlib"; - PyObject *methodname = PyUnicode_FromString("decompress"); - if (unlikely(!methodname)) return NULL; - #if __PYX_LIMITED_VERSION_HEX >= 0x030e0000 - if (algo == 3) { - PyObject *fromlist = Py_BuildValue("[O]", methodname); - if (unlikely(!fromlist)) return NULL; - module = PyImport_ImportModuleLevel("compression.zstd", NULL, NULL, fromlist, 0); - Py_DECREF(fromlist); - } else + PyCode_NewWithPosOnlyArgs #endif - module = PyImport_ImportModule(module_name); - if (unlikely(!module)) goto import_failed; - decompress = PyObject_GetAttr(module, methodname); - if (unlikely(!decompress)) goto import_failed; - { - #ifdef __cplusplus - char *memview_bytes = const_cast(s); - #else - #if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wcast-qual" - #elif !defined(__INTEL_COMPILER) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wcast-qual" - #endif - char *memview_bytes = (char*) s; - #if defined(__clang__) - #pragma clang diagnostic pop - #elif !defined(__INTEL_COMPILER) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - #endif - #if CYTHON_COMPILING_IN_LIMITED_API && !defined(PyBUF_READ) - int memview_flags = 0x100; - #else - int memview_flags = PyBUF_READ; - #endif - compressed_bytes = PyMemoryView_FromMemory(memview_bytes, length, memview_flags); - } - if (unlikely(!compressed_bytes)) { - Py_DECREF(decompress); - goto bad; - } - decompressed = PyObject_CallFunctionObjArgs(decompress, compressed_bytes, NULL); - Py_DECREF(compressed_bytes); - Py_DECREF(decompress); - Py_DECREF(module); - Py_DECREF(methodname); - return decompressed; - import_failed: - PyErr_Format(PyExc_ImportError, - "Failed to import '%.20s.decompress' - cannot initialise module strings. " - "String compression was configured with the C macro 'CYTHON_COMPRESS_STRINGS=%d'.", - module_name, algo); - bad: - Py_XDECREF(module); - Py_DECREF(methodname); - return NULL; + (a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, name, fline, lnos, __pyx_mstate_global->__pyx_empty_bytes); + return result; } - +#elif PY_VERSION_HEX >= 0x030800B2 && !CYTHON_COMPILING_IN_PYPY + #define __Pyx__PyCode_New(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\ + PyCode_NewWithPosOnlyArgs(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) +#else + #define __Pyx__PyCode_New(a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\ + PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) +#endif +static PyObject* __Pyx_PyCode_New( + const __Pyx_PyCode_New_function_description descr, + PyObject * const *varnames, + PyObject *filename, + PyObject *funcname, + const char *line_table, + PyObject *tuple_dedup_map +) { + PyObject *code_obj = NULL, *varnames_tuple_dedup = NULL, *code_bytes = NULL, *line_table_bytes = NULL; + Py_ssize_t var_count = (Py_ssize_t) descr.nlocals; + PyObject *varnames_tuple = PyTuple_New(var_count); + if (unlikely(!varnames_tuple)) return NULL; + for (Py_ssize_t i=0; i < var_count; i++) { + Py_INCREF(varnames[i]); + if (__Pyx_PyTuple_SET_ITEM(varnames_tuple, i, varnames[i]) != (0)) goto done; + } + #if CYTHON_COMPILING_IN_LIMITED_API + varnames_tuple_dedup = PyDict_GetItem(tuple_dedup_map, varnames_tuple); + if (!varnames_tuple_dedup) { + if (unlikely(PyDict_SetItem(tuple_dedup_map, varnames_tuple, varnames_tuple) < 0)) goto done; + varnames_tuple_dedup = varnames_tuple; + } + #else + varnames_tuple_dedup = PyDict_SetDefault(tuple_dedup_map, varnames_tuple, varnames_tuple); + if (unlikely(!varnames_tuple_dedup)) goto done; + #endif + #if CYTHON_AVOID_BORROWED_REFS + Py_INCREF(varnames_tuple_dedup); + #endif + if (__PYX_LIMITED_VERSION_HEX >= (0x030b0000) && line_table != NULL + && !CYTHON_COMPILING_IN_GRAAL) { + line_table_bytes = PyBytes_FromStringAndSize(line_table, descr.line_table_length); + if (unlikely(!line_table_bytes)) goto done; + Py_ssize_t code_len = (descr.line_table_length * 2 + 4) & ~3; + code_bytes = PyBytes_FromStringAndSize(NULL, code_len); + if (unlikely(!code_bytes)) goto done; + char* c_code_bytes = PyBytes_AsString(code_bytes); + if (unlikely(!c_code_bytes)) goto done; + memset(c_code_bytes, 0, (size_t) code_len); + } + code_obj = (PyObject*) __Pyx__PyCode_New( + (int) descr.argcount, + (int) descr.num_posonly_args, + (int) descr.num_kwonly_args, + (int) descr.nlocals, + 0, + (int) descr.flags, + code_bytes ? code_bytes : __pyx_mstate_global->__pyx_empty_bytes, + __pyx_mstate_global->__pyx_empty_tuple, + __pyx_mstate_global->__pyx_empty_tuple, + varnames_tuple_dedup, + __pyx_mstate_global->__pyx_empty_tuple, + __pyx_mstate_global->__pyx_empty_tuple, + filename, + funcname, + (int) descr.first_line, + (__PYX_LIMITED_VERSION_HEX >= (0x030b0000) && line_table_bytes) ? line_table_bytes : __pyx_mstate_global->__pyx_empty_bytes + ); +done: + Py_XDECREF(code_bytes); + Py_XDECREF(line_table_bytes); + #if CYTHON_AVOID_BORROWED_REFS + Py_XDECREF(varnames_tuple_dedup); + #endif + Py_DECREF(varnames_tuple); + return code_obj; +} + +/* InitStrings */ + static int __Pyx_InitStrings(__Pyx_StringTabEntry const *t, PyObject **target, const char* const* encoding_names) { + while (t->s) { + PyObject *str; + if (t->is_unicode) { + if (t->intern) { + str = PyUnicode_InternFromString(t->s); + } else if (t->encoding) { + str = PyUnicode_Decode(t->s, t->n - 1, encoding_names[t->encoding], NULL); + } else { + str = PyUnicode_FromStringAndSize(t->s, t->n - 1); + } + } else { + str = PyBytes_FromStringAndSize(t->s, t->n - 1); + } + if (!str) + return -1; + *target = str; + if (PyObject_Hash(str) == -1) + return -1; + ++t; + ++target; + } + return 0; +} + #include static CYTHON_INLINE Py_ssize_t __Pyx_ssize_strlen(const char *s) { size_t len = strlen(s); @@ -33851,6 +33979,17 @@ static CYTHON_INLINE PyObject * __Pyx_PyBool_FromLong(long b) { static CYTHON_INLINE PyObject * __Pyx_PyLong_FromSize_t(size_t ival) { return PyLong_FromSize_t(ival); } +#if CYTHON_USE_PYLONG_INTERNALS +static CYTHON_INLINE int __Pyx_PyLong_CompactAsLong(PyObject *x, long *return_value) { + if (unlikely(!__Pyx_PyLong_IsCompact(x))) + return 0; + Py_ssize_t value = __Pyx_PyLong_CompactValue(x); + if ((sizeof(long) < sizeof(Py_ssize_t)) && unlikely(value != (long) value)) + return 0; + *return_value = (long) value; + return 1; +} +#endif /* MultiPhaseInitModuleState */ diff --git a/pyprophet/scoring/runner.py b/pyprophet/scoring/runner.py index 18051c1..cbf0c0d 100644 --- a/pyprophet/scoring/runner.py +++ b/pyprophet/scoring/runner.py @@ -364,7 +364,50 @@ def __init__(self, apply_weights: str, config: RunnerIOConfig): raise elif self.classifier in ("XGBoost", "HistGradientBoosting"): with open(apply_weights, "rb") as file: - self.persisted_weights = pickle.load(file) + loaded_data = pickle.load(file) + # Check if this is new format (dict with metadata) or old format (just model) + if isinstance(loaded_data, dict) and "model" in loaded_data: + # New format with metadata + self.persisted_weights = loaded_data["model"] + stored_ss_main_score = loaded_data.get("ss_main_score", "auto") + stored_level = loaded_data.get("level", self.level) + stored_classifier = loaded_data.get("classifier", self.classifier) + + # Validate level matches + if stored_level != self.level: + raise click.ClickException( + f"Weights file was trained for level '{stored_level}' but you are applying to level '{self.level}'." + ) + + # Validate classifier matches + if stored_classifier != self.classifier: + logger.warning( + f"Weights file was trained with classifier '{stored_classifier}' but you specified '{self.classifier}'. " + f"Using stored classifier '{stored_classifier}'." + ) + + # Use stored ss_main_score if current config has default/auto + if config.runner.ss_main_score == "auto" and stored_ss_main_score != "auto": + logger.info( + f"Using stored ss_main_score='{stored_ss_main_score}' from weights file. " + f"Original training used this main score, applying it ensures feature alignment." + ) + config.runner.ss_main_score = stored_ss_main_score + # Update the dynamic flag to match the restored value + config.runner.ss_use_dynamic_main_score = (stored_ss_main_score == "auto") + elif config.runner.ss_main_score != stored_ss_main_score: + logger.warning( + f"Current ss_main_score='{config.runner.ss_main_score}' differs from stored ss_main_score='{stored_ss_main_score}'. " + f"This may cause feature misalignment. Consider using --ss_main_score={stored_ss_main_score}" + ) + else: + # Old format (backward compatibility) - just the model + self.persisted_weights = loaded_data + logger.warning( + "Loading weights from old format file (no metadata). " + "Feature alignment cannot be automatically verified. " + "Make sure to specify the same --ss_main_score as used during training." + ) elif self.config.file_type == "osw": if self.classifier in ("LDA", "SVM"): try: @@ -401,7 +444,51 @@ def __init__(self, apply_weights: str, config: RunnerIOConfig): "SELECT xgb FROM PYPROPHET_XGB WHERE LEVEL=='%s'" % self.level ).fetchone() con.close() - self.persisted_weights = pickle.loads(data[0]) + loaded_data = pickle.loads(data[0]) + + # Check if this is new format (dict with metadata) or old format (just model) + if isinstance(loaded_data, dict) and "model" in loaded_data: + # New format with metadata + self.persisted_weights = loaded_data["model"] + stored_ss_main_score = loaded_data.get("ss_main_score", "auto") + stored_level = loaded_data.get("level", self.level) + stored_classifier = loaded_data.get("classifier", self.classifier) + + # Validate level matches + if stored_level != self.level: + raise click.ClickException( + f"Weights file was trained for level '{stored_level}' but you are applying to level '{self.level}'." + ) + + # Validate classifier matches + if stored_classifier != self.classifier: + logger.warning( + f"Weights file was trained with classifier '{stored_classifier}' but you specified '{self.classifier}'. " + f"Using stored classifier '{stored_classifier}'." + ) + + # Use stored ss_main_score if current config has default/auto + if config.runner.ss_main_score == "auto" and stored_ss_main_score != "auto": + logger.info( + f"Using stored ss_main_score='{stored_ss_main_score}' from weights file. " + f"Original training used this main score, applying it ensures feature alignment." + ) + config.runner.ss_main_score = stored_ss_main_score + # Update the dynamic flag to match the restored value + config.runner.ss_use_dynamic_main_score = (stored_ss_main_score == "auto") + elif config.runner.ss_main_score != stored_ss_main_score: + logger.warning( + f"Current ss_main_score='{config.runner.ss_main_score}' differs from stored ss_main_score='{stored_ss_main_score}'. " + f"This may cause feature misalignment. Consider using --ss_main_score={stored_ss_main_score}" + ) + else: + # Old format (backward compatibility) - just the model + self.persisted_weights = loaded_data + logger.warning( + "Loading weights from old format file (no metadata). " + "Feature alignment cannot be automatically verified. " + "Make sure to specify the same --ss_main_score as used during training." + ) except Exception: import traceback diff --git a/tests/test_pyprophet_score.py b/tests/test_pyprophet_score.py index 4741810..3ce6262 100644 --- a/tests/test_pyprophet_score.py +++ b/tests/test_pyprophet_score.py @@ -736,6 +736,49 @@ def test_osw_4(test_runner, test_config, regtest): ) +def test_osw_xgboost_importance_apply_weights(test_runner, test_config): + """Ensure feature importances printed during training and when applying weights are identical. + """ + # Run in the current environment; allow failures to surface so CI can catch regressions. + # Prepare test file + strategy = OSWTestStrategy(test_runner, test_config) + strategy.prepare() + + # First, run training to produce an output OSW that contains the XGBoost model + train_cmd = f"pyprophet score --level ms2 --classifier=XGBoost --pi0_lambda=0 0 0 --in={strategy.input_file} --out=test_data_scored.osw --test" + out1 = test_runner.run_command(train_cmd) + + # Parse importance lines from stdout + import re + + pattern = re.compile(r"Importance of (\S+):\s*([0-9eE+\-\.]+)") + imp1 = {m.group(1): float(m.group(2)) for m in pattern.finditer(out1)} + + assert imp1, "No feature importances found in training output" + + # Print importances from training for visual inspection + print("Training importances:") + for feat, val in sorted(imp1.items(), key=lambda x: x[0]): + print(f"{feat}: {val}") + + # Now apply the saved weights from the scored OSW and capture importances + apply_cmd = f"pyprophet score --level ms2 --classifier=XGBoost --pi0_lambda=0 0 0 --in={strategy.input_file} --apply_weights=test_data_scored.osw --out=test_data_scored_weight.osw --test" + out2 = test_runner.run_command(apply_cmd) + imp2 = {m.group(1): float(m.group(2)) for m in pattern.finditer(out2)} + + assert imp2, "No feature importances found in apply_weights output" + + # Print importances from apply_weights for visual inspection + print("Apply-weights importances:") + for feat, val in sorted(imp2.items(), key=lambda x: x[0]): + print(f"{feat}: {val}") + + # Keys should match and values should be equal (allow small numerical tolerance) + assert set(imp1.keys()) == set(imp2.keys()) + for k in imp1: + assert imp1[k] == pytest.approx(imp2[k], rel=1e-6, abs=1e-9) + + def test_osw_5(test_runner, test_config, regtest): run_generic_test( test_runner,