From b72b3416daeb34b14bbbe603833fdaea591ee478 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Oct 2025 01:36:54 +0000 Subject: [PATCH 1/3] Initial plan From d5e363767b9424953f2724df61408f700279aadb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Oct 2025 01:44:37 +0000 Subject: [PATCH 2/3] Store ss_main_score metadata with XGBoost/HistGradientBoosting models Co-authored-by: singjc <32938975+singjc@users.noreply.github.com> --- pyprophet/io/_base.py | 16 +- pyprophet/io/scoring/osw.py | 14 +- pyprophet/scoring/_optimized.c | 726 +++++++++++++++++---------------- pyprophet/scoring/runner.py | 87 +++- 4 files changed, 493 insertions(+), 350 deletions(-) diff --git a/pyprophet/io/_base.py b/pyprophet/io/_base.py index e9719997..17091c28 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 32e1d0fd..38770151 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 91448a4e..1192f5f2 100644 --- a/pyprophet/scoring/_optimized.c +++ b/pyprophet/scoring/_optimized.c @@ -1,4 +1,4 @@ -/* Generated by Cython 3.1.2 */ +/* Generated by Cython 3.1.5 */ /* BEGIN: Cython Metadata { @@ -17,8 +17,16 @@ END: Cython Metadata */ #define PY_SSIZE_T_CLEAN #endif /* PY_SSIZE_T_CLEAN */ /* InitLimitedAPI */ -#if defined(Py_LIMITED_API) && !defined(CYTHON_LIMITED_API) +#if defined(Py_LIMITED_API) + #if !defined(CYTHON_LIMITED_API) #define CYTHON_LIMITED_API 1 + #endif +#elif defined(CYTHON_LIMITED_API) + #ifdef _MSC_VER + #pragma message ("Limited API usage is enabled with 'CYTHON_LIMITED_API' but 'Py_LIMITED_API' does not define a Python target version. Consider setting 'Py_LIMITED_API' instead.") + #else + #warning Limited API usage is enabled with 'CYTHON_LIMITED_API' but 'Py_LIMITED_API' does not define a Python target version. Consider setting 'Py_LIMITED_API' instead. + #endif #endif #include "Python.h" @@ -27,8 +35,8 @@ END: Cython Metadata */ #elif PY_VERSION_HEX < 0x03080000 #error Cython requires Python 3.8+. #else -#define __PYX_ABI_VERSION "3_1_2" -#define CYTHON_HEX_VERSION 0x030102F0 +#define __PYX_ABI_VERSION "3_1_5" +#define CYTHON_HEX_VERSION 0x030105F0 #define CYTHON_FUTURE_DIVISION 1 /* CModulePreamble */ #include @@ -391,6 +399,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 @@ -1295,6 +1306,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 @@ -1371,7 +1383,7 @@ static const char *__pyx_filename; static const char* const __pyx_f[] = { "pyprophet/scoring/_optimized.pyx", "", - "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd", + "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd", "cpython/type.pxd", }; /* #### Code section: utility_code_proto_before_types ### */ @@ -1594,7 +1606,7 @@ typedef struct { /* #### Code section: numeric_typedefs ### */ -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":787 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":743 * # in Cython to enable them only on the right systems. * * ctypedef npy_int8 int8_t # <<<<<<<<<<<<<< @@ -1603,7 +1615,7 @@ typedef struct { */ typedef npy_int8 __pyx_t_5numpy_int8_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":788 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":744 * * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t # <<<<<<<<<<<<<< @@ -1612,26 +1624,26 @@ typedef npy_int8 __pyx_t_5numpy_int8_t; */ typedef npy_int16 __pyx_t_5numpy_int16_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":789 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":745 * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t # <<<<<<<<<<<<<< * ctypedef npy_int64 int64_t - * #ctypedef npy_int96 int96_t + * */ typedef npy_int32 __pyx_t_5numpy_int32_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":790 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":746 * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t * ctypedef npy_int64 int64_t # <<<<<<<<<<<<<< - * #ctypedef npy_int96 int96_t - * #ctypedef npy_int128 int128_t + * + * ctypedef npy_uint8 uint8_t */ typedef npy_int64 __pyx_t_5numpy_int64_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":794 - * #ctypedef npy_int128 int128_t +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":748 + * ctypedef npy_int64 int64_t * * ctypedef npy_uint8 uint8_t # <<<<<<<<<<<<<< * ctypedef npy_uint16 uint16_t @@ -1639,7 +1651,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t; */ typedef npy_uint8 __pyx_t_5numpy_uint8_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":795 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":749 * * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t # <<<<<<<<<<<<<< @@ -1648,26 +1660,26 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t; */ typedef npy_uint16 __pyx_t_5numpy_uint16_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":796 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":750 * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t # <<<<<<<<<<<<<< * ctypedef npy_uint64 uint64_t - * #ctypedef npy_uint96 uint96_t + * */ typedef npy_uint32 __pyx_t_5numpy_uint32_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":797 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":751 * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t * ctypedef npy_uint64 uint64_t # <<<<<<<<<<<<<< - * #ctypedef npy_uint96 uint96_t - * #ctypedef npy_uint128 uint128_t + * + * ctypedef npy_float32 float32_t */ typedef npy_uint64 __pyx_t_5numpy_uint64_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":801 - * #ctypedef npy_uint128 uint128_t +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":753 + * ctypedef npy_uint64 uint64_t * * ctypedef npy_float32 float32_t # <<<<<<<<<<<<<< * ctypedef npy_float64 float64_t @@ -1675,7 +1687,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t; */ typedef npy_float32 __pyx_t_5numpy_float32_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":802 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":754 * * ctypedef npy_float32 float32_t * ctypedef npy_float64 float64_t # <<<<<<<<<<<<<< @@ -1684,7 +1696,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t; */ typedef npy_float64 __pyx_t_5numpy_float64_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":809 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":761 * ctypedef double complex complex128_t * * ctypedef npy_longlong longlong_t # <<<<<<<<<<<<<< @@ -1693,7 +1705,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t; */ typedef npy_longlong __pyx_t_5numpy_longlong_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":810 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":762 * * ctypedef npy_longlong longlong_t * ctypedef npy_ulonglong ulonglong_t # <<<<<<<<<<<<<< @@ -1702,7 +1714,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t; */ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":812 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":764 * ctypedef npy_ulonglong ulonglong_t * * ctypedef npy_intp intp_t # <<<<<<<<<<<<<< @@ -1711,7 +1723,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; */ typedef npy_intp __pyx_t_5numpy_intp_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":813 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":765 * * ctypedef npy_intp intp_t * ctypedef npy_uintp uintp_t # <<<<<<<<<<<<<< @@ -1720,7 +1732,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t; */ typedef npy_uintp __pyx_t_5numpy_uintp_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":815 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":767 * ctypedef npy_uintp uintp_t * * ctypedef npy_double float_t # <<<<<<<<<<<<<< @@ -1729,7 +1741,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t; */ typedef npy_double __pyx_t_5numpy_float_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":816 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":768 * * ctypedef npy_double float_t * ctypedef npy_double double_t # <<<<<<<<<<<<<< @@ -1738,7 +1750,7 @@ typedef npy_double __pyx_t_5numpy_float_t; */ typedef npy_double __pyx_t_5numpy_double_t; -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":817 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":769 * ctypedef npy_double float_t * ctypedef npy_double double_t * ctypedef npy_longdouble longdouble_t # <<<<<<<<<<<<<< @@ -2635,22 +2647,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_1_2 -#define __PYX_HAVE_RT_ImportType_proto_3_1_2 +#ifndef __PYX_HAVE_RT_ImportType_proto_3_1_5 +#define __PYX_HAVE_RT_ImportType_proto_3_1_5 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #include #endif #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L -#define __PYX_GET_STRUCT_ALIGNMENT_3_1_2(s) alignof(s) +#define __PYX_GET_STRUCT_ALIGNMENT_3_1_5(s) alignof(s) #else -#define __PYX_GET_STRUCT_ALIGNMENT_3_1_2(s) sizeof(void*) +#define __PYX_GET_STRUCT_ALIGNMENT_3_1_5(s) sizeof(void*) #endif -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 +enum __Pyx_ImportType_CheckSize_3_1_5 { + __Pyx_ImportType_CheckSize_Error_3_1_5 = 0, + __Pyx_ImportType_CheckSize_Warn_3_1_5 = 1, + __Pyx_ImportType_CheckSize_Ignore_3_1_5 = 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); +static PyTypeObject *__Pyx_ImportType_3_1_5(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_5 check_size); #endif /* FetchSharedCythonModule.proto */ @@ -3418,7 +3430,7 @@ static const char __pyx_k_F_A_R_86_1_a_Rq_c_2T_c_AV1_Q_a[] = "\200\001\360\006\0 static const char __pyx_k_strided_and_direct_or_indirect[] = ""; static const char __pyx_k_8_q_Rq_F_RvRuF_A_q_r_uBa_V1A_e2[] = "\200\001\360\010\000\005\035\320\0348\270\007\270q\300\005\300R\300q\330\004\024\220F\230&\240\001\240\021\330\004\r\210R\210v\220R\220u\230F\240\"\240A\330\004 \240\001\330\004\027\220q\360\006\000\005\013\210%\210r\220\021\330\010\017\210u\220B\220a\330\010\r\210V\2201\220A\330\010\016\210e\2202\220R\220t\2306\240\021\240&\250\003\2501\330\014\024\220A\330\010\024\220A\220X\230V\2406\250\027\260\001\330\010\017\210q\330\017\024\220A\220Q\330\004\013\2101"; static const char __pyx_k_F_BfBe6_1_a_q_q_aq_U_6_q_fAQ_V1[] = "\200\001\360\006\000\005\025\220F\230&\240\001\240\021\330\004\014\210B\210f\220B\220e\2306\240\022\2401\330\004\036\230a\330\004!\240\026\240q\250\001\330\004\037\230q\330\004 \240\006\240a\240q\330\004\"\240!\360\010\000\005\t\210\005\210U\220!\2206\230\026\230q\240\001\330\010\016\210f\220A\220Q\330\010\r\210V\2201\220A\330\010\013\2104\210s\220!\330\014\034\230A\330\014\020\220\001\320\021!\240\021\330\014\037\230q\330\014\032\230!\330\014\033\2301\330\014\r\330\010\013\2103\210b\220\001\330\014\032\230!\330\014\033\2301\330\004\010\210\001\320\t\031\230\021\330\004\013\2101"; -static const char __pyx_k_IJ_E_q_m6_RvR_fBa_a_t1_E_aq_Q_1[] = "\200\001\340IJ\330\004\034\230E\240\026\240q\250\001\330\004\036\230m\2506\260\021\260!\330\004\r\210R\210v\220R\220\240f\250B\250a\330\004\036\230a\360\014\000\005\010\200t\2101\330\010\014\210E\220\025\220a\220q\330\014\023\220=\240\001\240\021\330\014\025\220Q\330\014\030\230\003\2301\230E\240\021\240#\240R\240q\330\014\020\220\005\220U\230!\2303\230a\330\020\027\220s\230!\2305\240\001\240\023\240B\240a\330\020\023\2205\230\002\230!\330\024 \240\001\330\024\035\230Q\330\014\020\220\001\220\025\220a\330\010\017\210q\340\004\021\220\037\240\001\240\021\330\004\010\210\005\210U\220!\2201\330\010\017\210}\230A\230Q\330\010\013\210;\220c\230\021\330\014\025\220Q\330\014\030\230\003\2301\230E\240\021\240#\240R\240q\330\014\020\220\005\220U\230!\2303\230a\330\020\027\220s\230!\2305\240\001\240\023\240B\240a\330\020\023\2205\230\002\230!\330\024 \240\001\330\024\035\230Q\330\r\030\230\003\2301\330\014\022\220!\330\014\023\220:\230R\230q\330\014\026\220a\330\014\017\210u\220A\220U\230#\230Q\330\020\031\230\021\330\021\026\220a\220v\230S\240\001\330\020\031\230\021\340\020\026\220d\230\"\230E\240\022\2401\330\024\033\2304\230r\240\026\240s\250!\330\024\027\220u\230A\230U\240#\240Q\330\030!\240\021\330\024\027\220u\230A\230U\240\"\240A\330\030\036\230a\340\030\037\230q\330\020\023\2207\230$\230a\330\024\027\220s\230!\2305\240\001\240\025\240b\250\006\250b\260\003\2601\260E\270\021\270&\300\002\300!\330\030!\240\021\340\030!\240\021\340\014\022\220'\230\022\2301\330\020\023\2205\230\001\230\027\240\002\240#\240S\250\005\250Q\250a\330\024\035\230W\240B\240a\340\024\025\340\014\022\220!\330\014\023\220:\230R\230q\330\014\026\220a\330\014\017\210u\220A\220U\230#\230Q\330\020\031\230\021\330\021\026\220a\220v\230S\240\001\330\020\031\230\021\340\020\026\220d\230\"\230E\240\022\2401\330\024\033\2304\230r\240\026\240s\250!\330\024\027\220u\230A\230U\240#\240Q\330\030!\240\021\330\030\031\330\024\027\220u\230A\230U\240\"\240A\330\030\036\230a\340\030\037\230q\330\020\023\2207\230$""\230a\330\024\027\220s\230!\2305\240\001\240\025\240b\250\006\250b\260\003\2601\260E\270\021\270&\300\002\300!\330\030!\240\021\340\030!\240\021\340\014\022\220'\230\022\2301\330\020\023\2205\230\001\230\027\240\002\240#\240S\250\005\250Q\250a\330\024\035\230W\240B\240a\340\024\025\340\010\014\210A\210U\220!\330\004\013\2101"; +static const char __pyx_k_IJ_E_q_m6_RvR_fBa_a_t1_E_aq_Q_1[] = "\200\001\340IJ\330\004\034\230E\240\026\240q\250\001\330\004\036\230m\2506\260\021\260!\330\004\r\210R\210v\220R\220\177\240f\250B\250a\330\004\036\230a\360\014\000\005\010\200t\2101\330\010\014\210E\220\025\220a\220q\330\014\023\220=\240\001\240\021\330\014\025\220Q\330\014\030\230\003\2301\230E\240\021\240#\240R\240q\330\014\020\220\005\220U\230!\2303\230a\330\020\027\220s\230!\2305\240\001\240\023\240B\240a\330\020\023\2205\230\002\230!\330\024 \240\001\330\024\035\230Q\330\014\020\220\001\220\025\220a\330\010\017\210q\340\004\021\220\037\240\001\240\021\330\004\010\210\005\210U\220!\2201\330\010\017\210}\230A\230Q\330\010\013\210;\220c\230\021\330\014\025\220Q\330\014\030\230\003\2301\230E\240\021\240#\240R\240q\330\014\020\220\005\220U\230!\2303\230a\330\020\027\220s\230!\2305\240\001\240\023\240B\240a\330\020\023\2205\230\002\230!\330\024 \240\001\330\024\035\230Q\330\r\030\230\003\2301\330\014\022\220!\330\014\023\220:\230R\230q\330\014\026\220a\330\014\017\210u\220A\220U\230#\230Q\330\020\031\230\021\330\021\026\220a\220v\230S\240\001\330\020\031\230\021\340\020\026\220d\230\"\230E\240\022\2401\330\024\033\2304\230r\240\026\240s\250!\330\024\027\220u\230A\230U\240#\240Q\330\030!\240\021\330\024\027\220u\230A\230U\240\"\240A\330\030\036\230a\340\030\037\230q\330\020\023\2207\230$\230a\330\024\027\220s\230!\2305\240\001\240\025\240b\250\006\250b\260\003\2601\260E\270\021\270&\300\002\300!\330\030!\240\021\340\030!\240\021\340\014\022\220'\230\022\2301\330\020\023\2205\230\001\230\027\240\002\240#\240S\250\005\250Q\250a\330\024\035\230W\240B\240a\340\024\025\340\014\022\220!\330\014\023\220:\230R\230q\330\014\026\220a\330\014\017\210u\220A\220U\230#\230Q\330\020\031\230\021\330\021\026\220a\220v\230S\240\001\330\020\031\230\021\340\020\026\220d\230\"\230E\240\022\2401\330\024\033\2304\230r\240\026\240s\250!\330\024\027\220u\230A\230U\240#\240Q\330\030!\240\021\330\030\031\330\024\027\220u\230A\230U\240\"\240A\330\030\036\230a\340\030\037\230q\330\020\023\2207""\230$\230a\330\024\027\220s\230!\2305\240\001\240\025\240b\250\006\250b\260\003\2601\260E\270\021\270&\300\002\300!\330\030!\240\021\340\030!\240\021\340\014\022\220'\230\022\2301\330\020\023\2205\230\001\230\027\240\002\240#\240S\250\005\250Q\250a\330\024\035\230W\240B\240a\340\024\025\340\010\014\210A\210U\220!\330\004\013\2101"; static const char __pyx_k_N_RvRq_fBa_1_Q_Ba_nAQ_Q_1E_Ba_B[] = "\200\001\360\014\000\005\025\220N\240&\250\001\250\021\360\006\000\005!\240\001\330\004\r\210R\210v\220R\220q\230\001\230\025\230f\240B\240a\330\004#\2401\360\010\000\005\026\220Q\360\006\000\005\t\210\001\330\004\n\210\"\210B\210a\330\010\016\210n\230A\230Q\330\010\r\210Q\340\004\013\2101\210E\220\023\220B\220a\360\010\000\005\t\210\001\330\004\n\210\"\210B\210a\330\010\016\210n\230A\230Q\330\010\014\210A\330\010\r\210Q\340\010\016\210b\220\002\220!\330\014\017\210r\220\023\220A\330\020\026\220n\240A\240Q\330\014\021\220\021\340\010\024\320\024%\240Q\240a\240u\250B\250a\340\010\017\210q\220\001\220\021\220%\220z\240\022\2401\330\010\r\210Q\360\006\000\005\t\210\001\330\004\n\210\"\210B\210a\210q\220\001\330\010\023\2207\230!\2301\330\010\r\210Q\360\006\000\005\t\210\001\330\004\n\210\"\210B\210a\210q\220\001\330\010\017\210q\220\005\220W\230A\230S\240\002\240!\330\010\r\210Q\340\004\013\2101"; static const char __pyx_k_All_dimensions_preceding_dimensi[] = "All dimensions preceding dimension %d must be indexed and not sliced"; static const char __pyx_k_Buffer_view_does_not_expose_stri[] = "Buffer view does not expose strides"; @@ -3958,7 +3970,7 @@ static int __pyx_array___cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, P default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__cinit__", 0) < 0) __PYX_ERR(1, 129, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__cinit__", 0) < (0)) __PYX_ERR(1, 129, __pyx_L3_error) if (!values[3]) values[3] = __Pyx_NewRef(((PyObject *)__pyx_mstate_global->__pyx_n_u_c)); for (Py_ssize_t i = __pyx_nargs; i < 3; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__cinit__", 0, 3, 5, i); __PYX_ERR(1, 129, __pyx_L3_error) } @@ -5572,7 +5584,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < 0) __PYX_ERR(1, 3, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < (0)) __PYX_ERR(1, 3, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__setstate_cython__", 1, 1, 1, i); __PYX_ERR(1, 3, __pyx_L3_error) } } @@ -5917,7 +5929,7 @@ static struct __pyx_array_obj *__pyx_array_new(PyObject *__pyx_v_shape, Py_ssize __pyx_t_4 = 0; __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 273, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_4, __pyx_mstate_global->__pyx_n_u_allocate_buffer, Py_False) < 0) __PYX_ERR(1, 273, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_mstate_global->__pyx_n_u_allocate_buffer, Py_False) < (0)) __PYX_ERR(1, 273, __pyx_L1_error) __pyx_t_3 = ((PyObject *)__pyx_tp_new_array(((PyTypeObject *)__pyx_mstate_global->__pyx_array_type), __pyx_t_1, __pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 273, __pyx_L1_error) __Pyx_GOTREF((PyObject *)__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -6012,7 +6024,7 @@ static int __pyx_MemviewEnum___init__(PyObject *__pyx_v_self, PyObject *__pyx_ar default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__init__", 0) < 0) __PYX_ERR(1, 302, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__init__", 0) < (0)) __PYX_ERR(1, 302, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, i); __PYX_ERR(1, 302, __pyx_L3_error) } } @@ -6449,7 +6461,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < 0) __PYX_ERR(1, 16, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < (0)) __PYX_ERR(1, 16, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__setstate_cython__", 1, 1, 1, i); __PYX_ERR(1, 16, __pyx_L3_error) } } @@ -6574,7 +6586,7 @@ static int __pyx_memoryview___cinit__(PyObject *__pyx_v_self, PyObject *__pyx_ar default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__cinit__", 0) < 0) __PYX_ERR(1, 347, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__cinit__", 0) < (0)) __PYX_ERR(1, 347, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__cinit__", 0, 2, 3, i); __PYX_ERR(1, 347, __pyx_L3_error) } } @@ -10891,7 +10903,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < 0) __PYX_ERR(1, 3, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < (0)) __PYX_ERR(1, 3, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__setstate_cython__", 1, 1, 1, i); __PYX_ERR(1, 3, __pyx_L3_error) } } @@ -13778,7 +13790,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < 0) __PYX_ERR(1, 3, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__setstate_cython__", 0) < (0)) __PYX_ERR(1, 3, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__setstate_cython__", 1, 1, 1, i); __PYX_ERR(1, 3, __pyx_L3_error) } } @@ -16937,7 +16949,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__pyx_unpickle_Enum", 0) < 0) __PYX_ERR(1, 1, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "__pyx_unpickle_Enum", 0) < (0)) __PYX_ERR(1, 1, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 3; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("__pyx_unpickle_Enum", 1, 3, 3, i); __PYX_ERR(1, 1, __pyx_L3_error) } } @@ -17259,7 +17271,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":286 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":242 * cdef int type_num * * @property # <<<<<<<<<<<<<< @@ -17270,7 +17282,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_Descr *__pyx_v_self) { npy_intp __pyx_r; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":288 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":244 * @property * cdef inline npy_intp itemsize(self) noexcept nogil: * return PyDataType_ELSIZE(self) # <<<<<<<<<<<<<< @@ -17280,7 +17292,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D __pyx_r = PyDataType_ELSIZE(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":286 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":242 * cdef int type_num * * @property # <<<<<<<<<<<<<< @@ -17293,7 +17305,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":290 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":246 * return PyDataType_ELSIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17304,7 +17316,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_8itemsize_itemsize(PyArray_D static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray_Descr *__pyx_v_self) { npy_intp __pyx_r; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":292 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":248 * @property * cdef inline npy_intp alignment(self) noexcept nogil: * return PyDataType_ALIGNMENT(self) # <<<<<<<<<<<<<< @@ -17314,7 +17326,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray __pyx_r = PyDataType_ALIGNMENT(__pyx_v_self); goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":290 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":246 * return PyDataType_ELSIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17327,7 +17339,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_5dtype_9alignment_alignment(PyArray return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":296 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":252 * # Use fields/names with care as they may be NULL. You must check * # for this using PyDataType_HASFIELDS. * @property # <<<<<<<<<<<<<< @@ -17341,7 +17353,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc PyObject *__pyx_t_1; __Pyx_RefNannySetupContext("fields", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":298 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":254 * @property * cdef inline object fields(self): * return PyDataType_FIELDS(self) # <<<<<<<<<<<<<< @@ -17354,7 +17366,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":296 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":252 * # Use fields/names with care as they may be NULL. You must check * # for this using PyDataType_HASFIELDS. * @property # <<<<<<<<<<<<<< @@ -17369,7 +17381,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_6fields_fields(PyArray_Desc return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":300 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":256 * return PyDataType_FIELDS(self) * * @property # <<<<<<<<<<<<<< @@ -17383,7 +17395,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":302 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":258 * @property * cdef inline tuple names(self): * return PyDataType_NAMES(self) # <<<<<<<<<<<<<< @@ -17396,7 +17408,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":300 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":256 * return PyDataType_FIELDS(self) * * @property # <<<<<<<<<<<<<< @@ -17411,7 +17423,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_5dtype_5names_names(PyArray_Descr return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":307 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":263 * # valid (the pointer can be NULL). Most users should access * # this field via the inline helper method PyDataType_SHAPE. * @property # <<<<<<<<<<<<<< @@ -17422,7 +17434,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":309 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":265 * @property * cdef inline PyArray_ArrayDescr* subarray(self) noexcept nogil: * return PyDataType_SUBARRAY(self) # <<<<<<<<<<<<<< @@ -17432,7 +17444,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":307 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":263 * # valid (the pointer can be NULL). Most users should access * # this field via the inline helper method PyDataType_SHAPE. * @property # <<<<<<<<<<<<<< @@ -17445,7 +17457,7 @@ static CYTHON_INLINE PyArray_ArrayDescr *__pyx_f_5numpy_5dtype_8subarray_subarra return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":311 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":267 * return PyDataType_SUBARRAY(self) * * @property # <<<<<<<<<<<<<< @@ -17456,7 +17468,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":314 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":270 * cdef inline npy_uint64 flags(self) noexcept nogil: * """The data types flags.""" * return PyDataType_FLAGS(self) # <<<<<<<<<<<<<< @@ -17466,7 +17478,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":311 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":267 * return PyDataType_SUBARRAY(self) * * @property # <<<<<<<<<<<<<< @@ -17479,7 +17491,7 @@ static CYTHON_INLINE npy_uint64 __pyx_f_5numpy_5dtype_5flags_flags(PyArray_Descr return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":323 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":279 * ctypedef class numpy.broadcast [object PyArrayMultiIterObject, check_size ignore]: * * @property # <<<<<<<<<<<<<< @@ -17490,7 +17502,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":326 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":282 * 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) # <<<<<<<<<<<<<< @@ -17500,7 +17512,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":323 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":279 * ctypedef class numpy.broadcast [object PyArrayMultiIterObject, check_size ignore]: * * @property # <<<<<<<<<<<<<< @@ -17513,7 +17525,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_7numiter_numiter(PyArrayMulti return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":328 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":284 * return PyArray_MultiIter_NUMITER(self) * * @property # <<<<<<<<<<<<<< @@ -17524,7 +17536,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":331 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":287 * cdef inline npy_intp size(self) noexcept nogil: * """The total broadcasted size.""" * return PyArray_MultiIter_SIZE(self) # <<<<<<<<<<<<<< @@ -17534,7 +17546,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":328 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":284 * return PyArray_MultiIter_NUMITER(self) * * @property # <<<<<<<<<<<<<< @@ -17547,7 +17559,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_4size_size(PyArrayMultiI return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":333 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":289 * return PyArray_MultiIter_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17558,7 +17570,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":336 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":292 * cdef inline npy_intp index(self) noexcept nogil: * """The current (1-d) index into the broadcasted result.""" * return PyArray_MultiIter_INDEX(self) # <<<<<<<<<<<<<< @@ -17568,7 +17580,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":333 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":289 * return PyArray_MultiIter_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17581,7 +17593,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_9broadcast_5index_index(PyArrayMult return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":338 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":294 * return PyArray_MultiIter_INDEX(self) * * @property # <<<<<<<<<<<<<< @@ -17592,7 +17604,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":341 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":297 * cdef inline int nd(self) noexcept nogil: * """The number of dimensions in the broadcasted result.""" * return PyArray_MultiIter_NDIM(self) # <<<<<<<<<<<<<< @@ -17602,7 +17614,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":338 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":294 * return PyArray_MultiIter_INDEX(self) * * @property # <<<<<<<<<<<<<< @@ -17615,7 +17627,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_9broadcast_2nd_nd(PyArrayMultiIterObject return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":343 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":299 * return PyArray_MultiIter_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17626,7 +17638,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":346 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":302 * cdef inline npy_intp* dimensions(self) noexcept nogil: * """The shape of the broadcasted result.""" * return PyArray_MultiIter_DIMS(self) # <<<<<<<<<<<<<< @@ -17636,7 +17648,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":343 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":299 * return PyArray_MultiIter_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17649,7 +17661,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_9broadcast_10dimensions_dimensions return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":348 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":304 * return PyArray_MultiIter_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17660,7 +17672,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":352 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":308 * """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) # <<<<<<<<<<<<<< @@ -17670,7 +17682,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":348 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":304 * return PyArray_MultiIter_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17683,7 +17695,7 @@ static CYTHON_INLINE void **__pyx_f_5numpy_9broadcast_5iters_iters(PyArrayMultiI return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":366 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":322 * # Instead, we use properties that map to the corresponding C-API functions. * * @property # <<<<<<<<<<<<<< @@ -17694,7 +17706,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":370 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":326 * """Returns a borrowed reference to the object owning the data/memory. * """ * return PyArray_BASE(self) # <<<<<<<<<<<<<< @@ -17704,7 +17716,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":366 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":322 * # Instead, we use properties that map to the corresponding C-API functions. * * @property # <<<<<<<<<<<<<< @@ -17717,7 +17729,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":372 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":328 * return PyArray_BASE(self) * * @property # <<<<<<<<<<<<<< @@ -17731,7 +17743,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":376 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":332 * """Returns an owned reference to the dtype of the array. * """ * return PyArray_DESCR(self) # <<<<<<<<<<<<<< @@ -17744,7 +17756,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":372 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":328 * return PyArray_BASE(self) * * @property # <<<<<<<<<<<<<< @@ -17759,7 +17771,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":378 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":334 * return PyArray_DESCR(self) * * @property # <<<<<<<<<<<<<< @@ -17770,7 +17782,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":382 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":338 * """Returns the number of dimensions in the array. * """ * return PyArray_NDIM(self) # <<<<<<<<<<<<<< @@ -17780,7 +17792,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":378 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":334 * return PyArray_DESCR(self) * * @property # <<<<<<<<<<<<<< @@ -17793,7 +17805,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":384 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":340 * return PyArray_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17804,7 +17816,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":390 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":346 * Can return NULL for 0-dimensional arrays. * """ * return PyArray_DIMS(self) # <<<<<<<<<<<<<< @@ -17814,7 +17826,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":384 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":340 * return PyArray_NDIM(self) * * @property # <<<<<<<<<<<<<< @@ -17827,7 +17839,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":392 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":348 * return PyArray_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17838,7 +17850,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":397 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":353 * The number of elements matches the number of dimensions of the array (ndim). * """ * return PyArray_STRIDES(self) # <<<<<<<<<<<<<< @@ -17848,7 +17860,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":392 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":348 * return PyArray_DIMS(self) * * @property # <<<<<<<<<<<<<< @@ -17861,7 +17873,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":399 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":355 * return PyArray_STRIDES(self) * * @property # <<<<<<<<<<<<<< @@ -17872,7 +17884,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":403 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":359 * """Returns the total size (in number of elements) of the array. * """ * return PyArray_SIZE(self) # <<<<<<<<<<<<<< @@ -17882,7 +17894,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":399 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":355 * return PyArray_STRIDES(self) * * @property # <<<<<<<<<<<<<< @@ -17895,7 +17907,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject * return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":405 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":361 * return PyArray_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17906,7 +17918,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":412 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":368 * of `PyArray_DATA()` instead, which returns a 'void*'. * """ * return PyArray_BYTES(self) # <<<<<<<<<<<<<< @@ -17916,7 +17928,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":405 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":361 * return PyArray_SIZE(self) * * @property # <<<<<<<<<<<<<< @@ -17929,7 +17941,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":824 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":776 * ctypedef long double complex clongdouble_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -17946,7 +17958,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":825 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":777 * * cdef inline object PyArray_MultiIterNew1(a): * return PyArray_MultiIterNew(1, a) # <<<<<<<<<<<<<< @@ -17954,13 +17966,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ * cdef inline object PyArray_MultiIterNew2(a, b): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 825, __pyx_L1_error) + __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 777, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":824 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":776 * ctypedef long double complex clongdouble_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -17979,7 +17991,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":827 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":779 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -17996,7 +18008,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":828 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":780 * * cdef inline object PyArray_MultiIterNew2(a, b): * return PyArray_MultiIterNew(2, a, b) # <<<<<<<<<<<<<< @@ -18004,13 +18016,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ * cdef inline object PyArray_MultiIterNew3(a, b, c): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 828, __pyx_L1_error) + __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 780, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":827 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":779 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -18029,7 +18041,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":830 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":782 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -18046,7 +18058,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":831 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":783 * * cdef inline object PyArray_MultiIterNew3(a, b, c): * return PyArray_MultiIterNew(3, a, b, c) # <<<<<<<<<<<<<< @@ -18054,13 +18066,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ * cdef inline object PyArray_MultiIterNew4(a, b, c, d): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 831, __pyx_L1_error) + __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 783, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":830 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":782 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -18079,7 +18091,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":833 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":785 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -18096,7 +18108,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":834 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":786 * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): * return PyArray_MultiIterNew(4, a, b, c, d) # <<<<<<<<<<<<<< @@ -18104,13 +18116,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 834, __pyx_L1_error) + __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 786, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":833 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":785 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -18129,7 +18141,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":836 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":788 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -18146,7 +18158,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":837 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":789 * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): * return PyArray_MultiIterNew(5, a, b, c, d, e) # <<<<<<<<<<<<<< @@ -18154,13 +18166,13 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ * cdef inline tuple PyDataType_SHAPE(dtype d): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 837, __pyx_L1_error) + __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 789, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":836 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":788 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -18179,7 +18191,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":839 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":791 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -18194,7 +18206,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":840 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":792 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -18204,7 +18216,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":841 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":793 * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): * return d.subarray.shape # <<<<<<<<<<<<<< @@ -18217,7 +18229,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":840 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":792 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -18226,7 +18238,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ */ } - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":843 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":795 * return d.subarray.shape * else: * return () # <<<<<<<<<<<<<< @@ -18240,7 +18252,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ goto __pyx_L0; } - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":839 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":791 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -18255,7 +18267,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1035 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":994 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base) except *: # <<<<<<<<<<<<<< @@ -18269,7 +18281,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1036 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":995 * * cdef inline void set_array_base(ndarray arr, object base) except *: * Py_INCREF(base) # important to do this before stealing the reference below! # <<<<<<<<<<<<<< @@ -18278,16 +18290,16 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ Py_INCREF(__pyx_v_base); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1037 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":996 * cdef inline void set_array_base(ndarray arr, object base) except *: * Py_INCREF(base) # important to do this before stealing the reference below! * PyArray_SetBaseObject(arr, base) # <<<<<<<<<<<<<< * * cdef inline object get_array_base(ndarray arr): */ - __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 1037, __pyx_L1_error) + __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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1035 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":994 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base) except *: # <<<<<<<<<<<<<< @@ -18302,7 +18314,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __pyx_L0:; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1039 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":998 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -18317,7 +18329,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1040 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":999 * * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) # <<<<<<<<<<<<<< @@ -18326,7 +18338,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1041 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1000 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -18336,7 +18348,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1042 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1001 * base = PyArray_BASE(arr) * if base is NULL: * return None # <<<<<<<<<<<<<< @@ -18347,7 +18359,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1041 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1000 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -18356,7 +18368,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ } - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1043 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1002 * if base is NULL: * return None * return base # <<<<<<<<<<<<<< @@ -18368,7 +18380,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1039 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":998 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -18383,7 +18395,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1047 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1006 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -18410,7 +18422,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_array", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1048 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1007 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -18426,16 +18438,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1049 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1008 * cdef inline int import_array() except -1: * try: * __pyx_import_array() # <<<<<<<<<<<<<< * except Exception: * raise ImportError("numpy._core.multiarray failed to import") */ - __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1049, __pyx_L3_error) + __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1008, __pyx_L3_error) - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1048 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1007 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -18449,7 +18461,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1050 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1009 * try: * __pyx_import_array() * except Exception: # <<<<<<<<<<<<<< @@ -18459,12 +18471,12 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(((PyTypeObject*)PyExc_Exception)))); if (__pyx_t_4) { __Pyx_AddTraceback("numpy.import_array", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 1050, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 1009, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1051 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1010 * __pyx_import_array() * except Exception: * raise ImportError("numpy._core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -18480,16 +18492,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+__pyx_t_11, (2-__pyx_t_11) | (__pyx_t_11*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1051, __pyx_L5_except_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1010, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_8); } __Pyx_Raise(__pyx_t_8, 0, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __PYX_ERR(2, 1051, __pyx_L5_except_error) + __PYX_ERR(2, 1010, __pyx_L5_except_error) } goto __pyx_L5_except_error; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1048 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1007 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -18505,7 +18517,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_L8_try_end:; } - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1047 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1006 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -18530,7 +18542,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1053 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1012 * raise ImportError("numpy._core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -18557,7 +18569,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_umath", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1054 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1013 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -18573,16 +18585,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1055 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1014 * cdef inline int import_umath() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< * except Exception: * raise ImportError("numpy._core.umath failed to import") */ - __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1055, __pyx_L3_error) + __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1014, __pyx_L3_error) - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1054 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1013 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -18596,7 +18608,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1056 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1015 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -18606,12 +18618,12 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(((PyTypeObject*)PyExc_Exception)))); if (__pyx_t_4) { __Pyx_AddTraceback("numpy.import_umath", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 1056, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 1015, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1057 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1016 * _import_umath() * except Exception: * raise ImportError("numpy._core.umath failed to import") # <<<<<<<<<<<<<< @@ -18627,16 +18639,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+__pyx_t_11, (2-__pyx_t_11) | (__pyx_t_11*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1057, __pyx_L5_except_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1016, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_8); } __Pyx_Raise(__pyx_t_8, 0, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __PYX_ERR(2, 1057, __pyx_L5_except_error) + __PYX_ERR(2, 1016, __pyx_L5_except_error) } goto __pyx_L5_except_error; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1054 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1013 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -18652,7 +18664,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_L8_try_end:; } - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1053 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1012 * raise ImportError("numpy._core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -18677,7 +18689,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1059 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1018 * raise ImportError("numpy._core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -18704,7 +18716,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_ufunc", 0); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1060 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1019 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -18720,16 +18732,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1061 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1020 * cdef inline int import_ufunc() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< * except Exception: * raise ImportError("numpy._core.umath failed to import") */ - __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1061, __pyx_L3_error) + __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 1020, __pyx_L3_error) - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1060 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1019 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -18743,7 +18755,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1062 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1021 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -18753,12 +18765,12 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_t_4 = __Pyx_PyErr_ExceptionMatches(((PyObject *)(((PyTypeObject*)PyExc_Exception)))); if (__pyx_t_4) { __Pyx_AddTraceback("numpy.import_ufunc", __pyx_clineno, __pyx_lineno, __pyx_filename); - if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 1062, __pyx_L5_except_error) + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7) < 0) __PYX_ERR(2, 1021, __pyx_L5_except_error) __Pyx_XGOTREF(__pyx_t_5); __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1063 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1022 * _import_umath() * except Exception: * raise ImportError("numpy._core.umath failed to import") # <<<<<<<<<<<<<< @@ -18774,16 +18786,16 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_t_8 = __Pyx_PyObject_FastCall(__pyx_t_10, __pyx_callargs+__pyx_t_11, (2-__pyx_t_11) | (__pyx_t_11*__Pyx_PY_VECTORCALL_ARGUMENTS_OFFSET)); __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1063, __pyx_L5_except_error) + if (unlikely(!__pyx_t_8)) __PYX_ERR(2, 1022, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_8); } __Pyx_Raise(__pyx_t_8, 0, 0, 0); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __PYX_ERR(2, 1063, __pyx_L5_except_error) + __PYX_ERR(2, 1022, __pyx_L5_except_error) } goto __pyx_L5_except_error; - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1060 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1019 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -18799,7 +18811,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_L8_try_end:; } - /* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1059 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1018 * raise ImportError("numpy._core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -18824,7 +18836,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1066 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1025 * * * cdef inline bint is_timedelta64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18835,7 +18847,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1078 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1037 * bool * """ * return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<< @@ -18845,7 +18857,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1066 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1025 * * * cdef inline bint is_timedelta64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18858,7 +18870,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1081 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1040 * * * cdef inline bint is_datetime64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18869,7 +18881,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1093 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1052 * bool * """ * return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<< @@ -18879,7 +18891,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1081 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1040 * * * cdef inline bint is_datetime64_object(object obj) noexcept: # <<<<<<<<<<<<<< @@ -18892,7 +18904,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1096 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1055 * * * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18903,7 +18915,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1103 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1062 * also needed. That can be found using `get_datetime64_unit`. * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -18913,7 +18925,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1096 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1055 * * * cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18926,7 +18938,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1106 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1065 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18937,7 +18949,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1110 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1069 * returns the int64 value underlying scalar numpy timedelta64 object * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -18947,7 +18959,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1106 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1065 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18960,7 +18972,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject return __pyx_r; } -/* "../../../../../tmp/pip-build-env-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1113 +/* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1072 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -18971,7 +18983,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1117 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1076 * returns the unit part of the dtype for a numpy datetime64 object. * """ * return (obj).obmeta.base # <<<<<<<<<<<<<< @@ -18981,7 +18993,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-0mzx3goa/overlay/lib/python3.10/site-packages/numpy/__init__.cython-30.pxd":1113 + /* "../../../../../tmp/pip-build-env-1kzzeyuf/overlay/local/lib/python3.12/dist-packages/numpy/__init__.cython-30.pxd":1072 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil: # <<<<<<<<<<<<<< @@ -19062,7 +19074,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "find_nearest_matches", 0) < 0) __PYX_ERR(0, 12, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "find_nearest_matches", 0) < (0)) __PYX_ERR(0, 12, __pyx_L3_error) if (!values[2]) values[2] = __Pyx_NewRef(((PyObject *)((PyObject*)__pyx_mstate_global->__pyx_int_1))); for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("find_nearest_matches", 0, 2, 3, i); __PYX_ERR(0, 12, __pyx_L3_error) } @@ -19215,7 +19227,7 @@ 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) + 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; @@ -20579,7 +20591,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "count_num_positives", 0) < 0) __PYX_ERR(0, 135, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "count_num_positives", 0) < (0)) __PYX_ERR(0, 135, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 1; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("count_num_positives", 1, 1, 1, i); __PYX_ERR(0, 135, __pyx_L3_error) } } @@ -20697,7 +20709,7 @@ 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) + 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; @@ -20915,7 +20927,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "find_top_ranked", 0) < 0) __PYX_ERR(0, 154, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "find_top_ranked", 0) < (0)) __PYX_ERR(0, 154, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("find_top_ranked", 1, 2, 2, i); __PYX_ERR(0, 154, __pyx_L3_error) } } @@ -21038,7 +21050,7 @@ 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) + 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; @@ -21548,7 +21560,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "rank", 0) < 0) __PYX_ERR(0, 201, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "rank", 0) < (0)) __PYX_ERR(0, 201, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("rank", 1, 2, 2, i); __PYX_ERR(0, 201, __pyx_L3_error) } } @@ -21674,7 +21686,7 @@ 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) + 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; @@ -21900,7 +21912,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "rank32", 0) < 0) __PYX_ERR(0, 223, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "rank32", 0) < (0)) __PYX_ERR(0, 223, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 2; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("rank32", 1, 2, 2, i); __PYX_ERR(0, 223, __pyx_L3_error) } } @@ -22026,7 +22038,7 @@ 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) + 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; @@ -22257,7 +22269,7 @@ PyObject *__pyx_args, PyObject *__pyx_kwds default: goto __pyx_L5_argtuple_error; } const Py_ssize_t kwd_pos_args = __pyx_nargs; - if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "single_chromatogram_hypothesis_fast", 0) < 0) __PYX_ERR(0, 245, __pyx_L3_error) + if (__Pyx_ParseKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values, kwd_pos_args, __pyx_kwds_len, "single_chromatogram_hypothesis_fast", 0) < (0)) __PYX_ERR(0, 245, __pyx_L3_error) for (Py_ssize_t i = __pyx_nargs; i < 3; i++) { if (unlikely(!values[i])) { __Pyx_RaiseArgtupleInvalid("single_chromatogram_hypothesis_fast", 1, 3, 3, i); __PYX_ERR(0, 245, __pyx_L3_error) } } @@ -22387,7 +22399,7 @@ 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) + 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; @@ -23688,35 +23700,35 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { #else #warning "The buffer protocol is not supported in the Limited C-API < 3.11." #endif - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type___pyx_array_spec, __pyx_mstate->__pyx_array_type) < 0) __PYX_ERR(1, 110, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type___pyx_array_spec, __pyx_mstate->__pyx_array_type) < (0)) __PYX_ERR(1, 110, __pyx_L1_error) #else __pyx_mstate->__pyx_array_type = &__pyx_type___pyx_array; #endif #if !CYTHON_COMPILING_IN_LIMITED_API #endif #if !CYTHON_USE_TYPE_SPECS - if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_array_type) < 0) __PYX_ERR(1, 110, __pyx_L1_error) + if (__Pyx_PyType_Ready(__pyx_mstate->__pyx_array_type) < (0)) __PYX_ERR(1, 110, __pyx_L1_error) #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) + 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) #else __pyx_mstate->__pyx_MemviewEnum_type = &__pyx_type___pyx_MemviewEnum; #endif #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) + 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)) { __pyx_mstate->__pyx_MemviewEnum_type->tp_getattro = PyObject_GenericGetAttr; } #endif - if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_MemviewEnum_type) < 0) __PYX_ERR(1, 299, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_MemviewEnum_type) < (0)) __PYX_ERR(1, 299, __pyx_L1_error) __pyx_vtabptr_memoryview = &__pyx_vtable_memoryview; __pyx_vtable_memoryview.get_item_pointer = (char *(*)(struct __pyx_memoryview_obj *, PyObject *))__pyx_memoryview_get_item_pointer; __pyx_vtable_memoryview.is_slice = (PyObject *(*)(struct __pyx_memoryview_obj *, PyObject *))__pyx_memoryview_is_slice; @@ -23740,23 +23752,23 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { #else #warning "The buffer protocol is not supported in the Limited C-API < 3.11." #endif - if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type___pyx_memoryview_spec, __pyx_mstate->__pyx_memoryview_type) < 0) __PYX_ERR(1, 334, __pyx_L1_error) + if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type___pyx_memoryview_spec, __pyx_mstate->__pyx_memoryview_type) < (0)) __PYX_ERR(1, 334, __pyx_L1_error) #else __pyx_mstate->__pyx_memoryview_type = &__pyx_type___pyx_memoryview; #endif #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) + 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)) { __pyx_mstate->__pyx_memoryview_type->tp_getattro = PyObject_GenericGetAttr; } #endif - if (__Pyx_SetVtable(__pyx_mstate->__pyx_memoryview_type, __pyx_vtabptr_memoryview) < 0) __PYX_ERR(1, 334, __pyx_L1_error) - if (__Pyx_MergeVtables(__pyx_mstate->__pyx_memoryview_type) < 0) __PYX_ERR(1, 334, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_memoryview_type) < 0) __PYX_ERR(1, 334, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_mstate->__pyx_memoryview_type, __pyx_vtabptr_memoryview) < (0)) __PYX_ERR(1, 334, __pyx_L1_error) + if (__Pyx_MergeVtables(__pyx_mstate->__pyx_memoryview_type) < (0)) __PYX_ERR(1, 334, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject *) __pyx_mstate->__pyx_memoryview_type) < (0)) __PYX_ERR(1, 334, __pyx_L1_error) __pyx_vtabptr__memoryviewslice = &__pyx_vtable__memoryviewslice; __pyx_vtable__memoryviewslice.__pyx_base = *__pyx_vtabptr_memoryview; __pyx_vtable__memoryviewslice.__pyx_base.convert_item_to_object = (PyObject *(*)(struct __pyx_memoryview_obj *, char *))__pyx_memoryviewslice_convert_item_to_object; @@ -23768,7 +23780,7 @@ static int __Pyx_modinit_type_init_code(__pyx_mstatetype *__pyx_mstate) { __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, 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) + 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 @@ -23776,16 +23788,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, 950, __pyx_L1_error) + 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, 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) + 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:; @@ -23805,153 +23817,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_1_2(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type", + __pyx_mstate->__pyx_ptype_7cpython_4type_type = __Pyx_ImportType_3_1_5(__pyx_t_1, __Pyx_BUILTIN_MODULE_NAME, "type", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyTypeObject), + sizeof(PyTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyTypeObject), #elif CYTHON_COMPILING_IN_LIMITED_API 0, 0, #else - sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyHeapTypeObject), + sizeof(PyHeapTypeObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyHeapTypeObject), #endif - __Pyx_ImportType_CheckSize_Warn_3_1_2); if (!__pyx_mstate->__pyx_ptype_7cpython_4type_type) __PYX_ERR(3, 9, __pyx_L1_error) + __Pyx_ImportType_CheckSize_Warn_3_1_5); 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, 272, __pyx_L1_error) + __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_1_2(__pyx_t_1, "numpy", "dtype", + __pyx_mstate->__pyx_ptype_5numpy_dtype = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "dtype", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArray_Descr), + sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArray_Descr), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArray_Descr), + sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArray_Descr), #else - sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArray_Descr), + sizeof(PyArray_Descr), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArray_Descr), #endif - __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", + __Pyx_ImportType_CheckSize_Ignore_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_dtype) __PYX_ERR(2, 228, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_flatiter = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "flatiter", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayIterObject), + sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayIterObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayIterObject), + sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayIterObject), #else - sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayIterObject), + sizeof(PyArrayIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayIterObject), #endif - __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", + __Pyx_ImportType_CheckSize_Ignore_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_flatiter) __PYX_ERR(2, 273, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_broadcast = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "broadcast", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayMultiIterObject), + sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayMultiIterObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayMultiIterObject), + sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayMultiIterObject), #else - sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayMultiIterObject), + sizeof(PyArrayMultiIterObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayMultiIterObject), #endif - __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", + __Pyx_ImportType_CheckSize_Ignore_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_broadcast) __PYX_ERR(2, 277, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_ndarray = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "ndarray", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayObject), + sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayObject), + sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayObject), #else - sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyArrayObject), + sizeof(PyArrayObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyArrayObject), #endif - __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", + __Pyx_ImportType_CheckSize_Ignore_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_ndarray) __PYX_ERR(2, 316, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_generic = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "generic", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_generic) __PYX_ERR(2, 825, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_number = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "number", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_number) __PYX_ERR(2, 827, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_integer = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "integer", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_integer) __PYX_ERR(2, 829, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_signedinteger = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "signedinteger", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_signedinteger) __PYX_ERR(2, 831, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_unsignedinteger = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "unsignedinteger", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_unsignedinteger) __PYX_ERR(2, 833, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_inexact = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "inexact", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_inexact) __PYX_ERR(2, 835, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_floating = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "floating", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_floating) __PYX_ERR(2, 837, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_complexfloating = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "complexfloating", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_complexfloating) __PYX_ERR(2, 839, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_flexible = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "flexible", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_flexible) __PYX_ERR(2, 841, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_character = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "character", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #else - sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyObject), + sizeof(PyObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyObject), #endif - __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", + __Pyx_ImportType_CheckSize_Warn_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_character) __PYX_ERR(2, 843, __pyx_L1_error) + __pyx_mstate->__pyx_ptype_5numpy_ufunc = __Pyx_ImportType_3_1_5(__pyx_t_1, "numpy", "ufunc", #if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x050B0000 - sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyUFuncObject), + sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyUFuncObject), #elif CYTHON_COMPILING_IN_LIMITED_API - sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyUFuncObject), + sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyUFuncObject), #else - sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_2(PyUFuncObject), + sizeof(PyUFuncObject), __PYX_GET_STRUCT_ALIGNMENT_3_1_5(PyUFuncObject), #endif - __Pyx_ImportType_CheckSize_Ignore_3_1_2); if (!__pyx_mstate->__pyx_ptype_5numpy_ufunc) __PYX_ERR(2, 955, __pyx_L1_error) + __Pyx_ImportType_CheckSize_Ignore_3_1_5); if (!__pyx_mstate->__pyx_ptype_5numpy_ufunc) __PYX_ERR(2, 907, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_RefNannyFinishContext(); return 0; @@ -24214,7 +24226,7 @@ if (!__Pyx_RefNanny) { #endif __Pyx_RefNannySetupContext("PyInit__optimized", 0); - 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 @@ -24222,30 +24234,30 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); __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) /*--- Initialize various global constants etc. ---*/ - if (__Pyx_InitConstants(__pyx_mstate) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + 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) + 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) + 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) + 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) + 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) + 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) + 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) + 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) } { PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) __PYX_ERR(0, 1, __pyx_L1_error) @@ -24254,10 +24266,10 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 0); } } /*--- Builtin init code ---*/ - if (__Pyx_InitCachedBuiltins(__pyx_mstate) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + if (__Pyx_InitCachedBuiltins(__pyx_mstate) < (0)) __PYX_ERR(0, 1, __pyx_L1_error) /*--- Constants init code ---*/ - if (__Pyx_InitCachedConstants(__pyx_mstate) < 0) __PYX_ERR(0, 1, __pyx_L1_error) - if (__Pyx_CreateCodeObjects(__pyx_mstate) < 0) __PYX_ERR(0, 1, __pyx_L1_error) + if (__Pyx_InitCachedConstants(__pyx_mstate) < (0)) __PYX_ERR(0, 1, __pyx_L1_error) + if (__Pyx_CreateCodeObjects(__pyx_mstate) < (0)) __PYX_ERR(0, 1, __pyx_L1_error) /*--- Global type/function init code ---*/ (void)__Pyx_modinit_global_init_code(__pyx_mstate); (void)__Pyx_modinit_variable_export_code(__pyx_mstate); @@ -24408,7 +24420,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24420,7 +24432,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24630,7 +24642,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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":984 @@ -24642,7 +24654,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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":982 @@ -24797,7 +24809,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24809,7 +24821,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24821,7 +24833,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24834,7 +24846,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24846,7 +24858,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24858,7 +24870,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24870,7 +24882,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24882,7 +24894,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24894,7 +24906,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 @@ -24904,7 +24916,7 @@ __Pyx_RefNannySetupContext("PyInit__optimized", 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) + 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 ---*/ @@ -25168,7 +25180,7 @@ static int __Pyx_InitCachedBuiltins(__pyx_mstatetype *__pyx_mstate) { __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) + __pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_mstate->__pyx_n_u_ImportError); if (!__pyx_builtin_ImportError) __PYX_ERR(2, 1010, __pyx_L1_error) return 0; __pyx_L1_error:; return -1; @@ -25557,7 +25569,7 @@ __Pyx_PyTuple_FromArray(PyObject *const *src, Py_ssize_t n) res = PyTuple_New(n); if (unlikely(res == NULL)) return NULL; for (i = 0; i < n; i++) { - if (unlikely(__Pyx_PyTuple_SET_ITEM(res, i, src[i]) < 0)) { + if (unlikely(__Pyx_PyTuple_SET_ITEM(res, i, src[i]) < (0))) { Py_DECREF(res); return NULL; } @@ -28297,6 +28309,7 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject changed = 1; } #endif // CYTHON_METH_FASTCALL +#if !CYTHON_COMPILING_IN_PYPY else if (strcmp(memb->name, "__module__") == 0) { PyObject *descr; assert(memb->type == T_OBJECT); @@ -28311,11 +28324,13 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject } changed = 1; } +#endif // !CYTHON_COMPILING_IN_PYPY } memb++; } } #endif // !CYTHON_COMPILING_IN_LIMITED_API +#if !CYTHON_COMPILING_IN_PYPY slot = spec->slots; while (slot && slot->slot && slot->slot != Py_tp_getset) slot++; @@ -28347,6 +28362,7 @@ static int __Pyx_fix_up_extension_type_from_spec(PyType_Spec *spec, PyTypeObject ++getset; } } +#endif // !CYTHON_COMPILING_IN_PYPY if (changed) PyType_Modified(type); #endif // PY_VERSION_HEX > 0x030900B1 @@ -28451,6 +28467,13 @@ static int __Pyx_PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **me /* PyObjectCallMethod0 */ 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_GetMethod; + (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)) { @@ -28463,6 +28486,7 @@ static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name Py_DECREF(method); bad: return result; +#endif } /* ValidateBasesTuple */ @@ -28892,15 +28916,15 @@ static int __Pyx_setup_reduce(PyObject* type_obj) { } /* TypeImport */ -#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) +#ifndef __PYX_HAVE_RT_ImportType_3_1_5 +#define __PYX_HAVE_RT_ImportType_3_1_5 +static PyTypeObject *__Pyx_ImportType_3_1_5(PyObject *module, const char *module_name, const char *class_name, + size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_1_5 check_size) { PyObject *result = 0; Py_ssize_t basicsize; Py_ssize_t itemsize; -#if CYTHON_COMPILING_IN_LIMITED_API +#if defined(Py_LIMITED_API) || (defined(CYTHON_COMPILING_IN_LIMITED_API) && CYTHON_COMPILING_IN_LIMITED_API) PyObject *py_basicsize; PyObject *py_itemsize; #endif @@ -28913,7 +28937,7 @@ static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject *module, const char *module module_name, class_name); goto bad; } -#if !CYTHON_COMPILING_IN_LIMITED_API +#if !( defined(Py_LIMITED_API) || (defined(CYTHON_COMPILING_IN_LIMITED_API) && CYTHON_COMPILING_IN_LIMITED_API) ) basicsize = ((PyTypeObject *)result)->tp_basicsize; itemsize = ((PyTypeObject *)result)->tp_itemsize; #else @@ -28951,7 +28975,7 @@ static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject *module, const char *module module_name, class_name, size, basicsize+itemsize); goto bad; } - if (check_size == __Pyx_ImportType_CheckSize_Error_3_1_2 && + if (check_size == __Pyx_ImportType_CheckSize_Error_3_1_5 && ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) { PyErr_Format(PyExc_ValueError, "%.200s.%.200s size changed, may indicate binary incompatibility. " @@ -28959,7 +28983,7 @@ static PyTypeObject *__Pyx_ImportType_3_1_2(PyObject *module, const char *module module_name, class_name, size, basicsize, basicsize+itemsize); goto bad; } - else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_1_2 && (size_t)basicsize > size) { + else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_1_5 && (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", @@ -29100,7 +29124,7 @@ static PyTypeObject *__Pyx_FetchCommonTypeFromSpec(PyTypeObject *metaclass, PyOb } /* CommonTypesMetaclass */ -PyObject* __pyx_CommonTypesMetaclass_get_module(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED void* context) { +static PyObject* __pyx_CommonTypesMetaclass_get_module(CYTHON_UNUSED PyObject *self, CYTHON_UNUSED void* context) { return PyUnicode_FromString(__PYX_ABI_MODULE_NAME); } static PyGetSetDef __pyx_CommonTypesMetaclass_getset[] = { @@ -29129,6 +29153,7 @@ static int __pyx_CommonTypesMetaclass_init(PyObject *module) { return -1; } mstate->__pyx_CommonTypesMetaclassType = __Pyx_FetchCommonTypeFromSpec(NULL, module, &__pyx_CommonTypesMetaclass_spec, bases); + Py_DECREF(bases); if (unlikely(mstate->__pyx_CommonTypesMetaclassType == NULL)) { return -1; } @@ -33739,6 +33764,10 @@ __Pyx_PyType_GetFullyQualifiedName(PyTypeObject* tp) PyCode_NewWithPosOnlyArgs #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; } #elif PY_VERSION_HEX >= 0x030800B2 && !CYTHON_COMPILING_IN_PYPY @@ -34066,6 +34095,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 18051c15..222acd1a 100644 --- a/pyprophet/scoring/runner.py +++ b/pyprophet/scoring/runner.py @@ -364,7 +364,48 @@ 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 + 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 +442,49 @@ 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 + 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 From 626854977c2eec844129dafe6ca628b7232f36b0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Oct 2025 01:51:12 +0000 Subject: [PATCH 3/3] Update ss_use_dynamic_main_score flag when restoring ss_main_score Co-authored-by: singjc <32938975+singjc@users.noreply.github.com> --- pyprophet/scoring/runner.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyprophet/scoring/runner.py b/pyprophet/scoring/runner.py index 222acd1a..cbf0c0d4 100644 --- a/pyprophet/scoring/runner.py +++ b/pyprophet/scoring/runner.py @@ -393,6 +393,8 @@ def __init__(self, apply_weights: str, config: RunnerIOConfig): 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}'. " @@ -472,6 +474,8 @@ def __init__(self, apply_weights: str, config: RunnerIOConfig): 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}'. "