diff --git a/PyCafe.cpp b/PyCafe.cpp index 8b72539..1b2e523 100644 --- a/PyCafe.cpp +++ b/PyCafe.cpp @@ -1,4 +1,4 @@ -/* Generated by Cython 0.29.24 */ +/* Generated by Cython 0.29.30 */ /* BEGIN: Cython Metadata { @@ -6,43 +6,43 @@ "depends": [ "/opt/gfa/cafe/boost/boost_1_61_0/include/boost/multi_index_container.hpp", "/opt/gfa/cafe/boost/boost_1_61_0/include/boost/smart_ptr/shared_ptr.hpp", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/PVCtrlHolder.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/PVDataHolder.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/PVGroup.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/cafe.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/cafeDataType.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/cafeEnum.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/caopCodes.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/channelRegalia.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/defines.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/exceptions.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/handleHelper.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/policies.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/policyHelper.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/statusCodes.h", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include/tmDateMap.h", - "/opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/core/include/numpy/arrayobject.h", - "/opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/core/include/numpy/arrayscalars.h", - "/opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/core/include/numpy/ndarrayobject.h", - "/opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/core/include/numpy/ndarraytypes.h", - "/opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/core/include/numpy/ufuncobject.h", - "/usr/local/epics/base-7.0.6/include/cadef.h", - "/usr/local/epics/base-7.0.6/include/caerr.h", - "/usr/local/epics/base-7.0.6/include/caeventmask.h", - "/usr/local/epics/base-7.0.6/include/db_access.h", - "/usr/local/epics/base-7.0.6/include/epicsMutex.h", - "/usr/local/epics/base-7.0.6/include/epicsTime.h" + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/PVCtrlHolder.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/PVDataHolder.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/PVGroup.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/cafe.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/cafeDataType.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/cafeEnum.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/caopCodes.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/channelRegalia.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/defines.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/exceptions.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/handleHelper.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/policies.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/policyHelper.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/statusCodes.h", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include/tmDateMap.h", + "/opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/core/include/numpy/arrayobject.h", + "/opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/core/include/numpy/arrayscalars.h", + "/opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/core/include/numpy/ndarrayobject.h", + "/opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/core/include/numpy/ndarraytypes.h", + "/opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/core/include/numpy/ufuncobject.h", + "/usr/local/epics/base-7.0.7/include/cadef.h", + "/usr/local/epics/base-7.0.7/include/caerr.h", + "/usr/local/epics/base-7.0.7/include/caeventmask.h", + "/usr/local/epics/base-7.0.7/include/db_access.h", + "/usr/local/epics/base-7.0.7/include/epicsMutex.h", + "/usr/local/epics/base-7.0.7/include/epicsTime.h" ], "include_dirs": [ "/opt/gfa/python-3.8/latest/include/python3.8m", - "/usr/local/epics/base-7.0.6/include", - "/usr/local/epics/base-7.0.6/include/os/Linux", - "/usr/local/epics/base-7.0.6/include/compiler/gcc", + "/usr/local/epics/base-7.0.7/include", + "/usr/local/epics/base-7.0.7/include/os/Linux", + "/usr/local/epics/base-7.0.7/include/compiler/gcc", "/opt/gfa/cafe/boost/boost_1_61_0/include", "/opt/gfa/cafe/boost/boost_1_61_0/include/boost", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/include", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/include", ".", - "/opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/core/include" + "/opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/core/include" ], "language": "c++", "libraries": [ @@ -54,16 +54,16 @@ "Qt5Core" ], "library_dirs": [ - "/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/lib/RHEL7-x86_64", + "/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/lib/RHEL8-x86_64", "/opt/psi/Programming/gcc/7.5.0/lib64", "/opt/psi/Programming/gcc/7.5.0/lib", "/opt/gfa/python-3.8/latest/lib" ], "name": "PyCafe", "runtime_library_dirs": [ - "/usr/local/epics/base-7.0.6/lib/RHEL7-x86_64", - "/opt/gfa/cafe/cpp/cafe-1.19.0-py38-gcc-7.5.0/lib/RHEL7-x86_64", + "/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64", + "/opt/gfa/cafe/cpp/cafe-1.19.3-py38-gcc-7.5.0/lib/RHEL8-x86_64", "/opt/psi/Programming/gcc/7.5.0/lib64", "/opt/psi/Programming/gcc/7.5.0/lib" ], @@ -84,8 +84,8 @@ END: Cython Metadata */ #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000) #error Cython requires Python 2.6+ or Python 3.3+. #else -#define CYTHON_ABI "0_29_24" -#define CYTHON_HEX_VERSION 0x001D18F0 +#define CYTHON_ABI "0_29_30" +#define CYTHON_HEX_VERSION 0x001D1EF0 #define CYTHON_FUTURE_DIVISION 1 #include #ifndef offsetof @@ -160,6 +160,9 @@ END: Cython Metadata */ #define CYTHON_USE_DICT_VERSIONS 0 #undef CYTHON_USE_EXC_INFO_STACK #define CYTHON_USE_EXC_INFO_STACK 0 + #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC + #define CYTHON_UPDATE_DESCRIPTOR_DOC (PYPY_VERSION_HEX >= 0x07030900) + #endif #elif defined(PYSTON_VERSION) #define CYTHON_COMPILING_IN_PYPY 0 #define CYTHON_COMPILING_IN_PYSTON 1 @@ -201,6 +204,9 @@ END: Cython Metadata */ #define CYTHON_USE_DICT_VERSIONS 0 #undef CYTHON_USE_EXC_INFO_STACK #define CYTHON_USE_EXC_INFO_STACK 0 + #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC + #define CYTHON_UPDATE_DESCRIPTOR_DOC 0 + #endif #else #define CYTHON_COMPILING_IN_PYPY 0 #define CYTHON_COMPILING_IN_PYSTON 0 @@ -232,7 +238,7 @@ END: Cython Metadata */ #ifndef CYTHON_USE_UNICODE_INTERNALS #define CYTHON_USE_UNICODE_INTERNALS 1 #endif - #if PY_VERSION_HEX < 0x030300F0 + #if PY_VERSION_HEX < 0x030300F0 || PY_VERSION_HEX >= 0x030B00A2 #undef CYTHON_USE_UNICODE_WRITER #define CYTHON_USE_UNICODE_WRITER 0 #elif !defined(CYTHON_USE_UNICODE_WRITER) @@ -247,11 +253,14 @@ END: Cython Metadata */ #ifndef CYTHON_UNPACK_METHODS #define CYTHON_UNPACK_METHODS 1 #endif - #ifndef CYTHON_FAST_THREAD_STATE + #if PY_VERSION_HEX >= 0x030B00A4 + #undef CYTHON_FAST_THREAD_STATE + #define CYTHON_FAST_THREAD_STATE 0 + #elif !defined(CYTHON_FAST_THREAD_STATE) #define CYTHON_FAST_THREAD_STATE 1 #endif #ifndef CYTHON_FAST_PYCALL - #define CYTHON_FAST_PYCALL 1 + #define CYTHON_FAST_PYCALL (PY_VERSION_HEX < 0x030A0000) #endif #ifndef CYTHON_PEP489_MULTI_PHASE_INIT #define CYTHON_PEP489_MULTI_PHASE_INIT (PY_VERSION_HEX >= 0x03050000) @@ -262,15 +271,23 @@ END: Cython Metadata */ #ifndef CYTHON_USE_DICT_VERSIONS #define CYTHON_USE_DICT_VERSIONS (PY_VERSION_HEX >= 0x030600B1) #endif - #ifndef CYTHON_USE_EXC_INFO_STACK + #if PY_VERSION_HEX >= 0x030B00A4 + #undef CYTHON_USE_EXC_INFO_STACK + #define CYTHON_USE_EXC_INFO_STACK 0 + #elif !defined(CYTHON_USE_EXC_INFO_STACK) #define CYTHON_USE_EXC_INFO_STACK (PY_VERSION_HEX >= 0x030700A3) #endif + #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC + #define CYTHON_UPDATE_DESCRIPTOR_DOC 1 + #endif #endif #if !defined(CYTHON_FAST_PYCCALL) #define CYTHON_FAST_PYCCALL (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1) #endif #if CYTHON_USE_PYLONG_INTERNALS - #include "longintrepr.h" + #if PY_MAJOR_VERSION < 3 + #include "longintrepr.h" + #endif #undef SHIFT #undef BASE #undef MASK @@ -401,9 +418,68 @@ class __Pyx_FakeReference { #define __Pyx_DefaultClassType PyClass_Type #else #define __Pyx_BUILTIN_MODULE_NAME "builtins" -#if PY_VERSION_HEX >= 0x030800A4 && PY_VERSION_HEX < 0x030800B2 - #define __Pyx_PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\ - PyCode_New(a, 0, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) + #define __Pyx_DefaultClassType PyType_Type +#if PY_VERSION_HEX >= 0x030B00A1 + static CYTHON_INLINE PyCodeObject* __Pyx_PyCode_New(int a, int k, int l, int s, int f, + PyObject *code, PyObject *c, PyObject* n, PyObject *v, + PyObject *fv, PyObject *cell, PyObject* fn, + PyObject *name, int fline, PyObject *lnos) { + PyObject *kwds=NULL, *argcount=NULL, *posonlyargcount=NULL, *kwonlyargcount=NULL; + PyObject *nlocals=NULL, *stacksize=NULL, *flags=NULL, *replace=NULL, *call_result=NULL, *empty=NULL; + const char *fn_cstr=NULL; + const char *name_cstr=NULL; + PyCodeObject* co=NULL; + PyObject *type, *value, *traceback; + PyErr_Fetch(&type, &value, &traceback); + if (!(kwds=PyDict_New())) goto end; + if (!(argcount=PyLong_FromLong(a))) goto end; + if (PyDict_SetItemString(kwds, "co_argcount", argcount) != 0) goto end; + if (!(posonlyargcount=PyLong_FromLong(0))) goto end; + if (PyDict_SetItemString(kwds, "co_posonlyargcount", posonlyargcount) != 0) goto end; + if (!(kwonlyargcount=PyLong_FromLong(k))) goto end; + if (PyDict_SetItemString(kwds, "co_kwonlyargcount", kwonlyargcount) != 0) goto end; + if (!(nlocals=PyLong_FromLong(l))) goto end; + if (PyDict_SetItemString(kwds, "co_nlocals", nlocals) != 0) goto end; + if (!(stacksize=PyLong_FromLong(s))) goto end; + if (PyDict_SetItemString(kwds, "co_stacksize", stacksize) != 0) goto end; + if (!(flags=PyLong_FromLong(f))) goto end; + if (PyDict_SetItemString(kwds, "co_flags", flags) != 0) goto end; + if (PyDict_SetItemString(kwds, "co_code", code) != 0) goto end; + if (PyDict_SetItemString(kwds, "co_consts", c) != 0) goto end; + if (PyDict_SetItemString(kwds, "co_names", n) != 0) goto end; + if (PyDict_SetItemString(kwds, "co_varnames", v) != 0) goto end; + if (PyDict_SetItemString(kwds, "co_freevars", fv) != 0) goto end; + if (PyDict_SetItemString(kwds, "co_cellvars", cell) != 0) goto end; + if (PyDict_SetItemString(kwds, "co_linetable", lnos) != 0) goto end; + if (!(fn_cstr=PyUnicode_AsUTF8AndSize(fn, NULL))) goto end; + if (!(name_cstr=PyUnicode_AsUTF8AndSize(name, NULL))) goto end; + if (!(co = PyCode_NewEmpty(fn_cstr, name_cstr, fline))) goto end; + if (!(replace = PyObject_GetAttrString((PyObject*)co, "replace"))) goto cleanup_code_too; + if (!(empty = PyTuple_New(0))) goto cleanup_code_too; // unfortunately __pyx_empty_tuple isn't available here + if (!(call_result = PyObject_Call(replace, empty, kwds))) goto cleanup_code_too; + Py_XDECREF((PyObject*)co); + co = (PyCodeObject*)call_result; + call_result = NULL; + if (0) { + cleanup_code_too: + Py_XDECREF((PyObject*)co); + co = NULL; + } + end: + Py_XDECREF(kwds); + Py_XDECREF(argcount); + Py_XDECREF(posonlyargcount); + Py_XDECREF(kwonlyargcount); + Py_XDECREF(nlocals); + Py_XDECREF(stacksize); + Py_XDECREF(replace); + Py_XDECREF(call_result); + Py_XDECREF(empty); + if (type) { + PyErr_Restore(type, value, traceback); + } + return co; + } #else #define __Pyx_PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)\ PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) @@ -641,10 +717,10 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { #if PY_VERSION_HEX < 0x030200A4 typedef long Py_hash_t; #define __Pyx_PyInt_FromHash_t PyInt_FromLong - #define __Pyx_PyInt_AsHash_t PyInt_AsLong + #define __Pyx_PyInt_AsHash_t __Pyx_PyIndex_AsHash_t #else #define __Pyx_PyInt_FromHash_t PyInt_FromSsize_t - #define __Pyx_PyInt_AsHash_t PyInt_AsSsize_t + #define __Pyx_PyInt_AsHash_t __Pyx_PyIndex_AsSsize_t #endif #if PY_MAJOR_VERSION >= 3 #define __Pyx_PyMethod_New(func, self, klass) ((self) ? ((void)(klass), PyMethod_New(func, self)) : __Pyx_NewRef(func)) @@ -669,8 +745,10 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { } __Pyx_PyAsyncMethodsStruct; #endif -#if defined(WIN32) || defined(MS_WINDOWS) - #define _USE_MATH_DEFINES +#if defined(_WIN32) || defined(WIN32) || defined(MS_WINDOWS) + #if !defined(_USE_MATH_DEFINES) + #define _USE_MATH_DEFINES + #endif #endif #include #ifdef NAN @@ -713,7 +791,8 @@ static CYTHON_INLINE float __PYX_NAN() { #include #include - #if __cplusplus > 199711L + #if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600) + // move should be defined for these versions of MSVC, but __cplusplus isn't set usefully #include namespace cython_std { @@ -736,11 +815,11 @@ static CYTHON_INLINE float __PYX_NAN() { #include "boost/multi_index_container.hpp" #include "boost/smart_ptr/shared_ptr.hpp" #include "epicsMutex.h" +#include "epicsTime.h" #include "cadef.h" #include "defines.h" #include "caeventmask.h" #include "time.h" -#include "epicsTime.h" #include "db_access.h" #include "caerr.h" #include "caopCodes.h" @@ -856,6 +935,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyNumber_IntOrLong(PyObject* x); (likely(PyTuple_CheckExact(obj)) ? __Pyx_NewRef(obj) : PySequence_Tuple(obj)) static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*); static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t); +static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*); #if CYTHON_ASSUME_SAFE_MACROS #define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x)) #else @@ -1109,7 +1189,7 @@ typedef struct { } __Pyx_BufFmt_Context; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":690 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":690 * # in Cython to enable them only on the right systems. * * ctypedef npy_int8 int8_t # <<<<<<<<<<<<<< @@ -1118,7 +1198,7 @@ typedef struct { */ typedef npy_int8 __pyx_t_5numpy_int8_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":691 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":691 * * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t # <<<<<<<<<<<<<< @@ -1127,7 +1207,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t; */ typedef npy_int16 __pyx_t_5numpy_int16_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":692 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":692 * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t # <<<<<<<<<<<<<< @@ -1136,7 +1216,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t; */ typedef npy_int32 __pyx_t_5numpy_int32_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":693 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":693 * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t * ctypedef npy_int64 int64_t # <<<<<<<<<<<<<< @@ -1145,7 +1225,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t; */ typedef npy_int64 __pyx_t_5numpy_int64_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":697 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":697 * #ctypedef npy_int128 int128_t * * ctypedef npy_uint8 uint8_t # <<<<<<<<<<<<<< @@ -1154,7 +1234,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t; */ typedef npy_uint8 __pyx_t_5numpy_uint8_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":698 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":698 * * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t # <<<<<<<<<<<<<< @@ -1163,7 +1243,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t; */ typedef npy_uint16 __pyx_t_5numpy_uint16_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":699 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":699 * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t # <<<<<<<<<<<<<< @@ -1172,7 +1252,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t; */ typedef npy_uint32 __pyx_t_5numpy_uint32_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":700 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":700 * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t * ctypedef npy_uint64 uint64_t # <<<<<<<<<<<<<< @@ -1181,7 +1261,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t; */ typedef npy_uint64 __pyx_t_5numpy_uint64_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":704 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":704 * #ctypedef npy_uint128 uint128_t * * ctypedef npy_float32 float32_t # <<<<<<<<<<<<<< @@ -1190,7 +1270,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t; */ typedef npy_float32 __pyx_t_5numpy_float32_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":705 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":705 * * ctypedef npy_float32 float32_t * ctypedef npy_float64 float64_t # <<<<<<<<<<<<<< @@ -1199,7 +1279,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t; */ typedef npy_float64 __pyx_t_5numpy_float64_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":714 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":714 * # The int types are mapped a bit surprising -- * # numpy.int corresponds to 'l' and numpy.long to 'q' * ctypedef npy_long int_t # <<<<<<<<<<<<<< @@ -1208,7 +1288,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t; */ typedef npy_long __pyx_t_5numpy_int_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":715 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":715 * # numpy.int corresponds to 'l' and numpy.long to 'q' * ctypedef npy_long int_t * ctypedef npy_longlong long_t # <<<<<<<<<<<<<< @@ -1217,7 +1297,7 @@ typedef npy_long __pyx_t_5numpy_int_t; */ typedef npy_longlong __pyx_t_5numpy_long_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":716 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":716 * ctypedef npy_long int_t * ctypedef npy_longlong long_t * ctypedef npy_longlong longlong_t # <<<<<<<<<<<<<< @@ -1226,7 +1306,7 @@ typedef npy_longlong __pyx_t_5numpy_long_t; */ typedef npy_longlong __pyx_t_5numpy_longlong_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":718 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":718 * ctypedef npy_longlong longlong_t * * ctypedef npy_ulong uint_t # <<<<<<<<<<<<<< @@ -1235,7 +1315,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t; */ typedef npy_ulong __pyx_t_5numpy_uint_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":719 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":719 * * ctypedef npy_ulong uint_t * ctypedef npy_ulonglong ulong_t # <<<<<<<<<<<<<< @@ -1244,7 +1324,7 @@ typedef npy_ulong __pyx_t_5numpy_uint_t; */ typedef npy_ulonglong __pyx_t_5numpy_ulong_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":720 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":720 * ctypedef npy_ulong uint_t * ctypedef npy_ulonglong ulong_t * ctypedef npy_ulonglong ulonglong_t # <<<<<<<<<<<<<< @@ -1253,7 +1333,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulong_t; */ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":722 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":722 * ctypedef npy_ulonglong ulonglong_t * * ctypedef npy_intp intp_t # <<<<<<<<<<<<<< @@ -1262,7 +1342,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; */ typedef npy_intp __pyx_t_5numpy_intp_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":723 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":723 * * ctypedef npy_intp intp_t * ctypedef npy_uintp uintp_t # <<<<<<<<<<<<<< @@ -1271,7 +1351,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t; */ typedef npy_uintp __pyx_t_5numpy_uintp_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":725 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":725 * ctypedef npy_uintp uintp_t * * ctypedef npy_double float_t # <<<<<<<<<<<<<< @@ -1280,7 +1360,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t; */ typedef npy_double __pyx_t_5numpy_float_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":726 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":726 * * ctypedef npy_double float_t * ctypedef npy_double double_t # <<<<<<<<<<<<<< @@ -1289,7 +1369,7 @@ typedef npy_double __pyx_t_5numpy_float_t; */ typedef npy_double __pyx_t_5numpy_double_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":727 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":727 * ctypedef npy_double float_t * ctypedef npy_double double_t * ctypedef npy_longdouble longdouble_t # <<<<<<<<<<<<<< @@ -1342,7 +1422,7 @@ struct __pyx_MemviewEnum_obj; struct __pyx_memoryview_obj; struct __pyx_memoryviewslice_obj; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":729 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":729 * ctypedef npy_longdouble longdouble_t * * ctypedef npy_cfloat cfloat_t # <<<<<<<<<<<<<< @@ -1351,7 +1431,7 @@ struct __pyx_memoryviewslice_obj; */ typedef npy_cfloat __pyx_t_5numpy_cfloat_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":730 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":730 * * ctypedef npy_cfloat cfloat_t * ctypedef npy_cdouble cdouble_t # <<<<<<<<<<<<<< @@ -1360,7 +1440,7 @@ typedef npy_cfloat __pyx_t_5numpy_cfloat_t; */ typedef npy_cdouble __pyx_t_5numpy_cdouble_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":731 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":731 * ctypedef npy_cfloat cfloat_t * ctypedef npy_cdouble cdouble_t * ctypedef npy_clongdouble clongdouble_t # <<<<<<<<<<<<<< @@ -1369,7 +1449,7 @@ typedef npy_cdouble __pyx_t_5numpy_cdouble_t; */ typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t; -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":733 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":733 * ctypedef npy_clongdouble clongdouble_t * * ctypedef npy_cdouble complex_t # <<<<<<<<<<<<<< @@ -2206,13 +2286,21 @@ static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, #ifndef Py_MEMBER_SIZE #define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member) #endif +#if CYTHON_FAST_PYCALL static size_t __pyx_pyframe_localsplus_offset = 0; #include "frameobject.h" +#if PY_VERSION_HEX >= 0x030b00a6 + #ifndef Py_BUILD_CORE + #define Py_BUILD_CORE 1 + #endif + #include "internal/pycore_frame.h" +#endif #define __Pxy_PyFrame_Initialize_Offsets()\ ((void)__Pyx_BUILD_ASSERT_EXPR(sizeof(PyFrameObject) == offsetof(PyFrameObject, f_localsplus) + Py_MEMBER_SIZE(PyFrameObject, f_localsplus)),\ (void)(__pyx_pyframe_localsplus_offset = ((size_t)PyFrame_Type.tp_basicsize) - Py_MEMBER_SIZE(PyFrameObject, f_localsplus))) #define __Pyx_PyFrame_GetLocalsplus(frame)\ (assert(__pyx_pyframe_localsplus_offset), (PyObject **)(((char *)(frame)) + __pyx_pyframe_localsplus_offset)) +#endif // CYTHON_FAST_PYCALL #endif /* PyObjectCallMethO.proto */ @@ -2313,12 +2401,12 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_FormatAndDecref(PyObject* s, PyObj static PyObject* __Pyx_PyUnicode_BuildFromAscii(Py_ssize_t ulength, char* chars, int clength, int prepend_sign, char padding_char); -/* CIntToPyUnicode.proto */ -static CYTHON_INLINE PyObject* __Pyx_PyUnicode_From_int(int value, Py_ssize_t width, char padding_char, char format_char); - /* IncludeStringH.proto */ #include +/* CIntToPyUnicode.proto */ +static CYTHON_INLINE PyObject* __Pyx_PyUnicode_From_int(int value, Py_ssize_t width, char padding_char, char format_char); + /* JoinPyUnicode.proto */ static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_count, Py_ssize_t result_ulength, Py_UCS4 max_char); @@ -2711,7 +2799,7 @@ static CYTHON_INLINE int __Pyx_ListComp_Append(PyObject* list, PyObject* x) { #define __Pyx_PyString_Equals __Pyx_PyBytes_Equals #endif -/* None.proto */ +/* DivInt[Py_ssize_t].proto */ static CYTHON_INLINE Py_ssize_t __Pyx_div_Py_ssize_t(Py_ssize_t, Py_ssize_t); /* UnaryNegOverflows.proto */ @@ -2756,7 +2844,7 @@ static CYTHON_INLINE int __Pyx_PyList_Extend(PyObject* L, PyObject* v) { #endif } -/* None.proto */ +/* DivInt[long].proto */ static CYTHON_INLINE long __Pyx_div_long(long, long); /* PyObject_GenericGetAttrNoDict.proto */ @@ -3674,7 +3762,7 @@ static const char __pyx_k__108[] = "=============="; static const char __pyx_k__111[] = "["; static const char __pyx_k__112[] = "]"; static const char __pyx_k__130[] = " : "; -static const char __pyx_k__158[] = "."; +static const char __pyx_k__160[] = "."; static const char __pyx_k_args[] = "args"; static const char __pyx_k_base[] = "base"; static const char __pyx_k_bool[] = "bool"; @@ -3709,7 +3797,7 @@ static const char __pyx_k_uint[] = "uint"; static const char __pyx_k_wait[] = "wait"; static const char __pyx_k_when[] = "when"; static const char __pyx_k_wmpk[] = "wmpk"; -static const char __pyx_k_7_0_6[] = "7.0.6"; +static const char __pyx_k_7_0_7[] = "7.0.7"; static const char __pyx_k_ASCII[] = "ASCII"; static const char __pyx_k_Array[] = "Array"; static const char __pyx_k_UTF_8[] = "UTF-8"; @@ -4147,7 +4235,7 @@ static const char __pyx_k_getDbrBaseInCallback[] = "getDbrBaseInCallback"; static const char __pyx_k_groupOpen_char_gname[] = "groupOpen(char * gname)"; static const char __pyx_k_initCallbackComplete[] = "initCallbackComplete"; static const char __pyx_k_strided_and_indirect[] = ""; -static const char __pyx_k_1_19_0_py38_gcc_7_5_0[] = "1.19.0-py38-gcc-7.5.0"; +static const char __pyx_k_1_19_3_py38_gcc_7_5_0[] = "1.19.3-py38-gcc-7.5.0"; static const char __pyx_k_Allowed_DBR_TYPEs_are[] = "Allowed DBR_TYPEs are:"; static const char __pyx_k_ICAFE_CA_OP_CONN_DOWN[] = "ICAFE_CA_OP_CONN_DOWN"; static const char __pyx_k_The_value_entered_was[] = "The value entered was"; @@ -4257,8 +4345,7 @@ static const char __pyx_k_First_input_argument_should_be_a[] = "First input argu static const char __pyx_k_First_input_argument_should_be_c[] = "First input argument should be for group name"; static const char __pyx_k_First_input_argument_should_be_o[] = "First input argument, should be of type if handle, else if PV"; static const char __pyx_k_GET_CACHE_NO_CHECK_0_GET_CACHE_N[] = "GET_CACHE_NO_CHECK (0), GET_CACHE_NO_WAIT (1),GET_CACHE_WAIT (2)"; -static const char __pyx_k_Incompatible_checksums_s_vs_0x8a[] = "Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))"; -static const char __pyx_k_Incompatible_checksums_s_vs_0xb0[] = "Incompatible checksums (%s vs 0xb068931 = (name))"; +static const char __pyx_k_Incompatible_checksums_0x_x_vs_0[] = "Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))"; static const char __pyx_k_Indirect_dimensions_not_supporte[] = "Indirect dimensions not supported"; static const char __pyx_k_Input_argument_if_given_should_b[] = "Input argument, if given, should be if list of handles or PVs, else of type if handle or if PV. If no input argument, then all channels are supplemented."; static const char __pyx_k_Input_argument_pv_should_be_of_t[] = "Input argument, pv, should be of type "; @@ -4361,6 +4448,7 @@ static const char __pyx_k_First_input_argument_should_be_o_7[] = "First input ar static const char __pyx_k_First_input_argument_should_be_o_8[] = "First input argument, should be of type if group handle, else if group name"; static const char __pyx_k_First_input_argument_should_be_o_9[] = "First input argument, should be of type if group handle, else if group name"; static const char __pyx_k_GET_CACHE_NO_CHECK_0_GET_CACHE_N_2[] = "GET_CACHE_NO_CHECK (0), GET_CACHE_NO_WAIT (1), GET_CACHE_WAIT (2)"; +static const char __pyx_k_Incompatible_checksums_0x_x_vs_0_2[] = "Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))"; static const char __pyx_k_Input_argument_should_be_of_type_2[] = "Input argument should be of type if handle,else if pvname"; static const char __pyx_k_List_input_arguments_should_be_o_2[] = "List input arguments, should be of type if handleelse if pvname"; static const char __pyx_k_Third_input_argument_should_be_o_2[] = "Third input argument, should be of type if handle,else if PV"; @@ -4380,8 +4468,8 @@ static const char __pyx_k_First_input_argument_should_be_o_10[] = "First input a static const char __pyx_k_First_input_argument_should_be_o_11[] = "First input argument should be of type if group handle, else if group name"; static PyObject *__pyx_kp_u_0; static PyObject *__pyx_kp_u_0_1_2_3_4_5; -static PyObject *__pyx_kp_u_1_19_0_py38_gcc_7_5_0; -static PyObject *__pyx_kp_u_7_0_6; +static PyObject *__pyx_kp_u_1_19_3_py38_gcc_7_5_0; +static PyObject *__pyx_kp_u_7_0_7; static PyObject *__pyx_n_s_ASCII; static PyObject *__pyx_kp_u_A_handle_can_never_hold_a_negati; static PyObject *__pyx_kp_u_Allowed_ChannelGetActionWhenMoni; @@ -4502,8 +4590,8 @@ static PyObject *__pyx_n_u_ICAFE_CS_NEVER_CONN; static PyObject *__pyx_n_u_ICAFE_NORMAL; static PyObject *__pyx_n_u_ICAFE_TYPENOTCONN; static PyObject *__pyx_n_s_ImportError; -static PyObject *__pyx_kp_s_Incompatible_checksums_s_vs_0x8a; -static PyObject *__pyx_kp_s_Incompatible_checksums_s_vs_0xb0; +static PyObject *__pyx_kp_s_Incompatible_checksums_0x_x_vs_0; +static PyObject *__pyx_kp_s_Incompatible_checksums_0x_x_vs_0_2; static PyObject *__pyx_n_s_IndexError; static PyObject *__pyx_kp_s_Indirect_dimensions_not_supporte; static PyObject *__pyx_kp_u_Input_argument_if_given_should_b; @@ -4586,7 +4674,7 @@ static PyObject *__pyx_kp_u__111; static PyObject *__pyx_kp_u__112; static PyObject *__pyx_kp_u__12; static PyObject *__pyx_kp_u__130; -static PyObject *__pyx_kp_u__158; +static PyObject *__pyx_kp_u__160; static PyObject *__pyx_kp_u__17; static PyObject *__pyx_kp_u__25; static PyObject *__pyx_kp_u__26; @@ -5835,9 +5923,13 @@ static PyObject *__pyx_int_1; static PyObject *__pyx_int_2; static PyObject *__pyx_int_6; static PyObject *__pyx_int_40; -static PyObject *__pyx_int_50858992; +static PyObject *__pyx_int_50988272; +static PyObject *__pyx_int_112105877; +static PyObject *__pyx_int_136983863; +static PyObject *__pyx_int_137594515; static PyObject *__pyx_int_145648516; static PyObject *__pyx_int_184977713; +static PyObject *__pyx_int_235797780; static PyObject *__pyx_int_neg_1; static DBR_TYPE __pyx_k__94; static unsigned int __pyx_k__95; @@ -5928,7 +6020,7 @@ static PyObject *__pyx_tuple__92; static PyObject *__pyx_tuple__93; static PyObject *__pyx_tuple__98; static PyObject *__pyx_tuple__99; -static PyObject *__pyx_slice__154; +static PyObject *__pyx_slice__155; static PyObject *__pyx_tuple__102; static PyObject *__pyx_tuple__103; static PyObject *__pyx_tuple__105; @@ -5972,22 +6064,24 @@ static PyObject *__pyx_tuple__150; static PyObject *__pyx_tuple__151; static PyObject *__pyx_tuple__152; static PyObject *__pyx_tuple__153; -static PyObject *__pyx_tuple__155; +static PyObject *__pyx_tuple__154; static PyObject *__pyx_tuple__156; static PyObject *__pyx_tuple__157; +static PyObject *__pyx_tuple__158; static PyObject *__pyx_tuple__159; -static PyObject *__pyx_tuple__160; +static PyObject *__pyx_tuple__161; static PyObject *__pyx_tuple__162; static PyObject *__pyx_tuple__164; -static PyObject *__pyx_tuple__165; static PyObject *__pyx_tuple__166; static PyObject *__pyx_tuple__167; static PyObject *__pyx_tuple__168; static PyObject *__pyx_tuple__169; +static PyObject *__pyx_tuple__170; +static PyObject *__pyx_tuple__171; static PyObject *__pyx_codeobj__35; -static PyObject *__pyx_codeobj__161; static PyObject *__pyx_codeobj__163; -static PyObject *__pyx_codeobj__170; +static PyObject *__pyx_codeobj__165; +static PyObject *__pyx_codeobj__172; /* Late includes */ /* "PyCafe.pyx":61 @@ -37584,8 +37678,8 @@ static PyObject *__pyx_pf_6PyCafe_6CyCafe_10CAFE_version(CYTHON_UNUSED struct __ * def EPICS_version(self): */ __Pyx_XDECREF(__pyx_r); - __Pyx_INCREF(__pyx_kp_u_1_19_0_py38_gcc_7_5_0); - __pyx_r = __pyx_kp_u_1_19_0_py38_gcc_7_5_0; + __Pyx_INCREF(__pyx_kp_u_1_19_3_py38_gcc_7_5_0); + __pyx_r = __pyx_kp_u_1_19_3_py38_gcc_7_5_0; goto __pyx_L0; /* "PyCafe.pyx":280 @@ -37638,8 +37732,8 @@ static PyObject *__pyx_pf_6PyCafe_6CyCafe_12EPICS_version(CYTHON_UNUSED struct _ * @verify_handlepv */ __Pyx_XDECREF(__pyx_r); - __Pyx_INCREF(__pyx_kp_u_7_0_6); - __pyx_r = __pyx_kp_u_7_0_6; + __Pyx_INCREF(__pyx_kp_u_7_0_7); + __pyx_r = __pyx_kp_u_7_0_7; goto __pyx_L0; /* "PyCafe.pyx":283 @@ -133923,12 +134017,12 @@ static PyObject *__pyx_pf_6PyCafe_2__pyx_unpickle_CafeException(CYTHON_UNUSED Py PyObject *__pyx_v___pyx_result = 0; PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - int __pyx_t_1; - PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; + PyObject *__pyx_t_1 = NULL; + int __pyx_t_2; + int __pyx_t_3; PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; - int __pyx_t_6; + PyObject *__pyx_t_6 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -133937,114 +134031,118 @@ static PyObject *__pyx_pf_6PyCafe_2__pyx_unpickle_CafeException(CYTHON_UNUSED Py /* "(tree fragment)":4 * cdef object __pyx_PickleError * cdef object __pyx_result - * if __pyx_checksum != 0x8ae6b84: # <<<<<<<<<<<<<< + * if __pyx_checksum not in (0x8ae6b84, 0x8338693, 0xe0dfd14): # <<<<<<<<<<<<<< * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) */ - __pyx_t_1 = ((__pyx_v___pyx_checksum != 0x8ae6b84) != 0); - if (__pyx_t_1) { + __pyx_t_1 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_t_1, __pyx_tuple__138, Py_NE)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_3 = (__pyx_t_2 != 0); + if (__pyx_t_3) { /* "(tree fragment)":5 * cdef object __pyx_result - * if __pyx_checksum != 0x8ae6b84: + * if __pyx_checksum not in (0x8ae6b84, 0x8338693, 0xe0dfd14): * from pickle import PickleError as __pyx_PickleError # <<<<<<<<<<<<<< - * raise __pyx_PickleError("Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) * __pyx_result = CafeException.__new__(__pyx_type) */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_PickleError); __Pyx_GIVEREF(__pyx_n_s_PickleError); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_PickleError); - __pyx_t_3 = __Pyx_Import(__pyx_n_s_pickle, __pyx_t_2, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(__pyx_t_2); - __pyx_v___pyx_PickleError = __pyx_t_2; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_PickleError); + __pyx_t_4 = __Pyx_Import(__pyx_n_s_pickle, __pyx_t_1, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 5, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_4, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_INCREF(__pyx_t_1); + __pyx_v___pyx_PickleError = __pyx_t_1; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "(tree fragment)":6 - * if __pyx_checksum != 0x8ae6b84: + * if __pyx_checksum not in (0x8ae6b84, 0x8338693, 0xe0dfd14): * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) # <<<<<<<<<<<<<< + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) # <<<<<<<<<<<<<< * __pyx_result = CafeException.__new__(__pyx_type) * if __pyx_state is not None: */ - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 6, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyString_Format(__pyx_kp_s_Incompatible_checksums_s_vs_0x8a, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 6, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_1 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 6, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_5 = __Pyx_PyString_Format(__pyx_kp_s_Incompatible_checksums_0x_x_vs_0, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 6, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_INCREF(__pyx_v___pyx_PickleError); - __pyx_t_2 = __pyx_v___pyx_PickleError; __pyx_t_5 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_2); - if (likely(__pyx_t_5)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); - __Pyx_INCREF(__pyx_t_5); + __pyx_t_1 = __pyx_v___pyx_PickleError; __pyx_t_6 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); + __Pyx_INCREF(__pyx_t_6); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_2, function); + __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_3 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_5, __pyx_t_4) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_4 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_6, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5); + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 6, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_Raise(__pyx_t_4, 0, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 6, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __PYX_ERR(1, 6, __pyx_L1_error) /* "(tree fragment)":4 * cdef object __pyx_PickleError * cdef object __pyx_result - * if __pyx_checksum != 0x8ae6b84: # <<<<<<<<<<<<<< + * if __pyx_checksum not in (0x8ae6b84, 0x8338693, 0xe0dfd14): # <<<<<<<<<<<<<< * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) */ } /* "(tree fragment)":7 * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) * __pyx_result = CafeException.__new__(__pyx_type) # <<<<<<<<<<<<<< * if __pyx_state is not None: * __pyx_unpickle_CafeException__set_state( __pyx_result, __pyx_state) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_6PyCafe_CafeException), __pyx_n_s_new); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 7, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_2); - if (likely(__pyx_t_4)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); - __Pyx_INCREF(__pyx_t_4); + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_6PyCafe_CafeException), __pyx_n_s_new); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 7, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_5 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_5)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); + __Pyx_INCREF(__pyx_t_5); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_2, function); + __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_3 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_4, __pyx_v___pyx_type) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v___pyx_type); - __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 7, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_v___pyx_result = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_t_4 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_v___pyx_type) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v___pyx_type); + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 7, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_v___pyx_result = __pyx_t_4; + __pyx_t_4 = 0; /* "(tree fragment)":8 - * raise __pyx_PickleError("Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) * __pyx_result = CafeException.__new__(__pyx_type) * if __pyx_state is not None: # <<<<<<<<<<<<<< * __pyx_unpickle_CafeException__set_state( __pyx_result, __pyx_state) * return __pyx_result */ - __pyx_t_1 = (__pyx_v___pyx_state != Py_None); - __pyx_t_6 = (__pyx_t_1 != 0); - if (__pyx_t_6) { + __pyx_t_3 = (__pyx_v___pyx_state != Py_None); + __pyx_t_2 = (__pyx_t_3 != 0); + if (__pyx_t_2) { /* "(tree fragment)":9 * __pyx_result = CafeException.__new__(__pyx_type) @@ -134054,12 +134152,12 @@ static PyObject *__pyx_pf_6PyCafe_2__pyx_unpickle_CafeException(CYTHON_UNUSED Py * cdef __pyx_unpickle_CafeException__set_state(CafeException __pyx_result, tuple __pyx_state): */ if (!(likely(PyTuple_CheckExact(__pyx_v___pyx_state))||((__pyx_v___pyx_state) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "tuple", Py_TYPE(__pyx_v___pyx_state)->tp_name), 0))) __PYX_ERR(1, 9, __pyx_L1_error) - __pyx_t_3 = __pyx_f_6PyCafe___pyx_unpickle_CafeException__set_state(((struct __pyx_obj_6PyCafe_CafeException *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 9, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_4 = __pyx_f_6PyCafe___pyx_unpickle_CafeException__set_state(((struct __pyx_obj_6PyCafe_CafeException *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 9, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "(tree fragment)":8 - * raise __pyx_PickleError("Incompatible checksums (%s vs 0x8ae6b84 = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0x8ae6b84, 0x8338693, 0xe0dfd14) = (error_code, error_info, error_text, handle, name, source, type))" % __pyx_checksum) * __pyx_result = CafeException.__new__(__pyx_type) * if __pyx_state is not None: # <<<<<<<<<<<<<< * __pyx_unpickle_CafeException__set_state( __pyx_result, __pyx_state) @@ -134089,10 +134187,10 @@ static PyObject *__pyx_pf_6PyCafe_2__pyx_unpickle_CafeException(CYTHON_UNUSED Py __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; __pyx_L1_error:; - __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); + __Pyx_XDECREF(__pyx_t_6); __Pyx_AddTraceback("PyCafe.__pyx_unpickle_CafeException", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; @@ -134304,7 +134402,7 @@ static PyObject *__pyx_f_6PyCafe___pyx_unpickle_CafeException__set_state(struct return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":735 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":735 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -134321,7 +134419,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":736 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":736 * * cdef inline object PyArray_MultiIterNew1(a): * return PyArray_MultiIterNew(1, a) # <<<<<<<<<<<<<< @@ -134335,7 +134433,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":735 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":735 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -134356,7 +134454,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":738 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":738 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -134373,7 +134471,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":739 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":739 * * cdef inline object PyArray_MultiIterNew2(a, b): * return PyArray_MultiIterNew(2, a, b) # <<<<<<<<<<<<<< @@ -134387,7 +134485,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":738 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":738 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -134408,7 +134506,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":741 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":741 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -134425,7 +134523,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":742 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":742 * * cdef inline object PyArray_MultiIterNew3(a, b, c): * return PyArray_MultiIterNew(3, a, b, c) # <<<<<<<<<<<<<< @@ -134439,7 +134537,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":741 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":741 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -134460,7 +134558,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":744 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":744 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -134477,7 +134575,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":745 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":745 * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): * return PyArray_MultiIterNew(4, a, b, c, d) # <<<<<<<<<<<<<< @@ -134491,7 +134589,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":744 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":744 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -134512,7 +134610,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":747 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":747 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -134529,7 +134627,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":748 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":748 * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): * return PyArray_MultiIterNew(5, a, b, c, d, e) # <<<<<<<<<<<<<< @@ -134543,7 +134641,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":747 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":747 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -134564,7 +134662,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":750 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":750 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -134578,7 +134676,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ int __pyx_t_1; __Pyx_RefNannySetupContext("PyDataType_SHAPE", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":751 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":751 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -134588,7 +134686,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_t_1 = (PyDataType_HASSUBARRAY(__pyx_v_d) != 0); if (__pyx_t_1) { - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":752 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":752 * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): * return d.subarray.shape # <<<<<<<<<<<<<< @@ -134600,7 +134698,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape); goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":751 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":751 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -134610,7 +134708,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ goto __pyx_L3; } - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":754 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":754 * return d.subarray.shape * else: * return () # <<<<<<<<<<<<<< @@ -134625,7 +134723,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ } __pyx_L3:; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":750 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":750 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -134641,7 +134739,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":929 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":929 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -134653,7 +134751,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("set_array_base", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":930 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":930 * * cdef inline void set_array_base(ndarray arr, object base): * Py_INCREF(base) # important to do this before stealing the reference below! # <<<<<<<<<<<<<< @@ -134662,7 +134760,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ Py_INCREF(__pyx_v_base); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":931 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":931 * cdef inline void set_array_base(ndarray arr, object base): * Py_INCREF(base) # important to do this before stealing the reference below! * PyArray_SetBaseObject(arr, base) # <<<<<<<<<<<<<< @@ -134671,7 +134769,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ (void)(PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base)); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":929 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":929 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -134683,7 +134781,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __Pyx_RefNannyFinishContext(); } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":933 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":933 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -134698,7 +134796,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py int __pyx_t_1; __Pyx_RefNannySetupContext("get_array_base", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":934 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":934 * * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) # <<<<<<<<<<<<<< @@ -134707,7 +134805,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ __pyx_v_base = PyArray_BASE(__pyx_v_arr); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":935 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":935 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -134717,7 +134815,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_t_1 = ((__pyx_v_base == NULL) != 0); if (__pyx_t_1) { - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":936 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":936 * base = PyArray_BASE(arr) * if base is NULL: * return None # <<<<<<<<<<<<<< @@ -134728,7 +134826,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":935 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":935 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -134737,7 +134835,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ } - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":937 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":937 * if base is NULL: * return None * return base # <<<<<<<<<<<<<< @@ -134749,7 +134847,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = ((PyObject *)__pyx_v_base); goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":933 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":933 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -134765,7 +134863,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":941 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":941 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -134789,7 +134887,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_array", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -134805,7 +134903,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":943 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":943 * cdef inline int import_array() except -1: * try: * __pyx_import_array() # <<<<<<<<<<<<<< @@ -134814,7 +134912,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { */ __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(4, 943, __pyx_L3_error) - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -134828,7 +134926,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":944 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":944 * try: * __pyx_import_array() * except Exception: # <<<<<<<<<<<<<< @@ -134843,14 +134941,14 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":945 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":945 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< * * cdef inline int import_umath() except -1: */ - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__138, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(4, 945, __pyx_L5_except_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__139, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(4, 945, __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; @@ -134863,7 +134961,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -134883,7 +134981,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_L8_try_end:; } - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":941 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":941 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -134906,7 +135004,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":947 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":947 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -134930,7 +135028,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_umath", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -134946,7 +135044,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":949 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":949 * cdef inline int import_umath() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -134955,7 +135053,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(4, 949, __pyx_L3_error) - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -134969,7 +135067,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":950 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":950 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -134984,14 +135082,14 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":951 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":951 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< * * cdef inline int import_ufunc() except -1: */ - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__139, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(4, 951, __pyx_L5_except_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__140, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(4, 951, __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; @@ -135004,7 +135102,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -135024,7 +135122,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_L8_try_end:; } - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":947 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":947 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -135047,7 +135145,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":953 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":953 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -135071,7 +135169,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_ufunc", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -135087,7 +135185,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":955 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":955 * cdef inline int import_ufunc() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -135096,7 +135194,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(4, 955, __pyx_L3_error) - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -135110,7 +135208,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":956 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":956 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -135125,14 +135223,14 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":957 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":957 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< * * cdef extern from *: */ - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__139, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(4, 957, __pyx_L5_except_error) + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_ImportError, __pyx_tuple__140, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(4, 957, __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; @@ -135145,7 +135243,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -135165,7 +135263,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_L8_try_end:; } - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":953 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":953 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -135188,7 +135286,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":967 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":967 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -135201,7 +135299,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("is_timedelta64_object", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":979 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":979 * bool * """ * return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<< @@ -135211,7 +135309,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; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":967 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":967 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -135226,7 +135324,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":982 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":982 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -135239,7 +135337,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("is_datetime64_object", 0); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":994 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":994 * bool * """ * return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<< @@ -135249,7 +135347,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; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":982 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":982 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -135264,7 +135362,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":997 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":997 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -135275,7 +135373,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; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":1004 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":1004 * also needed. That can be found using `get_datetime64_unit`. * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -135285,7 +135383,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":997 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":997 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -135299,7 +135397,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":1007 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":1007 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -135310,7 +135408,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; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":1011 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":1011 * returns the int64 value underlying scalar numpy timedelta64 object * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -135320,7 +135418,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":1007 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":1007 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -135334,7 +135432,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject return __pyx_r; } -/* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":1014 +/* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":1014 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -135345,7 +135443,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; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":1018 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":1018 * returns the unit part of the dtype for a numpy datetime64 object. * """ * return (obj).obmeta.base # <<<<<<<<<<<<<< @@ -135353,7 +135451,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; - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":1014 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":1014 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -137547,7 +137645,7 @@ static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array___cinit__(struct __ * * if itemsize <= 0: */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__140, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 133, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__141, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 133, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_Raise(__pyx_t_3, 0, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -137579,7 +137677,7 @@ static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array___cinit__(struct __ * * if not isinstance(format, bytes): */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__141, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 136, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__142, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 136, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_Raise(__pyx_t_3, 0, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -137706,7 +137804,7 @@ static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array___cinit__(struct __ * * */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_MemoryError, __pyx_tuple__142, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 148, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_MemoryError, __pyx_tuple__143, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 148, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_Raise(__pyx_t_3, 0, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -137980,7 +138078,7 @@ static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array___cinit__(struct __ * * if self.dtype_is_object: */ - __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_MemoryError, __pyx_tuple__143, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 176, __pyx_L1_error) + __pyx_t_10 = __Pyx_PyObject_Call(__pyx_builtin_MemoryError, __pyx_tuple__144, NULL); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 176, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_Raise(__pyx_t_10, 0, 0, 0); __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; @@ -138224,7 +138322,7 @@ static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array_2__getbuffer__(stru * info.buf = self.data * info.len = self.len */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__144, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 192, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__145, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 192, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_Raise(__pyx_t_3, 0, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -138958,7 +139056,7 @@ static PyObject *__pyx_pf___pyx_array___reduce_cython__(CYTHON_UNUSED struct __p * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") */ - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__145, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__146, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -139014,7 +139112,7 @@ static PyObject *__pyx_pf___pyx_array_2__setstate_cython__(CYTHON_UNUSED struct * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") # <<<<<<<<<<<<<< */ - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__146, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__147, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -140724,7 +140822,7 @@ static int __pyx_memoryview___pyx_pf_15View_dot_MemoryView_10memoryview_6__setit * * have_slices, index = _unellipsify(index, self.view.ndim) */ - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__147, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 418, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__148, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 418, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -141772,7 +141870,7 @@ static PyObject *__pyx_memoryview_convert_item_to_object(struct __pyx_memoryview * else: * if len(self.view.format) == 1: */ - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__148, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 495, __pyx_L5_except_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__149, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 495, __pyx_L5_except_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_Raise(__pyx_t_6, 0, 0, 0); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -142134,7 +142232,7 @@ static int __pyx_memoryview___pyx_pf_15View_dot_MemoryView_10memoryview_8__getbu * * if flags & PyBUF_ND: */ - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__149, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 520, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__150, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_Raise(__pyx_t_3, 0, 0, 0); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -142683,7 +142781,7 @@ static PyObject *__pyx_pf_15View_dot_MemoryView_10memoryview_7strides___get__(st * * return tuple([stride for stride in self.view.strides[:self.view.ndim]]) */ - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__150, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 570, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__151, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 570, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_Raise(__pyx_t_2, 0, 0, 0); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -142800,7 +142898,7 @@ static PyObject *__pyx_pf_15View_dot_MemoryView_10memoryview_10suboffsets___get_ __Pyx_XDECREF(__pyx_r); __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_self->view.ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 577, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyNumber_Multiply(__pyx_tuple__151, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 577, __pyx_L1_error) + __pyx_t_3 = PyNumber_Multiply(__pyx_tuple__152, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 577, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_r = __pyx_t_3; @@ -143838,7 +143936,7 @@ static PyObject *__pyx_pf___pyx_memoryview___reduce_cython__(CYTHON_UNUSED struc * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") */ - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__152, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__153, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -143894,7 +143992,7 @@ static PyObject *__pyx_pf___pyx_memoryview_2__setstate_cython__(CYTHON_UNUSED st * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") # <<<<<<<<<<<<<< */ - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__153, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__154, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -144251,9 +144349,9 @@ static PyObject *_unellipsify(PyObject *__pyx_v_index, int __pyx_v_ndim) { __Pyx_GOTREF(__pyx_t_7); { Py_ssize_t __pyx_temp; for (__pyx_temp=0; __pyx_temp < ((__pyx_v_ndim - __pyx_t_8) + 1); __pyx_temp++) { - __Pyx_INCREF(__pyx_slice__154); - __Pyx_GIVEREF(__pyx_slice__154); - PyList_SET_ITEM(__pyx_t_7, __pyx_temp, __pyx_slice__154); + __Pyx_INCREF(__pyx_slice__155); + __Pyx_GIVEREF(__pyx_slice__155); + PyList_SET_ITEM(__pyx_t_7, __pyx_temp, __pyx_slice__155); } } __pyx_t_9 = __Pyx_PyList_Extend(__pyx_v_result, __pyx_t_7); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(1, 682, __pyx_L1_error) @@ -144286,7 +144384,7 @@ static PyObject *_unellipsify(PyObject *__pyx_v_index, int __pyx_v_ndim) { * else: */ /*else*/ { - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_result, __pyx_slice__154); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(1, 685, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_result, __pyx_slice__155); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(1, 685, __pyx_L1_error) } __pyx_L7:; @@ -144426,9 +144524,9 @@ static PyObject *_unellipsify(PyObject *__pyx_v_index, int __pyx_v_ndim) { __Pyx_GOTREF(__pyx_t_3); { Py_ssize_t __pyx_temp; for (__pyx_temp=0; __pyx_temp < __pyx_v_nslices; __pyx_temp++) { - __Pyx_INCREF(__pyx_slice__154); - __Pyx_GIVEREF(__pyx_slice__154); - PyList_SET_ITEM(__pyx_t_3, __pyx_temp, __pyx_slice__154); + __Pyx_INCREF(__pyx_slice__155); + __Pyx_GIVEREF(__pyx_slice__155); + PyList_SET_ITEM(__pyx_t_3, __pyx_temp, __pyx_slice__155); } } __pyx_t_9 = __Pyx_PyList_Extend(__pyx_v_result, __pyx_t_3); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(1, 696, __pyx_L1_error) @@ -144555,7 +144653,7 @@ static PyObject *assert_direct_dimensions(Py_ssize_t *__pyx_v_suboffsets, int __ * * */ - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__155, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 703, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__156, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 703, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_Raise(__pyx_t_5, 0, 0, 0); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -146739,7 +146837,7 @@ static PyObject *__pyx_pf___pyx_memoryviewslice___reduce_cython__(CYTHON_UNUSED * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") */ - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__156, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__157, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 2, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -146795,7 +146893,7 @@ static PyObject *__pyx_pf___pyx_memoryviewslice_2__setstate_cython__(CYTHON_UNUS * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") # <<<<<<<<<<<<<< */ - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__157, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__158, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_Raise(__pyx_t_1, 0, 0, 0); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -150052,12 +150150,12 @@ static PyObject *__pyx_pf_15View_dot_MemoryView___pyx_unpickle_Enum(CYTHON_UNUSE PyObject *__pyx_v___pyx_result = 0; PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - int __pyx_t_1; - PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; + PyObject *__pyx_t_1 = NULL; + int __pyx_t_2; + int __pyx_t_3; PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; - int __pyx_t_6; + PyObject *__pyx_t_6 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -150066,114 +150164,118 @@ static PyObject *__pyx_pf_15View_dot_MemoryView___pyx_unpickle_Enum(CYTHON_UNUSE /* "(tree fragment)":4 * cdef object __pyx_PickleError * cdef object __pyx_result - * if __pyx_checksum != 0xb068931: # <<<<<<<<<<<<<< + * if __pyx_checksum not in (0xb068931, 0x82a3537, 0x6ae9995): # <<<<<<<<<<<<<< * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0xb068931 = (name))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))" % __pyx_checksum) */ - __pyx_t_1 = ((__pyx_v___pyx_checksum != 0xb068931) != 0); - if (__pyx_t_1) { + __pyx_t_1 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_t_1, __pyx_tuple__159, Py_NE)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_3 = (__pyx_t_2 != 0); + if (__pyx_t_3) { /* "(tree fragment)":5 * cdef object __pyx_result - * if __pyx_checksum != 0xb068931: + * if __pyx_checksum not in (0xb068931, 0x82a3537, 0x6ae9995): * from pickle import PickleError as __pyx_PickleError # <<<<<<<<<<<<<< - * raise __pyx_PickleError("Incompatible checksums (%s vs 0xb068931 = (name))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))" % __pyx_checksum) * __pyx_result = Enum.__new__(__pyx_type) */ - __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_s_PickleError); __Pyx_GIVEREF(__pyx_n_s_PickleError); - PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s_PickleError); - __pyx_t_3 = __Pyx_Import(__pyx_n_s_pickle, __pyx_t_2, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 5, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_ImportFrom(__pyx_t_3, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 5, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(__pyx_t_2); - __pyx_v___pyx_PickleError = __pyx_t_2; - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_PickleError); + __pyx_t_4 = __Pyx_Import(__pyx_n_s_pickle, __pyx_t_1, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 5, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_4, __pyx_n_s_PickleError); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_INCREF(__pyx_t_1); + __pyx_v___pyx_PickleError = __pyx_t_1; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "(tree fragment)":6 - * if __pyx_checksum != 0xb068931: + * if __pyx_checksum not in (0xb068931, 0x82a3537, 0x6ae9995): * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0xb068931 = (name))" % __pyx_checksum) # <<<<<<<<<<<<<< + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))" % __pyx_checksum) # <<<<<<<<<<<<<< * __pyx_result = Enum.__new__(__pyx_type) * if __pyx_state is not None: */ - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 6, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyString_Format(__pyx_kp_s_Incompatible_checksums_s_vs_0xb0, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 6, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __pyx_t_1 = __Pyx_PyInt_From_long(__pyx_v___pyx_checksum); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 6, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_5 = __Pyx_PyString_Format(__pyx_kp_s_Incompatible_checksums_0x_x_vs_0_2, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 6, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_INCREF(__pyx_v___pyx_PickleError); - __pyx_t_2 = __pyx_v___pyx_PickleError; __pyx_t_5 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_2); - if (likely(__pyx_t_5)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); - __Pyx_INCREF(__pyx_t_5); + __pyx_t_1 = __pyx_v___pyx_PickleError; __pyx_t_6 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); + __Pyx_INCREF(__pyx_t_6); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_2, function); + __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_3 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_5, __pyx_t_4) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_4 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_6, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5); + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 6, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_Raise(__pyx_t_4, 0, 0, 0); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 6, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_Raise(__pyx_t_3, 0, 0, 0); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __PYX_ERR(1, 6, __pyx_L1_error) /* "(tree fragment)":4 * cdef object __pyx_PickleError * cdef object __pyx_result - * if __pyx_checksum != 0xb068931: # <<<<<<<<<<<<<< + * if __pyx_checksum not in (0xb068931, 0x82a3537, 0x6ae9995): # <<<<<<<<<<<<<< * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0xb068931 = (name))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))" % __pyx_checksum) */ } /* "(tree fragment)":7 * from pickle import PickleError as __pyx_PickleError - * raise __pyx_PickleError("Incompatible checksums (%s vs 0xb068931 = (name))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))" % __pyx_checksum) * __pyx_result = Enum.__new__(__pyx_type) # <<<<<<<<<<<<<< * if __pyx_state is not None: * __pyx_unpickle_Enum__set_state( __pyx_result, __pyx_state) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_MemviewEnum_type), __pyx_n_s_new); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 7, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_2); - if (likely(__pyx_t_4)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); - __Pyx_INCREF(__pyx_t_4); + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_MemviewEnum_type), __pyx_n_s_new); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 7, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_5 = NULL; + if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) { + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_5)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); + __Pyx_INCREF(__pyx_t_5); __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_2, function); + __Pyx_DECREF_SET(__pyx_t_1, function); } } - __pyx_t_3 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_4, __pyx_v___pyx_type) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v___pyx_type); - __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 7, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_v___pyx_result = __pyx_t_3; - __pyx_t_3 = 0; + __pyx_t_4 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_v___pyx_type) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_v___pyx_type); + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 7, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_v___pyx_result = __pyx_t_4; + __pyx_t_4 = 0; /* "(tree fragment)":8 - * raise __pyx_PickleError("Incompatible checksums (%s vs 0xb068931 = (name))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))" % __pyx_checksum) * __pyx_result = Enum.__new__(__pyx_type) * if __pyx_state is not None: # <<<<<<<<<<<<<< * __pyx_unpickle_Enum__set_state( __pyx_result, __pyx_state) * return __pyx_result */ - __pyx_t_1 = (__pyx_v___pyx_state != Py_None); - __pyx_t_6 = (__pyx_t_1 != 0); - if (__pyx_t_6) { + __pyx_t_3 = (__pyx_v___pyx_state != Py_None); + __pyx_t_2 = (__pyx_t_3 != 0); + if (__pyx_t_2) { /* "(tree fragment)":9 * __pyx_result = Enum.__new__(__pyx_type) @@ -150183,12 +150285,12 @@ static PyObject *__pyx_pf_15View_dot_MemoryView___pyx_unpickle_Enum(CYTHON_UNUSE * cdef __pyx_unpickle_Enum__set_state(Enum __pyx_result, tuple __pyx_state): */ if (!(likely(PyTuple_CheckExact(__pyx_v___pyx_state))||((__pyx_v___pyx_state) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "tuple", Py_TYPE(__pyx_v___pyx_state)->tp_name), 0))) __PYX_ERR(1, 9, __pyx_L1_error) - __pyx_t_3 = __pyx_unpickle_Enum__set_state(((struct __pyx_MemviewEnum_obj *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 9, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + __pyx_t_4 = __pyx_unpickle_Enum__set_state(((struct __pyx_MemviewEnum_obj *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 9, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; /* "(tree fragment)":8 - * raise __pyx_PickleError("Incompatible checksums (%s vs 0xb068931 = (name))" % __pyx_checksum) + * raise __pyx_PickleError("Incompatible checksums (0x%x vs (0xb068931, 0x82a3537, 0x6ae9995) = (name))" % __pyx_checksum) * __pyx_result = Enum.__new__(__pyx_type) * if __pyx_state is not None: # <<<<<<<<<<<<<< * __pyx_unpickle_Enum__set_state( __pyx_result, __pyx_state) @@ -150216,10 +150318,10 @@ static PyObject *__pyx_pf_15View_dot_MemoryView___pyx_unpickle_Enum(CYTHON_UNUSE /* function exit code */ __pyx_L1_error:; - __Pyx_XDECREF(__pyx_t_2); - __Pyx_XDECREF(__pyx_t_3); + __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); + __Pyx_XDECREF(__pyx_t_6); __Pyx_AddTraceback("View.MemoryView.__pyx_unpickle_Enum", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; @@ -150461,12 +150563,15 @@ static PyTypeObject __pyx_type_6PyCafe_MemoryNanny = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static PyObject *__pyx_tp_new_6PyCafe_CyCa(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { @@ -151764,12 +151869,15 @@ static PyTypeObject __pyx_type_6PyCafe_CyCa = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static PyObject *__pyx_tp_new_6PyCafe_channelInfo(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { @@ -151952,12 +152060,15 @@ static PyTypeObject __pyx_type_6PyCafe_channelInfo = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_vtabstruct_6PyCafe_pvctrl __pyx_vtable_6PyCafe_pvctrl; @@ -152242,12 +152353,15 @@ static PyTypeObject __pyx_type_6PyCafe_pvctrl = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static PyObject *__pyx_tp_new_6PyCafe_CafeException(PyTypeObject *t, PyObject *a, PyObject *k) { @@ -152399,12 +152513,15 @@ static PyTypeObject __pyx_type_6PyCafe_CafeException = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static PyObject *__pyx_tp_new_6PyCafe_monitorpolicy(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { @@ -152563,12 +152680,15 @@ static PyTypeObject __pyx_type_6PyCafe_monitorpolicy = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_vtabstruct_6PyCafe_pvdata __pyx_vtable_6PyCafe_pvdata; @@ -152816,12 +152936,15 @@ static PyTypeObject __pyx_type_6PyCafe_pvdata = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_vtabstruct_6PyCafe_pvgroup __pyx_vtable_6PyCafe_pvgroup; @@ -153059,12 +153182,15 @@ static PyTypeObject __pyx_type_6PyCafe_pvgroup = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_vtabstruct_6PyCafe_CyCafe __pyx_vtable_6PyCafe_CyCafe; @@ -153423,12 +153549,15 @@ static PyTypeObject __pyx_type_6PyCafe_CyCafe = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_obj_6PyCafe___pyx_scope_struct__verify_handlepv *__pyx_freelist_6PyCafe___pyx_scope_struct__verify_handlepv[8]; @@ -153538,12 +153667,15 @@ static PyTypeObject __pyx_type_6PyCafe___pyx_scope_struct__verify_handlepv = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_vtabstruct_array __pyx_vtable_array; @@ -153727,12 +153859,15 @@ static PyTypeObject __pyx_type___pyx_array = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static PyObject *__pyx_tp_new_Enum(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { @@ -153846,12 +153981,15 @@ static PyTypeObject __pyx_type___pyx_MemviewEnum = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_vtabstruct_memoryview __pyx_vtable_memoryview; @@ -154107,12 +154245,15 @@ static PyTypeObject __pyx_type___pyx_memoryview = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static struct __pyx_vtabstruct__memoryviewslice __pyx_vtable__memoryviewslice; @@ -154253,12 +154394,15 @@ static PyTypeObject __pyx_type___pyx_memoryviewslice = { #if PY_VERSION_HEX >= 0x030400a1 0, /*tp_finalize*/ #endif - #if PY_VERSION_HEX >= 0x030800b1 + #if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, /*tp_vectorcall*/ #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, /*tp_print*/ #endif + #if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, /*tp_pypy_flags*/ + #endif }; static PyMethodDef __pyx_methods[] = { @@ -154309,8 +154453,8 @@ static struct PyModuleDef __pyx_moduledef = { static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_u_0, __pyx_k_0, sizeof(__pyx_k_0), 0, 1, 0, 0}, {&__pyx_kp_u_0_1_2_3_4_5, __pyx_k_0_1_2_3_4_5, sizeof(__pyx_k_0_1_2_3_4_5), 0, 1, 0, 0}, - {&__pyx_kp_u_1_19_0_py38_gcc_7_5_0, __pyx_k_1_19_0_py38_gcc_7_5_0, sizeof(__pyx_k_1_19_0_py38_gcc_7_5_0), 0, 1, 0, 0}, - {&__pyx_kp_u_7_0_6, __pyx_k_7_0_6, sizeof(__pyx_k_7_0_6), 0, 1, 0, 0}, + {&__pyx_kp_u_1_19_3_py38_gcc_7_5_0, __pyx_k_1_19_3_py38_gcc_7_5_0, sizeof(__pyx_k_1_19_3_py38_gcc_7_5_0), 0, 1, 0, 0}, + {&__pyx_kp_u_7_0_7, __pyx_k_7_0_7, sizeof(__pyx_k_7_0_7), 0, 1, 0, 0}, {&__pyx_n_s_ASCII, __pyx_k_ASCII, sizeof(__pyx_k_ASCII), 0, 0, 1, 1}, {&__pyx_kp_u_A_handle_can_never_hold_a_negati, __pyx_k_A_handle_can_never_hold_a_negati, sizeof(__pyx_k_A_handle_can_never_hold_a_negati), 0, 1, 0, 0}, {&__pyx_kp_u_Allowed_ChannelGetActionWhenMoni, __pyx_k_Allowed_ChannelGetActionWhenMoni, sizeof(__pyx_k_Allowed_ChannelGetActionWhenMoni), 0, 1, 0, 0}, @@ -154431,8 +154575,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_u_ICAFE_NORMAL, __pyx_k_ICAFE_NORMAL, sizeof(__pyx_k_ICAFE_NORMAL), 0, 1, 0, 1}, {&__pyx_n_u_ICAFE_TYPENOTCONN, __pyx_k_ICAFE_TYPENOTCONN, sizeof(__pyx_k_ICAFE_TYPENOTCONN), 0, 1, 0, 1}, {&__pyx_n_s_ImportError, __pyx_k_ImportError, sizeof(__pyx_k_ImportError), 0, 0, 1, 1}, - {&__pyx_kp_s_Incompatible_checksums_s_vs_0x8a, __pyx_k_Incompatible_checksums_s_vs_0x8a, sizeof(__pyx_k_Incompatible_checksums_s_vs_0x8a), 0, 0, 1, 0}, - {&__pyx_kp_s_Incompatible_checksums_s_vs_0xb0, __pyx_k_Incompatible_checksums_s_vs_0xb0, sizeof(__pyx_k_Incompatible_checksums_s_vs_0xb0), 0, 0, 1, 0}, + {&__pyx_kp_s_Incompatible_checksums_0x_x_vs_0, __pyx_k_Incompatible_checksums_0x_x_vs_0, sizeof(__pyx_k_Incompatible_checksums_0x_x_vs_0), 0, 0, 1, 0}, + {&__pyx_kp_s_Incompatible_checksums_0x_x_vs_0_2, __pyx_k_Incompatible_checksums_0x_x_vs_0_2, sizeof(__pyx_k_Incompatible_checksums_0x_x_vs_0_2), 0, 0, 1, 0}, {&__pyx_n_s_IndexError, __pyx_k_IndexError, sizeof(__pyx_k_IndexError), 0, 0, 1, 1}, {&__pyx_kp_s_Indirect_dimensions_not_supporte, __pyx_k_Indirect_dimensions_not_supporte, sizeof(__pyx_k_Indirect_dimensions_not_supporte), 0, 0, 1, 0}, {&__pyx_kp_u_Input_argument_if_given_should_b, __pyx_k_Input_argument_if_given_should_b, sizeof(__pyx_k_Input_argument_if_given_should_b), 0, 1, 0, 0}, @@ -154515,7 +154659,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_u__112, __pyx_k__112, sizeof(__pyx_k__112), 0, 1, 0, 0}, {&__pyx_kp_u__12, __pyx_k__12, sizeof(__pyx_k__12), 0, 1, 0, 0}, {&__pyx_kp_u__130, __pyx_k__130, sizeof(__pyx_k__130), 0, 1, 0, 0}, - {&__pyx_kp_u__158, __pyx_k__158, sizeof(__pyx_k__158), 0, 1, 0, 0}, + {&__pyx_kp_u__160, __pyx_k__160, sizeof(__pyx_k__160), 0, 1, 0, 0}, {&__pyx_kp_u__17, __pyx_k__17, sizeof(__pyx_k__17), 0, 1, 0, 0}, {&__pyx_kp_u__25, __pyx_k__25, sizeof(__pyx_k__25), 0, 1, 0, 0}, {&__pyx_kp_u__26, __pyx_k__26, sizeof(__pyx_k__26), 0, 1, 0, 0}, @@ -155426,7 +155570,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * IF PY_EXT_C: */ - __pyx_tuple__37 = PyTuple_Pack(1, __pyx_int_50858992); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 241, __pyx_L1_error) + __pyx_tuple__37 = PyTuple_Pack(1, __pyx_int_50988272); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 241, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__37); __Pyx_GIVEREF(__pyx_tuple__37); @@ -156284,28 +156428,31 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __pyx_tuple__137 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__137)) __PYX_ERR(1, 4, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__137); __Pyx_GIVEREF(__pyx_tuple__137); + __pyx_tuple__138 = PyTuple_Pack(3, __pyx_int_145648516, __pyx_int_137594515, __pyx_int_235797780); if (unlikely(!__pyx_tuple__138)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__138); + __Pyx_GIVEREF(__pyx_tuple__138); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":945 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":945 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< * * cdef inline int import_umath() except -1: */ - __pyx_tuple__138 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_multiarray_failed_to); if (unlikely(!__pyx_tuple__138)) __PYX_ERR(4, 945, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__138); - __Pyx_GIVEREF(__pyx_tuple__138); + __pyx_tuple__139 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_multiarray_failed_to); if (unlikely(!__pyx_tuple__139)) __PYX_ERR(4, 945, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__139); + __Pyx_GIVEREF(__pyx_tuple__139); - /* "../../../../../../../opt/gfa/python-3.8/20211215/lib/python3.8/site-packages/numpy/__init__.pxd":951 + /* "../../../../../../../opt/gfa/python-3.10/20220602/lib/python3.10/site-packages/numpy/__init__.pxd":951 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< * * cdef inline int import_ufunc() except -1: */ - __pyx_tuple__139 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_umath_failed_to_impor); if (unlikely(!__pyx_tuple__139)) __PYX_ERR(4, 951, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__139); - __Pyx_GIVEREF(__pyx_tuple__139); + __pyx_tuple__140 = PyTuple_Pack(1, __pyx_kp_u_numpy_core_umath_failed_to_impor); if (unlikely(!__pyx_tuple__140)) __PYX_ERR(4, 951, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__140); + __Pyx_GIVEREF(__pyx_tuple__140); /* "View.MemoryView":133 * @@ -156314,9 +156461,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * if itemsize <= 0: */ - __pyx_tuple__140 = PyTuple_Pack(1, __pyx_kp_s_Empty_shape_tuple_for_cython_arr); if (unlikely(!__pyx_tuple__140)) __PYX_ERR(1, 133, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__140); - __Pyx_GIVEREF(__pyx_tuple__140); + __pyx_tuple__141 = PyTuple_Pack(1, __pyx_kp_s_Empty_shape_tuple_for_cython_arr); if (unlikely(!__pyx_tuple__141)) __PYX_ERR(1, 133, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__141); + __Pyx_GIVEREF(__pyx_tuple__141); /* "View.MemoryView":136 * @@ -156325,9 +156472,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * if not isinstance(format, bytes): */ - __pyx_tuple__141 = PyTuple_Pack(1, __pyx_kp_s_itemsize_0_for_cython_array); if (unlikely(!__pyx_tuple__141)) __PYX_ERR(1, 136, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__141); - __Pyx_GIVEREF(__pyx_tuple__141); + __pyx_tuple__142 = PyTuple_Pack(1, __pyx_kp_s_itemsize_0_for_cython_array); if (unlikely(!__pyx_tuple__142)) __PYX_ERR(1, 136, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__142); + __Pyx_GIVEREF(__pyx_tuple__142); /* "View.MemoryView":148 * @@ -156336,9 +156483,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * */ - __pyx_tuple__142 = PyTuple_Pack(1, __pyx_kp_s_unable_to_allocate_shape_and_str); if (unlikely(!__pyx_tuple__142)) __PYX_ERR(1, 148, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__142); - __Pyx_GIVEREF(__pyx_tuple__142); + __pyx_tuple__143 = PyTuple_Pack(1, __pyx_kp_s_unable_to_allocate_shape_and_str); if (unlikely(!__pyx_tuple__143)) __PYX_ERR(1, 148, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__143); + __Pyx_GIVEREF(__pyx_tuple__143); /* "View.MemoryView":176 * self.data = malloc(self.len) @@ -156347,9 +156494,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * if self.dtype_is_object: */ - __pyx_tuple__143 = PyTuple_Pack(1, __pyx_kp_s_unable_to_allocate_array_data); if (unlikely(!__pyx_tuple__143)) __PYX_ERR(1, 176, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__143); - __Pyx_GIVEREF(__pyx_tuple__143); + __pyx_tuple__144 = PyTuple_Pack(1, __pyx_kp_s_unable_to_allocate_array_data); if (unlikely(!__pyx_tuple__144)) __PYX_ERR(1, 176, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__144); + __Pyx_GIVEREF(__pyx_tuple__144); /* "View.MemoryView":192 * bufmode = PyBUF_F_CONTIGUOUS | PyBUF_ANY_CONTIGUOUS @@ -156358,9 +156505,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * info.buf = self.data * info.len = self.len */ - __pyx_tuple__144 = PyTuple_Pack(1, __pyx_kp_s_Can_only_create_a_buffer_that_is); if (unlikely(!__pyx_tuple__144)) __PYX_ERR(1, 192, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__144); - __Pyx_GIVEREF(__pyx_tuple__144); + __pyx_tuple__145 = PyTuple_Pack(1, __pyx_kp_s_Can_only_create_a_buffer_that_is); if (unlikely(!__pyx_tuple__145)) __PYX_ERR(1, 192, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__145); + __Pyx_GIVEREF(__pyx_tuple__145); /* "(tree fragment)":2 * def __reduce_cython__(self): @@ -156368,18 +156515,18 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") */ - __pyx_tuple__145 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__145)) __PYX_ERR(1, 2, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__145); - __Pyx_GIVEREF(__pyx_tuple__145); + __pyx_tuple__146 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__146)) __PYX_ERR(1, 2, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__146); + __Pyx_GIVEREF(__pyx_tuple__146); /* "(tree fragment)":4 * raise TypeError("no default __reduce__ due to non-trivial __cinit__") * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") # <<<<<<<<<<<<<< */ - __pyx_tuple__146 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__146)) __PYX_ERR(1, 4, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__146); - __Pyx_GIVEREF(__pyx_tuple__146); + __pyx_tuple__147 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__147)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__147); + __Pyx_GIVEREF(__pyx_tuple__147); /* "View.MemoryView":418 * def __setitem__(memoryview self, object index, object value): @@ -156388,9 +156535,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * have_slices, index = _unellipsify(index, self.view.ndim) */ - __pyx_tuple__147 = PyTuple_Pack(1, __pyx_kp_s_Cannot_assign_to_read_only_memor); if (unlikely(!__pyx_tuple__147)) __PYX_ERR(1, 418, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__147); - __Pyx_GIVEREF(__pyx_tuple__147); + __pyx_tuple__148 = PyTuple_Pack(1, __pyx_kp_s_Cannot_assign_to_read_only_memor); if (unlikely(!__pyx_tuple__148)) __PYX_ERR(1, 418, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__148); + __Pyx_GIVEREF(__pyx_tuple__148); /* "View.MemoryView":495 * result = struct.unpack(self.view.format, bytesitem) @@ -156399,9 +156546,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * else: * if len(self.view.format) == 1: */ - __pyx_tuple__148 = PyTuple_Pack(1, __pyx_kp_s_Unable_to_convert_item_to_object); if (unlikely(!__pyx_tuple__148)) __PYX_ERR(1, 495, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__148); - __Pyx_GIVEREF(__pyx_tuple__148); + __pyx_tuple__149 = PyTuple_Pack(1, __pyx_kp_s_Unable_to_convert_item_to_object); if (unlikely(!__pyx_tuple__149)) __PYX_ERR(1, 495, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__149); + __Pyx_GIVEREF(__pyx_tuple__149); /* "View.MemoryView":520 * def __getbuffer__(self, Py_buffer *info, int flags): @@ -156410,9 +156557,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * if flags & PyBUF_ND: */ - __pyx_tuple__149 = PyTuple_Pack(1, __pyx_kp_s_Cannot_create_writable_memory_vi); if (unlikely(!__pyx_tuple__149)) __PYX_ERR(1, 520, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__149); - __Pyx_GIVEREF(__pyx_tuple__149); + __pyx_tuple__150 = PyTuple_Pack(1, __pyx_kp_s_Cannot_create_writable_memory_vi); if (unlikely(!__pyx_tuple__150)) __PYX_ERR(1, 520, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__150); + __Pyx_GIVEREF(__pyx_tuple__150); /* "View.MemoryView":570 * if self.view.strides == NULL: @@ -156421,9 +156568,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * return tuple([stride for stride in self.view.strides[:self.view.ndim]]) */ - __pyx_tuple__150 = PyTuple_Pack(1, __pyx_kp_s_Buffer_view_does_not_expose_stri); if (unlikely(!__pyx_tuple__150)) __PYX_ERR(1, 570, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__150); - __Pyx_GIVEREF(__pyx_tuple__150); + __pyx_tuple__151 = PyTuple_Pack(1, __pyx_kp_s_Buffer_view_does_not_expose_stri); if (unlikely(!__pyx_tuple__151)) __PYX_ERR(1, 570, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__151); + __Pyx_GIVEREF(__pyx_tuple__151); /* "View.MemoryView":577 * def suboffsets(self): @@ -156432,12 +156579,12 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * return tuple([suboffset for suboffset in self.view.suboffsets[:self.view.ndim]]) */ - __pyx_tuple__151 = PyTuple_New(1); if (unlikely(!__pyx_tuple__151)) __PYX_ERR(1, 577, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__151); + __pyx_tuple__152 = PyTuple_New(1); if (unlikely(!__pyx_tuple__152)) __PYX_ERR(1, 577, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__152); __Pyx_INCREF(__pyx_int_neg_1); __Pyx_GIVEREF(__pyx_int_neg_1); - PyTuple_SET_ITEM(__pyx_tuple__151, 0, __pyx_int_neg_1); - __Pyx_GIVEREF(__pyx_tuple__151); + PyTuple_SET_ITEM(__pyx_tuple__152, 0, __pyx_int_neg_1); + __Pyx_GIVEREF(__pyx_tuple__152); /* "(tree fragment)":2 * def __reduce_cython__(self): @@ -156445,18 +156592,18 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") */ - __pyx_tuple__152 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__152)) __PYX_ERR(1, 2, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__152); - __Pyx_GIVEREF(__pyx_tuple__152); + __pyx_tuple__153 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__153)) __PYX_ERR(1, 2, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__153); + __Pyx_GIVEREF(__pyx_tuple__153); /* "(tree fragment)":4 * raise TypeError("no default __reduce__ due to non-trivial __cinit__") * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") # <<<<<<<<<<<<<< */ - __pyx_tuple__153 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__153)) __PYX_ERR(1, 4, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__153); - __Pyx_GIVEREF(__pyx_tuple__153); + __pyx_tuple__154 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__154)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__154); + __Pyx_GIVEREF(__pyx_tuple__154); /* "View.MemoryView":682 * if item is Ellipsis: @@ -156465,9 +156612,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * seen_ellipsis = True * else: */ - __pyx_slice__154 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_slice__154)) __PYX_ERR(1, 682, __pyx_L1_error) - __Pyx_GOTREF(__pyx_slice__154); - __Pyx_GIVEREF(__pyx_slice__154); + __pyx_slice__155 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_slice__155)) __PYX_ERR(1, 682, __pyx_L1_error) + __Pyx_GOTREF(__pyx_slice__155); + __Pyx_GIVEREF(__pyx_slice__155); /* "View.MemoryView":703 * for suboffset in suboffsets[:ndim]: @@ -156476,9 +156623,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * */ - __pyx_tuple__155 = PyTuple_Pack(1, __pyx_kp_s_Indirect_dimensions_not_supporte); if (unlikely(!__pyx_tuple__155)) __PYX_ERR(1, 703, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__155); - __Pyx_GIVEREF(__pyx_tuple__155); + __pyx_tuple__156 = PyTuple_Pack(1, __pyx_kp_s_Indirect_dimensions_not_supporte); if (unlikely(!__pyx_tuple__156)) __PYX_ERR(1, 703, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__156); + __Pyx_GIVEREF(__pyx_tuple__156); /* "(tree fragment)":2 * def __reduce_cython__(self): @@ -156486,18 +156633,21 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") */ - __pyx_tuple__156 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__156)) __PYX_ERR(1, 2, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__156); - __Pyx_GIVEREF(__pyx_tuple__156); + __pyx_tuple__157 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__157)) __PYX_ERR(1, 2, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__157); + __Pyx_GIVEREF(__pyx_tuple__157); /* "(tree fragment)":4 * raise TypeError("no default __reduce__ due to non-trivial __cinit__") * def __setstate_cython__(self, __pyx_state): * raise TypeError("no default __reduce__ due to non-trivial __cinit__") # <<<<<<<<<<<<<< */ - __pyx_tuple__157 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__157)) __PYX_ERR(1, 4, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__157); - __Pyx_GIVEREF(__pyx_tuple__157); + __pyx_tuple__158 = PyTuple_Pack(1, __pyx_kp_s_no_default___reduce___due_to_non); if (unlikely(!__pyx_tuple__158)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__158); + __Pyx_GIVEREF(__pyx_tuple__158); + __pyx_tuple__159 = PyTuple_Pack(3, __pyx_int_184977713, __pyx_int_136983863, __pyx_int_112105877); if (unlikely(!__pyx_tuple__159)) __PYX_ERR(1, 4, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__159); + __Pyx_GIVEREF(__pyx_tuple__159); /* "PyCafe.pyx":48 * @@ -156506,9 +156656,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * _appname = _pymodule_parts[0] * */ - __pyx_tuple__159 = PyTuple_Pack(1, __pyx_kp_u__158); if (unlikely(!__pyx_tuple__159)) __PYX_ERR(0, 48, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__159); - __Pyx_GIVEREF(__pyx_tuple__159); + __pyx_tuple__161 = PyTuple_Pack(1, __pyx_kp_u__160); if (unlikely(!__pyx_tuple__161)) __PYX_ERR(0, 48, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__161); + __Pyx_GIVEREF(__pyx_tuple__161); /* "PyCafe.pyx":88 * include "PyCafeDefs.pxi" @@ -156517,20 +156667,20 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * """Decorator to validate handle/PV input argument. * */ - __pyx_tuple__160 = PyTuple_Pack(3, __pyx_n_s_func, __pyx_n_s_wrapper, __pyx_n_s_wrapper); if (unlikely(!__pyx_tuple__160)) __PYX_ERR(0, 88, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__160); - __Pyx_GIVEREF(__pyx_tuple__160); - __pyx_codeobj__161 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__160, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_PyCafe_pyx, __pyx_n_s_verify_handlepv, 88, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__161)) __PYX_ERR(0, 88, __pyx_L1_error) + __pyx_tuple__162 = PyTuple_Pack(3, __pyx_n_s_func, __pyx_n_s_wrapper, __pyx_n_s_wrapper); if (unlikely(!__pyx_tuple__162)) __PYX_ERR(0, 88, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__162); + __Pyx_GIVEREF(__pyx_tuple__162); + __pyx_codeobj__163 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__162, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_PyCafe_pyx, __pyx_n_s_verify_handlepv, 88, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__163)) __PYX_ERR(0, 88, __pyx_L1_error) /* "(tree fragment)":1 * def __pyx_unpickle_CafeException(__pyx_type, long __pyx_checksum, __pyx_state): # <<<<<<<<<<<<<< * cdef object __pyx_PickleError * cdef object __pyx_result */ - __pyx_tuple__162 = PyTuple_Pack(5, __pyx_n_s_pyx_type, __pyx_n_s_pyx_checksum, __pyx_n_s_pyx_state, __pyx_n_s_pyx_PickleError, __pyx_n_s_pyx_result); if (unlikely(!__pyx_tuple__162)) __PYX_ERR(1, 1, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__162); - __Pyx_GIVEREF(__pyx_tuple__162); - __pyx_codeobj__163 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__162, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_pyx_unpickle_CafeException, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__163)) __PYX_ERR(1, 1, __pyx_L1_error) + __pyx_tuple__164 = PyTuple_Pack(5, __pyx_n_s_pyx_type, __pyx_n_s_pyx_checksum, __pyx_n_s_pyx_state, __pyx_n_s_pyx_PickleError, __pyx_n_s_pyx_result); if (unlikely(!__pyx_tuple__164)) __PYX_ERR(1, 1, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__164); + __Pyx_GIVEREF(__pyx_tuple__164); + __pyx_codeobj__165 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__164, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_pyx_unpickle_CafeException, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__165)) __PYX_ERR(1, 1, __pyx_L1_error) /* "View.MemoryView":286 * return self.name @@ -156539,9 +156689,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * cdef strided = Enum("") # default * cdef indirect = Enum("") */ - __pyx_tuple__164 = PyTuple_Pack(1, __pyx_kp_s_strided_and_direct_or_indirect); if (unlikely(!__pyx_tuple__164)) __PYX_ERR(1, 286, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__164); - __Pyx_GIVEREF(__pyx_tuple__164); + __pyx_tuple__166 = PyTuple_Pack(1, __pyx_kp_s_strided_and_direct_or_indirect); if (unlikely(!__pyx_tuple__166)) __PYX_ERR(1, 286, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__166); + __Pyx_GIVEREF(__pyx_tuple__166); /* "View.MemoryView":287 * @@ -156550,9 +156700,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * cdef indirect = Enum("") * */ - __pyx_tuple__165 = PyTuple_Pack(1, __pyx_kp_s_strided_and_direct); if (unlikely(!__pyx_tuple__165)) __PYX_ERR(1, 287, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__165); - __Pyx_GIVEREF(__pyx_tuple__165); + __pyx_tuple__167 = PyTuple_Pack(1, __pyx_kp_s_strided_and_direct); if (unlikely(!__pyx_tuple__167)) __PYX_ERR(1, 287, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__167); + __Pyx_GIVEREF(__pyx_tuple__167); /* "View.MemoryView":288 * cdef generic = Enum("") @@ -156561,9 +156711,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * */ - __pyx_tuple__166 = PyTuple_Pack(1, __pyx_kp_s_strided_and_indirect); if (unlikely(!__pyx_tuple__166)) __PYX_ERR(1, 288, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__166); - __Pyx_GIVEREF(__pyx_tuple__166); + __pyx_tuple__168 = PyTuple_Pack(1, __pyx_kp_s_strided_and_indirect); if (unlikely(!__pyx_tuple__168)) __PYX_ERR(1, 288, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__168); + __Pyx_GIVEREF(__pyx_tuple__168); /* "View.MemoryView":291 * @@ -156572,9 +156722,9 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * cdef indirect_contiguous = Enum("") * */ - __pyx_tuple__167 = PyTuple_Pack(1, __pyx_kp_s_contiguous_and_direct); if (unlikely(!__pyx_tuple__167)) __PYX_ERR(1, 291, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__167); - __Pyx_GIVEREF(__pyx_tuple__167); + __pyx_tuple__169 = PyTuple_Pack(1, __pyx_kp_s_contiguous_and_direct); if (unlikely(!__pyx_tuple__169)) __PYX_ERR(1, 291, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__169); + __Pyx_GIVEREF(__pyx_tuple__169); /* "View.MemoryView":292 * @@ -156583,19 +156733,19 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { * * */ - __pyx_tuple__168 = PyTuple_Pack(1, __pyx_kp_s_contiguous_and_indirect); if (unlikely(!__pyx_tuple__168)) __PYX_ERR(1, 292, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__168); - __Pyx_GIVEREF(__pyx_tuple__168); + __pyx_tuple__170 = PyTuple_Pack(1, __pyx_kp_s_contiguous_and_indirect); if (unlikely(!__pyx_tuple__170)) __PYX_ERR(1, 292, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__170); + __Pyx_GIVEREF(__pyx_tuple__170); /* "(tree fragment)":1 * def __pyx_unpickle_Enum(__pyx_type, long __pyx_checksum, __pyx_state): # <<<<<<<<<<<<<< * cdef object __pyx_PickleError * cdef object __pyx_result */ - __pyx_tuple__169 = PyTuple_Pack(5, __pyx_n_s_pyx_type, __pyx_n_s_pyx_checksum, __pyx_n_s_pyx_state, __pyx_n_s_pyx_PickleError, __pyx_n_s_pyx_result); if (unlikely(!__pyx_tuple__169)) __PYX_ERR(1, 1, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__169); - __Pyx_GIVEREF(__pyx_tuple__169); - __pyx_codeobj__170 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__169, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_pyx_unpickle_Enum, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__170)) __PYX_ERR(1, 1, __pyx_L1_error) + __pyx_tuple__171 = PyTuple_Pack(5, __pyx_n_s_pyx_type, __pyx_n_s_pyx_checksum, __pyx_n_s_pyx_state, __pyx_n_s_pyx_PickleError, __pyx_n_s_pyx_result); if (unlikely(!__pyx_tuple__171)) __PYX_ERR(1, 1, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__171); + __Pyx_GIVEREF(__pyx_tuple__171); + __pyx_codeobj__172 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__171, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_stringsource, __pyx_n_s_pyx_unpickle_Enum, 1, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__172)) __PYX_ERR(1, 1, __pyx_L1_error) __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; @@ -156618,9 +156768,13 @@ static CYTHON_SMALL_CODE int __Pyx_InitGlobals(void) { __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_6 = PyInt_FromLong(6); if (unlikely(!__pyx_int_6)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_40 = PyInt_FromLong(40); if (unlikely(!__pyx_int_40)) __PYX_ERR(0, 1, __pyx_L1_error) - __pyx_int_50858992 = PyInt_FromLong(50858992L); if (unlikely(!__pyx_int_50858992)) __PYX_ERR(0, 1, __pyx_L1_error) + __pyx_int_50988272 = PyInt_FromLong(50988272L); if (unlikely(!__pyx_int_50988272)) __PYX_ERR(0, 1, __pyx_L1_error) + __pyx_int_112105877 = PyInt_FromLong(112105877L); if (unlikely(!__pyx_int_112105877)) __PYX_ERR(0, 1, __pyx_L1_error) + __pyx_int_136983863 = PyInt_FromLong(136983863L); if (unlikely(!__pyx_int_136983863)) __PYX_ERR(0, 1, __pyx_L1_error) + __pyx_int_137594515 = PyInt_FromLong(137594515L); if (unlikely(!__pyx_int_137594515)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_145648516 = PyInt_FromLong(145648516L); if (unlikely(!__pyx_int_145648516)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_184977713 = PyInt_FromLong(184977713L); if (unlikely(!__pyx_int_184977713)) __PYX_ERR(0, 1, __pyx_L1_error) + __pyx_int_235797780 = PyInt_FromLong(235797780L); if (unlikely(!__pyx_int_235797780)) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) __PYX_ERR(0, 1, __pyx_L1_error) return 0; __pyx_L1_error:; @@ -157327,7 +157481,7 @@ if (!__Pyx_RefNanny) { __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_split); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__159, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 48, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__161, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (PyDict_SetItem(__pyx_d, __pyx_n_s_pymodule_parts, __pyx_t_1) < 0) __PYX_ERR(0, 48, __pyx_L1_error) @@ -158895,7 +159049,7 @@ if (!__Pyx_RefNanny) { * cdef strided = Enum("") # default * cdef indirect = Enum("") */ - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__164, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 286, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__166, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 286, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_XGOTREF(generic); __Pyx_DECREF_SET(generic, __pyx_t_1); @@ -158909,7 +159063,7 @@ if (!__Pyx_RefNanny) { * cdef indirect = Enum("") * */ - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__165, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 287, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__167, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 287, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_XGOTREF(strided); __Pyx_DECREF_SET(strided, __pyx_t_1); @@ -158923,7 +159077,7 @@ if (!__Pyx_RefNanny) { * * */ - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__166, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 288, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__168, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 288, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_XGOTREF(indirect); __Pyx_DECREF_SET(indirect, __pyx_t_1); @@ -158937,7 +159091,7 @@ if (!__Pyx_RefNanny) { * cdef indirect_contiguous = Enum("") * */ - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__167, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 291, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__169, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 291, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_XGOTREF(contiguous); __Pyx_DECREF_SET(contiguous, __pyx_t_1); @@ -158951,7 +159105,7 @@ if (!__Pyx_RefNanny) { * * */ - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__168, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 292, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_MemviewEnum_type), __pyx_tuple__170, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 292, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_XGOTREF(indirect_contiguous); __Pyx_DECREF_SET(indirect_contiguous, __pyx_t_1); @@ -159861,17 +160015,6 @@ done_or_error: } /* CIntToPyUnicode */ -#ifdef _MSC_VER - #ifndef _MSC_STDINT_H_ - #if _MSC_VER < 1300 - typedef unsigned short uint16_t; - #else - typedef unsigned __int16 uint16_t; - #endif - #endif -#else - #include -#endif static CYTHON_INLINE PyObject* __Pyx_PyUnicode_From_int(int value, Py_ssize_t width, char padding_char, char format_char) { char digits[sizeof(int)*3+2]; char *dpos, *end = digits + sizeof(int)*3+2; @@ -159902,14 +160045,14 @@ static CYTHON_INLINE PyObject* __Pyx_PyUnicode_From_int(int value, Py_ssize_t wi digit_pos = abs((int)(remaining % (8*8))); remaining = (int) (remaining / (8*8)); dpos -= 2; - *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_8)[digit_pos]; + memcpy(dpos, DIGIT_PAIRS_8 + digit_pos * 2, 2); last_one_off = (digit_pos < 8); break; case 'd': digit_pos = abs((int)(remaining % (10*10))); remaining = (int) (remaining / (10*10)); dpos -= 2; - *(uint16_t*)dpos = ((const uint16_t*)DIGIT_PAIRS_10)[digit_pos]; + memcpy(dpos, DIGIT_PAIRS_10 + digit_pos * 2, 2); last_one_off = (digit_pos < 10); break; case 'x': @@ -160298,7 +160441,7 @@ static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int eq return (equals == Py_EQ); } else { int result; -#if CYTHON_USE_UNICODE_INTERNALS +#if CYTHON_USE_UNICODE_INTERNALS && (PY_VERSION_HEX < 0x030B0000) Py_hash_t hash1, hash2; hash1 = ((PyBytesObject*)s1)->ob_shash; hash2 = ((PyBytesObject*)s2)->ob_shash; @@ -161376,6 +161519,9 @@ static PyObject *__Pyx_CyFunction_CallAsMethod(PyObject *func, PyObject *args, P self = PyTuple_GetItem(args, 0); if (unlikely(!self)) { Py_DECREF(new_args); + PyErr_Format(PyExc_TypeError, + "unbound method %.200S() needs an argument", + cyfunc->func_qualname); return NULL; } result = __Pyx_CyFunction_CallMethod(func, self, new_args, kw); @@ -161444,12 +161590,15 @@ static PyTypeObject __pyx_CyFunctionType_type = { #if PY_VERSION_HEX >= 0x030400a1 0, #endif -#if PY_VERSION_HEX >= 0x030800b1 +#if PY_VERSION_HEX >= 0x030800b1 && (!CYTHON_COMPILING_IN_PYPY || PYPY_VERSION_NUM >= 0x07030800) 0, #endif #if PY_VERSION_HEX >= 0x030800b4 && PY_VERSION_HEX < 0x03090000 0, #endif +#if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX >= 0x03090000 + 0, +#endif }; static int __pyx_CyFunction_init(void) { __pyx_CyFunctionType = __Pyx_FetchCommonType(&__pyx_CyFunctionType_type); @@ -162296,7 +162445,7 @@ static CYTHON_INLINE int __Pyx_HasAttr(PyObject *o, PyObject *n) { } } -/* None */ +/* DivInt[Py_ssize_t] */ static CYTHON_INLINE Py_ssize_t __Pyx_div_Py_ssize_t(Py_ssize_t a, Py_ssize_t b) { Py_ssize_t q = a / b; Py_ssize_t r = a - q*b; @@ -162442,7 +162591,7 @@ static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObj } #endif -/* None */ +/* DivInt[long] */ static CYTHON_INLINE long __Pyx_div_long(long a, long b) { long q = a / b; long r = a - q*b; @@ -162560,17 +162709,35 @@ static int __Pyx_setup_reduce_is_named(PyObject* meth, PyObject* name) { static int __Pyx_setup_reduce(PyObject* type_obj) { int ret = 0; PyObject *object_reduce = NULL; + PyObject *object_getstate = NULL; PyObject *object_reduce_ex = NULL; PyObject *reduce = NULL; PyObject *reduce_ex = NULL; PyObject *reduce_cython = NULL; PyObject *setstate = NULL; PyObject *setstate_cython = NULL; + PyObject *getstate = NULL; #if CYTHON_USE_PYTYPE_LOOKUP - if (_PyType_Lookup((PyTypeObject*)type_obj, __pyx_n_s_getstate)) goto __PYX_GOOD; + getstate = _PyType_Lookup((PyTypeObject*)type_obj, __pyx_n_s_getstate); #else - if (PyObject_HasAttr(type_obj, __pyx_n_s_getstate)) goto __PYX_GOOD; + getstate = __Pyx_PyObject_GetAttrStrNoError(type_obj, __pyx_n_s_getstate); + if (!getstate && PyErr_Occurred()) { + goto __PYX_BAD; + } #endif + if (getstate) { +#if CYTHON_USE_PYTYPE_LOOKUP + object_getstate = _PyType_Lookup(&PyBaseObject_Type, __pyx_n_s_getstate); +#else + object_getstate = __Pyx_PyObject_GetAttrStrNoError((PyObject*)&PyBaseObject_Type, __pyx_n_s_getstate); + if (!object_getstate && PyErr_Occurred()) { + goto __PYX_BAD; + } +#endif + if (object_getstate != getstate) { + goto __PYX_GOOD; + } + } #if CYTHON_USE_PYTYPE_LOOKUP object_reduce_ex = _PyType_Lookup(&PyBaseObject_Type, __pyx_n_s_reduce_ex); if (!object_reduce_ex) goto __PYX_BAD; #else @@ -162615,6 +162782,8 @@ __PYX_GOOD: #if !CYTHON_USE_PYTYPE_LOOKUP Py_XDECREF(object_reduce); Py_XDECREF(object_reduce_ex); + Py_XDECREF(object_getstate); + Py_XDECREF(getstate); #endif Py_XDECREF(reduce); Py_XDECREF(reduce_ex); @@ -162802,7 +162971,7 @@ static int __Pyx_CLineForTraceback(CYTHON_NCP_UNUSED PyThreadState *tstate, int } if (!use_cline) { c_line = 0; - PyObject_SetAttr(__pyx_cython_runtime, __pyx_n_s_cline_in_traceback, Py_False); + (void) PyObject_SetAttr(__pyx_cython_runtime, __pyx_n_s_cline_in_traceback, Py_False); } else if (use_cline == Py_False || (use_cline != Py_True && PyObject_Not(use_cline) != 0)) { c_line = 0; @@ -162896,33 +163065,40 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) { #include "compile.h" #include "frameobject.h" #include "traceback.h" +#if PY_VERSION_HEX >= 0x030b00a6 + #ifndef Py_BUILD_CORE + #define Py_BUILD_CORE 1 + #endif + #include "internal/pycore_frame.h" +#endif static PyCodeObject* __Pyx_CreateCodeObjectForTraceback( const char *funcname, int c_line, int py_line, const char *filename) { - PyCodeObject *py_code = 0; - PyObject *py_srcfile = 0; - PyObject *py_funcname = 0; + PyCodeObject *py_code = NULL; + PyObject *py_funcname = NULL; #if PY_MAJOR_VERSION < 3 + PyObject *py_srcfile = NULL; py_srcfile = PyString_FromString(filename); - #else - py_srcfile = PyUnicode_FromString(filename); - #endif if (!py_srcfile) goto bad; + #endif if (c_line) { #if PY_MAJOR_VERSION < 3 py_funcname = PyString_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, c_line); + if (!py_funcname) goto bad; #else py_funcname = PyUnicode_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, c_line); + if (!py_funcname) goto bad; + funcname = PyUnicode_AsUTF8(py_funcname); + if (!funcname) goto bad; #endif } else { #if PY_MAJOR_VERSION < 3 py_funcname = PyString_FromString(funcname); - #else - py_funcname = PyUnicode_FromString(funcname); + if (!py_funcname) goto bad; #endif } - if (!py_funcname) goto bad; + #if PY_MAJOR_VERSION < 3 py_code = __Pyx_PyCode_New( 0, 0, @@ -162941,11 +163117,16 @@ static PyCodeObject* __Pyx_CreateCodeObjectForTraceback( __pyx_empty_bytes /*PyObject *lnotab*/ ); Py_DECREF(py_srcfile); - Py_DECREF(py_funcname); + #else + py_code = PyCode_NewEmpty(filename, funcname, py_line); + #endif + Py_XDECREF(py_funcname); // XDECREF since it's only set on Py3 if cline return py_code; bad: - Py_XDECREF(py_srcfile); Py_XDECREF(py_funcname); + #if PY_MAJOR_VERSION < 3 + Py_XDECREF(py_srcfile); + #endif return NULL; } static void __Pyx_AddTraceback(const char *funcname, int c_line, @@ -162953,14 +163134,24 @@ static void __Pyx_AddTraceback(const char *funcname, int c_line, PyCodeObject *py_code = 0; PyFrameObject *py_frame = 0; PyThreadState *tstate = __Pyx_PyThreadState_Current; + PyObject *ptype, *pvalue, *ptraceback; if (c_line) { c_line = __Pyx_CLineForTraceback(tstate, c_line); } py_code = __pyx_find_code_object(c_line ? -c_line : py_line); if (!py_code) { + __Pyx_ErrFetchInState(tstate, &ptype, &pvalue, &ptraceback); py_code = __Pyx_CreateCodeObjectForTraceback( funcname, c_line, py_line, filename); - if (!py_code) goto bad; + if (!py_code) { + /* If the code object creation fails, then we should clear the + fetched exception references and propagate the new exception */ + Py_XDECREF(ptype); + Py_XDECREF(pvalue); + Py_XDECREF(ptraceback); + goto bad; + } + __Pyx_ErrRestoreInState(tstate, ptype, pvalue, ptraceback); __pyx_insert_code_object(c_line ? -c_line : py_line, py_code); } py_frame = PyFrame_New( @@ -169672,11 +169863,33 @@ raise_neg_overflow: /* CheckBinaryVersion */ static int __Pyx_check_binary_version(void) { - char ctversion[4], rtversion[4]; - PyOS_snprintf(ctversion, 4, "%d.%d", PY_MAJOR_VERSION, PY_MINOR_VERSION); - PyOS_snprintf(rtversion, 4, "%s", Py_GetVersion()); - if (ctversion[0] != rtversion[0] || ctversion[2] != rtversion[2]) { + char ctversion[5]; + int same=1, i, found_dot; + const char* rt_from_call = Py_GetVersion(); + PyOS_snprintf(ctversion, 5, "%d.%d", PY_MAJOR_VERSION, PY_MINOR_VERSION); + found_dot = 0; + for (i = 0; i < 4; i++) { + if (!ctversion[i]) { + same = (rt_from_call[i] < '0' || rt_from_call[i] > '9'); + break; + } + if (rt_from_call[i] != ctversion[i]) { + same = 0; + break; + } + } + if (!same) { + char rtversion[5] = {'\0'}; char message[200]; + for (i=0; i<4; ++i) { + if (rt_from_call[i] == '.') { + if (found_dot) break; + found_dot = 1; + } else if (rt_from_call[i] < '0' || rt_from_call[i] > '9') { + break; + } + rtversion[i] = rt_from_call[i]; + } PyOS_snprintf(message, sizeof(message), "compiletime version %s of module '%.100s' " "does not match runtime version %s", @@ -169934,6 +170147,23 @@ static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) { Py_DECREF(x); return ival; } +static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject* o) { + if (sizeof(Py_hash_t) == sizeof(Py_ssize_t)) { + return (Py_hash_t) __Pyx_PyIndex_AsSsize_t(o); +#if PY_MAJOR_VERSION < 3 + } else if (likely(PyInt_CheckExact(o))) { + return PyInt_AS_LONG(o); +#endif + } else { + Py_ssize_t ival; + PyObject *x; + x = PyNumber_Index(o); + if (!x) return -1; + ival = PyInt_AsLong(x); + Py_DECREF(x); + return ival; + } +} static CYTHON_INLINE PyObject * __Pyx_PyBool_FromLong(long b) { return b ? __Pyx_NewRef(Py_True) : __Pyx_NewRef(Py_False); } diff --git a/PyCafe.h b/PyCafe.h index 42072c3..2303706 100644 --- a/PyCafe.h +++ b/PyCafe.h @@ -1,4 +1,4 @@ -/* Generated by Cython 0.29.24 */ +/* Generated by Cython 0.29.30 */ #ifndef __PYX_HAVE__PyCafe #define __PYX_HAVE__PyCafe diff --git a/PyCafe.html b/PyCafe.html index 2c0c359..83ea665 100644 --- a/PyCafe.html +++ b/PyCafe.html @@ -1,5 +1,5 @@ - + @@ -293,22 +293,22 @@ td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .cython .hll { background-color: #ffffcc } .cython { background: #f8f8f8; } -.cython .c { color: #408080; font-style: italic } /* Comment */ +.cython .c { color: #3D7B7B; font-style: italic } /* Comment */ .cython .err { border: 1px solid #FF0000 } /* Error */ .cython .k { color: #008000; font-weight: bold } /* Keyword */ .cython .o { color: #666666 } /* Operator */ -.cython .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ -.cython .cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.cython .cp { color: #BC7A00 } /* Comment.Preproc */ -.cython .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ -.cython .c1 { color: #408080; font-style: italic } /* Comment.Single */ -.cython .cs { color: #408080; font-style: italic } /* Comment.Special */ +.cython .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */ +.cython .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */ +.cython .cp { color: #9C6500 } /* Comment.Preproc */ +.cython .cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */ +.cython .c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */ +.cython .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */ .cython .gd { color: #A00000 } /* Generic.Deleted */ .cython .ge { font-style: italic } /* Generic.Emph */ -.cython .gr { color: #FF0000 } /* Generic.Error */ +.cython .gr { color: #E40000 } /* Generic.Error */ .cython .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.cython .gi { color: #00A000 } /* Generic.Inserted */ -.cython .go { color: #888888 } /* Generic.Output */ +.cython .gi { color: #008400 } /* Generic.Inserted */ +.cython .go { color: #717171 } /* Generic.Output */ .cython .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ .cython .gs { font-weight: bold } /* Generic.Strong */ .cython .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ @@ -321,15 +321,15 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .cython .kt { color: #B00040 } /* Keyword.Type */ .cython .m { color: #666666 } /* Literal.Number */ .cython .s { color: #BA2121 } /* Literal.String */ -.cython .na { color: #7D9029 } /* Name.Attribute */ +.cython .na { color: #687822 } /* Name.Attribute */ .cython .nb { color: #008000 } /* Name.Builtin */ .cython .nc { color: #0000FF; font-weight: bold } /* Name.Class */ .cython .no { color: #880000 } /* Name.Constant */ .cython .nd { color: #AA22FF } /* Name.Decorator */ -.cython .ni { color: #999999; font-weight: bold } /* Name.Entity */ -.cython .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.cython .ni { color: #717171; font-weight: bold } /* Name.Entity */ +.cython .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */ .cython .nf { color: #0000FF } /* Name.Function */ -.cython .nl { color: #A0A000 } /* Name.Label */ +.cython .nl { color: #767600 } /* Name.Label */ .cython .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ .cython .nt { color: #008000; font-weight: bold } /* Name.Tag */ .cython .nv { color: #19177C } /* Name.Variable */ @@ -346,11 +346,11 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .cython .dl { color: #BA2121 } /* Literal.String.Delimiter */ .cython .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ .cython .s2 { color: #BA2121 } /* Literal.String.Double */ -.cython .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.cython .se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */ .cython .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.cython .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.cython .si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */ .cython .sx { color: #008000 } /* Literal.String.Other */ -.cython .sr { color: #BB6688 } /* Literal.String.Regex */ +.cython .sr { color: #A45A77 } /* Literal.String.Regex */ .cython .s1 { color: #BA2121 } /* Literal.String.Single */ .cython .ss { color: #19177C } /* Literal.String.Symbol */ .cython .bp { color: #008000 } /* Name.Builtin.Pseudo */ @@ -363,7 +363,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: -

Generated by Cython 0.29.24

+

Generated by Cython 0.29.30

Yellow lines hint at Python interaction.
Click on a line that starts with a "+" to see the C code that Cython generated for it. @@ -493,15 +493,15 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_split); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__159, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 48, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__161, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; if (PyDict_SetItem(__pyx_d, __pyx_n_s_pymodule_parts, __pyx_t_1) < 0) __PYX_ERR(0, 48, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; /* … */ - __pyx_tuple__159 = PyTuple_Pack(1, __pyx_kp_u__158); if (unlikely(!__pyx_tuple__159)) __PYX_ERR(0, 48, __pyx_L1_error) - __Pyx_GOTREF(__pyx_tuple__159); - __Pyx_GIVEREF(__pyx_tuple__159); + __pyx_tuple__161 = PyTuple_Pack(1, __pyx_kp_u__160); if (unlikely(!__pyx_tuple__161)) __PYX_ERR(0, 48, __pyx_L1_error) + __Pyx_GOTREF(__pyx_tuple__161); + __Pyx_GIVEREF(__pyx_tuple__161); 

+0049: _appname = _pymodule_parts[0]
  __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_pymodule_parts); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 49, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
@@ -740,15 +740,15 @@ static PyObject *__pyx_pf_6PyCafe_verify_handlepv(CYTHON_UNUSED PyObject *__pyx_
   return __pyx_r;
 }
 /* … */
-  __pyx_tuple__160 = PyTuple_Pack(3, __pyx_n_s_func, __pyx_n_s_wrapper, __pyx_n_s_wrapper); if (unlikely(!__pyx_tuple__160)) __PYX_ERR(0, 88, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_tuple__160);
-  __Pyx_GIVEREF(__pyx_tuple__160);
+  __pyx_tuple__162 = PyTuple_Pack(3, __pyx_n_s_func, __pyx_n_s_wrapper, __pyx_n_s_wrapper); if (unlikely(!__pyx_tuple__162)) __PYX_ERR(0, 88, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_tuple__162);
+  __Pyx_GIVEREF(__pyx_tuple__162);
 /* … */
   __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_6PyCafe_1verify_handlepv, NULL, __pyx_n_s_PyCafe); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 88, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_verify_handlepv, __pyx_t_1) < 0) __PYX_ERR(0, 88, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_codeobj__161 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__160, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_PyCafe_pyx, __pyx_n_s_verify_handlepv, 88, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__161)) __PYX_ERR(0, 88, __pyx_L1_error)
+  __pyx_codeobj__163 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__162, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_PyCafe_pyx, __pyx_n_s_verify_handlepv, 88, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__163)) __PYX_ERR(0, 88, __pyx_L1_error)
 /* … */
 struct __pyx_obj_6PyCafe___pyx_scope_struct__verify_handlepv {
   PyObject_HEAD
@@ -1601,7 +1601,7 @@ static int __pyx_pf_6PyCafe_6CyCafe___cinit__(struct __pyx_obj_6PyCafe_CyCafe *_
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 /* … */
-  __pyx_tuple__37 = PyTuple_Pack(1, __pyx_int_50858992); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 241, __pyx_L1_error)
+  __pyx_tuple__37 = PyTuple_Pack(1, __pyx_int_50988272); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 241, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_tuple__37);
   __Pyx_GIVEREF(__pyx_tuple__37);
 
 0242:
@@ -1994,8 +1994,8 @@ static PyObject *__pyx_pf_6PyCafe_6CyCafe_10CAFE_version(CYTHON_UNUSED struct __ } 
+0281:         return CAFE_VERSION
  __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF(__pyx_kp_u_1_19_0_py38_gcc_7_5_0);
-  __pyx_r = __pyx_kp_u_1_19_0_py38_gcc_7_5_0;
+  __Pyx_INCREF(__pyx_kp_u_1_19_3_py38_gcc_7_5_0);
+  __pyx_r = __pyx_kp_u_1_19_3_py38_gcc_7_5_0;
   goto __pyx_L0;
 
 0282: 
+0283:     def EPICS_version(self):
@@ -2026,8 +2026,8 @@ static PyObject *__pyx_pf_6PyCafe_6CyCafe_12EPICS_version(CYTHON_UNUSED struct _ } 
+0284:         return EPICS_VERSION
  __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF(__pyx_kp_u_7_0_6);
-  __pyx_r = __pyx_kp_u_7_0_6;
+  __Pyx_INCREF(__pyx_kp_u_7_0_7);
+  __pyx_r = __pyx_kp_u_7_0_7;
   goto __pyx_L0;
 
 0285: 
+0286:     @verify_handlepv
diff --git a/PyCafeDefs.html b/PyCafeDefs.html index e94d711..14a2f2a 100644 --- a/PyCafeDefs.html +++ b/PyCafeDefs.html @@ -1,5 +1,5 @@ - + @@ -293,22 +293,22 @@ td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .cython .hll { background-color: #ffffcc } .cython { background: #f8f8f8; } -.cython .c { color: #408080; font-style: italic } /* Comment */ +.cython .c { color: #3D7B7B; font-style: italic } /* Comment */ .cython .err { border: 1px solid #FF0000 } /* Error */ .cython .k { color: #008000; font-weight: bold } /* Keyword */ .cython .o { color: #666666 } /* Operator */ -.cython .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ -.cython .cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.cython .cp { color: #BC7A00 } /* Comment.Preproc */ -.cython .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ -.cython .c1 { color: #408080; font-style: italic } /* Comment.Single */ -.cython .cs { color: #408080; font-style: italic } /* Comment.Special */ +.cython .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */ +.cython .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */ +.cython .cp { color: #9C6500 } /* Comment.Preproc */ +.cython .cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */ +.cython .c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */ +.cython .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */ .cython .gd { color: #A00000 } /* Generic.Deleted */ .cython .ge { font-style: italic } /* Generic.Emph */ -.cython .gr { color: #FF0000 } /* Generic.Error */ +.cython .gr { color: #E40000 } /* Generic.Error */ .cython .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.cython .gi { color: #00A000 } /* Generic.Inserted */ -.cython .go { color: #888888 } /* Generic.Output */ +.cython .gi { color: #008400 } /* Generic.Inserted */ +.cython .go { color: #717171 } /* Generic.Output */ .cython .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ .cython .gs { font-weight: bold } /* Generic.Strong */ .cython .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ @@ -321,15 +321,15 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .cython .kt { color: #B00040 } /* Keyword.Type */ .cython .m { color: #666666 } /* Literal.Number */ .cython .s { color: #BA2121 } /* Literal.String */ -.cython .na { color: #7D9029 } /* Name.Attribute */ +.cython .na { color: #687822 } /* Name.Attribute */ .cython .nb { color: #008000 } /* Name.Builtin */ .cython .nc { color: #0000FF; font-weight: bold } /* Name.Class */ .cython .no { color: #880000 } /* Name.Constant */ .cython .nd { color: #AA22FF } /* Name.Decorator */ -.cython .ni { color: #999999; font-weight: bold } /* Name.Entity */ -.cython .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.cython .ni { color: #717171; font-weight: bold } /* Name.Entity */ +.cython .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */ .cython .nf { color: #0000FF } /* Name.Function */ -.cython .nl { color: #A0A000 } /* Name.Label */ +.cython .nl { color: #767600 } /* Name.Label */ .cython .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ .cython .nt { color: #008000; font-weight: bold } /* Name.Tag */ .cython .nv { color: #19177C } /* Name.Variable */ @@ -346,11 +346,11 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .cython .dl { color: #BA2121 } /* Literal.String.Delimiter */ .cython .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ .cython .s2 { color: #BA2121 } /* Literal.String.Double */ -.cython .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.cython .se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */ .cython .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.cython .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.cython .si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */ .cython .sx { color: #008000 } /* Literal.String.Other */ -.cython .sr { color: #BB6688 } /* Literal.String.Regex */ +.cython .sr { color: #A45A77 } /* Literal.String.Regex */ .cython .s1 { color: #BA2121 } /* Literal.String.Single */ .cython .ss { color: #19177C } /* Literal.String.Symbol */ .cython .bp { color: #008000 } /* Name.Builtin.Pseudo */ @@ -363,7 +363,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: -

Generated by Cython 0.29.24

+

Generated by Cython 0.29.30

Yellow lines hint at Python interaction.
Click on a line that starts with a "+" to see the C code that Cython generated for it. diff --git a/PyCafeDefs_pub.html b/PyCafeDefs_pub.html index 1ada9a3..936dd50 100644 --- a/PyCafeDefs_pub.html +++ b/PyCafeDefs_pub.html @@ -1,5 +1,5 @@ - + @@ -293,22 +293,22 @@ td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .cython .hll { background-color: #ffffcc } .cython { background: #f8f8f8; } -.cython .c { color: #408080; font-style: italic } /* Comment */ +.cython .c { color: #3D7B7B; font-style: italic } /* Comment */ .cython .err { border: 1px solid #FF0000 } /* Error */ .cython .k { color: #008000; font-weight: bold } /* Keyword */ .cython .o { color: #666666 } /* Operator */ -.cython .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ -.cython .cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.cython .cp { color: #BC7A00 } /* Comment.Preproc */ -.cython .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ -.cython .c1 { color: #408080; font-style: italic } /* Comment.Single */ -.cython .cs { color: #408080; font-style: italic } /* Comment.Special */ +.cython .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */ +.cython .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */ +.cython .cp { color: #9C6500 } /* Comment.Preproc */ +.cython .cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */ +.cython .c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */ +.cython .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */ .cython .gd { color: #A00000 } /* Generic.Deleted */ .cython .ge { font-style: italic } /* Generic.Emph */ -.cython .gr { color: #FF0000 } /* Generic.Error */ +.cython .gr { color: #E40000 } /* Generic.Error */ .cython .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.cython .gi { color: #00A000 } /* Generic.Inserted */ -.cython .go { color: #888888 } /* Generic.Output */ +.cython .gi { color: #008400 } /* Generic.Inserted */ +.cython .go { color: #717171 } /* Generic.Output */ .cython .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ .cython .gs { font-weight: bold } /* Generic.Strong */ .cython .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ @@ -321,15 +321,15 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .cython .kt { color: #B00040 } /* Keyword.Type */ .cython .m { color: #666666 } /* Literal.Number */ .cython .s { color: #BA2121 } /* Literal.String */ -.cython .na { color: #7D9029 } /* Name.Attribute */ +.cython .na { color: #687822 } /* Name.Attribute */ .cython .nb { color: #008000 } /* Name.Builtin */ .cython .nc { color: #0000FF; font-weight: bold } /* Name.Class */ .cython .no { color: #880000 } /* Name.Constant */ .cython .nd { color: #AA22FF } /* Name.Decorator */ -.cython .ni { color: #999999; font-weight: bold } /* Name.Entity */ -.cython .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.cython .ni { color: #717171; font-weight: bold } /* Name.Entity */ +.cython .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */ .cython .nf { color: #0000FF } /* Name.Function */ -.cython .nl { color: #A0A000 } /* Name.Label */ +.cython .nl { color: #767600 } /* Name.Label */ .cython .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ .cython .nt { color: #008000; font-weight: bold } /* Name.Tag */ .cython .nv { color: #19177C } /* Name.Variable */ @@ -346,11 +346,11 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .cython .dl { color: #BA2121 } /* Literal.String.Delimiter */ .cython .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ .cython .s2 { color: #BA2121 } /* Literal.String.Double */ -.cython .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.cython .se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */ .cython .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.cython .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.cython .si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */ .cython .sx { color: #008000 } /* Literal.String.Other */ -.cython .sr { color: #BB6688 } /* Literal.String.Regex */ +.cython .sr { color: #A45A77 } /* Literal.String.Regex */ .cython .s1 { color: #BA2121 } /* Literal.String.Single */ .cython .ss { color: #19177C } /* Literal.String.Symbol */ .cython .bp { color: #008000 } /* Name.Builtin.Pseudo */ @@ -363,7 +363,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: -

Generated by Cython 0.29.24

+

Generated by Cython 0.29.30

Yellow lines hint at Python interaction.
Click on a line that starts with a "+" to see the C code that Cython generated for it. diff --git a/PyCafe_sls.pxd b/PyCafe_sls.pxd index b91b764..62b9171 100644 --- a/PyCafe_sls.pxd +++ b/PyCafe_sls.pxd @@ -48,6 +48,10 @@ cdef extern from "epicsMutex.h": pass +cdef extern from "epicsTime.h": + ctypedef void throwError + + cdef extern from "cadef.h": ctypedef long chtype diff --git a/build_py310_sls2.sh b/build_py310_sls2.sh new file mode 100644 index 0000000..b6f47bd --- /dev/null +++ b/build_py310_sls2.sh @@ -0,0 +1,14 @@ +module unload gcc +module load gcc/7.5.0 +rm -f PyCafeDefs.pxi +ln -s PyCafeDefs_py37.pxi PyCafeDefs.pxi +rm -f PyCafe.cpp +rm -f PyCafe.h +rm -f PyCafe.pxd +ln -s PyCafe_sls.pxd PyCafe.pxd +rm -f PyCafe.pyx +ln -s PyCafe_sls.pyx PyCafe.pyx +_EPICS_HOST_ARCH=${RHREL}-x86_64 +source /opt/gfa/python 3.10 +python setup_py38_sls2.py build_ext -b ./python3.10-sls2/lib/${_EPICS_HOST_ARCH} +cp examples.py ./python3.10-sls2/lib/${_EPICS_HOST_ARCH} diff --git a/build_py35_sls.sh b/build_py35_sls.sh index 9b01521..2d52c6c 100644 --- a/build_py35_sls.sh +++ b/build_py35_sls.sh @@ -1,5 +1,5 @@ module unload gcc -module load gcc/7.3.0 +module load gcc/6.3.0 #rm -f PyCafe.cpp #rm -f PyCafe.h #rm -f PyCafe.pxd diff --git a/build_py35_sls2.sh b/build_py35_sls2.sh index 64d79cd..a2fd561 100644 --- a/build_py35_sls2.sh +++ b/build_py35_sls2.sh @@ -1,11 +1,15 @@ module unload gcc module load gcc/7.3.0 +#rm -f PyCafeDefs.pxi +#ln -s PyCafeDefs_py35.pxi PyCafeDefs.pxi #rm -f PyCafe.cpp #rm -f PyCafe.h #rm -f PyCafe.pxd #ln -s PyCafe_sls.pxd PyCafe.pxd #rm -f PyCafe.pyx -#ln -s PyCafe_sls.pyx PyCafe.pyx +#ln -s PyCafe_sls_py35.pyx PyCafe.pyx +_EPICS_HOST_ARCH=${RHREL}-x86_64 source /opt/gfa/python 3.5 -python setup_py35_sls2.py build_ext -b ./python3.5-sls2/lib/${EPICS_HOST_ARCH} -cp examples.py ./python3.5-sls2/lib/${EPICS_HOST_ARCH} +python setup_py35_sls2.py build_ext -b ./python3.5-sls2/lib/${_EPICS_HOST_ARCH} +cp examples.py ./python3.5-sls2/lib/${_EPICS_HOST_ARCH} + diff --git a/build_py37_sf.sh b/build_py37_sf.sh index fe368d7..b9092a9 100644 --- a/build_py37_sf.sh +++ b/build_py37_sf.sh @@ -6,6 +6,7 @@ rm -f PyCafe.pxd ln -s PyCafe_sf.pxd PyCafe.pxd rm -f PyCafe.pyx ln -s PyCafe_sf.pyx PyCafe.pyx +_EPICS_HOST_ARCH=${RHREL}-x86_64 source /opt/gfa/python 3.7 -python setup_py37_sf.py build_ext -b ./python3.7-sf/lib/${EPICS_HOST_ARCH} -cp examples.py ./python3.7-sf/lib/${EPICS_HOST_ARCH} +python setup_py37_sf.py build_ext -b ./python3.7-sf/lib/${_EPICS_HOST_ARCH} +cp examples.py ./python3.7-sf/lib/${_EPICS_HOST_ARCH} diff --git a/build_py37_sls2.sh b/build_py37_sls2.sh index 67c388e..271c120 100644 --- a/build_py37_sls2.sh +++ b/build_py37_sls2.sh @@ -1,11 +1,14 @@ module unload gcc module load gcc/7.3.0 +rm -f PyCafeDefs.pxi +ln -s PyCafeDefs_py37.pxi PyCafeDefs.pxi rm -f PyCafe.cpp rm -f PyCafe.h rm -f PyCafe.pxd ln -s PyCafe_sls.pxd PyCafe.pxd rm -f PyCafe.pyx ln -s PyCafe_sls.pyx PyCafe.pyx +_EPICS_HOST_ARCH=${RHREL}-x86_64 #os.environ['EPICS_HOST_ARCH'] source /opt/gfa/python 3.7 -python setup_py37_sls2.py build_ext -b ./python3.7-sls2/lib/${EPICS_HOST_ARCH} -cp examples.py ./python3.7-sls2/lib/${EPICS_HOST_ARCH} +python setup_py37_sls2.py build_ext -b ./python3.7-sls2/lib/${_EPICS_HOST_ARCH} +cp examples.py ./python3.7-sls2/lib/${_EPICS_HOST_ARCH} diff --git a/build_py38_sls2.sh b/build_py38_sls2.sh index cb7ef01..d367129 100644 --- a/build_py38_sls2.sh +++ b/build_py38_sls2.sh @@ -1,11 +1,14 @@ module unload gcc module load gcc/7.5.0 +rm -f PyCafeDefs.pxi +ln -s PyCafeDefs_py37.pxi PyCafeDefs.pxi rm -f PyCafe.cpp rm -f PyCafe.h rm -f PyCafe.pxd ln -s PyCafe_sls.pxd PyCafe.pxd rm -f PyCafe.pyx ln -s PyCafe_sls.pyx PyCafe.pyx +_EPICS_HOST_ARCH=${RHREL}-x86_64 source /opt/gfa/python 3.8 -python setup_py38_sls2.py build_ext -b ./python3.8-sls2/lib/${EPICS_HOST_ARCH} -cp examples.py ./python3.8-sls2/lib/${EPICS_HOST_ARCH} +python setup_py38_sls2.py build_ext -b ./python3.8-sls2/lib/${_EPICS_HOST_ARCH} +cp examples.py ./python3.8-sls2/lib/${_EPICS_HOST_ARCH} diff --git a/makefile b/makefile index bb4a57b..2ef8e0f 100644 --- a/makefile +++ b/makefile @@ -5,11 +5,13 @@ ##### CHANGE AS APPROPRIATE ################# # - +_EPICS_HOST_ARCH=${RHREL}-x86_64 CAFE_CYCAFE_BASE=/opt/gfa/cafe/python/pycafe -INSTALL_PATH_PY= $(CAFE_CYCAFE_BASE)/cafe-1.18.0-gcc-7.3.0/lib/${EPICS_HOST_ARCH} -INSTALL_PATH_SF= $(CAFE_CYCAFE_BASE)/cafe-1.18.0-sf-gcc-7.3.0/lib/${EPICS_HOST_ARCH} -INSTALL_PATH_SLS2= $(CAFE_CYCAFE_BASE)/cafe-1.18.0-gcc-7.3.0/lib/${EPICS_HOST_ARCH} +INSTALL_PATH_PY= $(CAFE_CYCAFE_BASE)/cafe-1.19.3-gcc-7.3.0/lib/${_EPICS_HOST_ARCH} +INSTALL_PATH_SF= $(CAFE_CYCAFE_BASE)/cafe-1.19.3-sf-gcc-7.3.0/lib/${_EPICS_HOST_ARCH} +INSTALL_PATH_SLS2= $(CAFE_CYCAFE_BASE)/cafe-1.19.3-gcc-7.3.0/lib/${_EPICS_HOST_ARCH} +INSTALL_PATH_SLS2_PY38= $(CAFE_CYCAFE_BASE)/cafe-1.19.3-gcc-7.5.0/lib/${_EPICS_HOST_ARCH} +INSTALL_PATH_SLS2_PY310= $(CAFE_CYCAFE_BASE)/cafe-1.19.3-gcc-7.5.0/lib/${_EPICS_HOST_ARCH} ############################################# .DEFAULT_GOAL := help @@ -18,33 +20,44 @@ INSTALL_PATH_SLS2= $(CAFE_CYCAFE_BASE)/cafe-1.18.0-gcc-7.3.0/lib/${EPICS_HOST_AR help: @echo "Options for make: install_py37 install_py37_sf install_py37_sls2 install_py35 install_py35_sf" -install_py37: python3.7/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so +install_py37: python3.7/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so mkdir -p $(INSTALL_PATH_PY) - cp python3.7/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so $(INSTALL_PATH_PY) - cp python3.7/lib/${EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_PY) + cp python3.7/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so $(INSTALL_PATH_PY) + cp python3.7/lib/${_EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_PY) -install_py35: python3.5/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so +install_py35: python3.5/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so mkdir -p $(INSTALL_PATH_PY) - cp python3.5/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so $(INSTALL_PATH_PY) + cp python3.5/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so $(INSTALL_PATH_PY) -install_py37_sf: python3.7-sf/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so +install_py37_sf: python3.7-sf/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so mkdir -p $(INSTALL_PATH_SF) - cp python3.7-sf/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so $(INSTALL_PATH_SF) - cp python3.7-sf/lib/${EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SF) + cp python3.7-sf/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so $(INSTALL_PATH_SF) + cp python3.7-sf/lib/${_EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SF) -install_py35_sf: python3.5-sf/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so +install_py35_sf: python3.5-sf/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so mkdir -p $(INSTALL_PATH_SF) - cp python3.5-sf/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so $(INSTALL_PATH_SF) + cp python3.5-sf/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so $(INSTALL_PATH_SF) -install_py37_sls2: python3.7-sls2/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so - mkdir -p $(INSTALL_PATH_SLS2) - cp python3.7-sls2/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so $(INSTALL_PATH_SLS2) - cp python3.7-sls2/lib/${EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SLS2) -install_py35_sls2: python3.5-sls2/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so +install_py310_sls2: python3.10-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-310-x86_64-linux-gnu.so + mkdir -p $(INSTALL_PATH_SLS2_PY310) + cp python3.10-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-310-x86_64-linux-gnu.so $(INSTALL_PATH_SLS2_PY310) + cp python3.10-sls2/lib/${_EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SLS2_PY310) + +install_py38_sls2: python3.8-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-38-x86_64-linux-gnu.so + mkdir -p $(INSTALL_PATH_SLS2_PY38) + cp python3.8-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-38-x86_64-linux-gnu.so $(INSTALL_PATH_SLS2_PY38) + cp python3.8-sls2/lib/${_EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SLS2_PY38) + +install_py37_sls2: python3.7-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so mkdir -p $(INSTALL_PATH_SLS2) - cp python3.5-sls2/lib/${EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so $(INSTALL_PATH_SLS2) - cp python3.5-sls2/lib/${EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SLS2) + cp python3.7-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-37m-x86_64-linux-gnu.so $(INSTALL_PATH_SLS2) + cp python3.7-sls2/lib/${_EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SLS2) + +install_py35_sls2: python3.5-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so + mkdir -p $(INSTALL_PATH_SLS2) + cp python3.5-sls2/lib/${_EPICS_HOST_ARCH}/PyCafe.cpython-35m-x86_64-linux-gnu.so $(INSTALL_PATH_SLS2) + cp python3.5-sls2/lib/${_EPICS_HOST_ARCH}/examples.py $(INSTALL_PATH_SLS2) clean: rm -f *.o diff --git a/setup_py310_sls2.py b/setup_py310_sls2.py new file mode 100644 index 0000000..96d7726 --- /dev/null +++ b/setup_py310_sls2.py @@ -0,0 +1,53 @@ +import os +import sys +from distutils.core import setup +from distutils.extension import Extension +from Cython.Compiler.Main import default_options +default_options['emit_linenums'] = True +from Cython.Build import cythonize +from numpy import get_include + +_GCC_VERSION='7.5.0' +_CAFE_VERSION='1.19.3-py310-gcc-' + _GCC_VERSION +_EPICS_VERSION='7.0.7' +_EPICS_HOST_ARCH =os.environ['RHREL'] + '-x86_64' + +setup( + ext_modules = cythonize([Extension('PyCafe',['PyCafe.pyx'], + language="c++", + include_dirs=[ '/opt/gfa/python-3.10/latest/include/python3.10', + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/include', + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/include/os/Linux', + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/include/compiler/gcc', + '/opt/gfa/cafe/boost/boost_1_61_0/include', + '/opt/gfa/cafe/boost/boost_1_61_0/include/boost', + '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + + '/include', + '.', get_include()], + library_dirs=[ os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/lib/' + + _EPICS_HOST_ARCH, + '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + + '/lib/' + _EPICS_HOST_ARCH, + os.environ['PSI_PREFIX'] + '/Programming/gcc/' + _GCC_VERSION + '/lib64', + os.environ['PSI_PREFIX'] + '/Programming/gcc/' + _GCC_VERSION + '/lib', + '/opt/gfa/python-3.10/latest/lib' + ], + runtime_library_dirs=[ + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/lib/' + + _EPICS_HOST_ARCH, + '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + + '/lib/' + _EPICS_HOST_ARCH, + os.environ['PSI_PREFIX'] + '/Programming/gcc/' + _GCC_VERSION + '/lib64', + os.environ['PSI_PREFIX'] + '/Programming/gcc/' + _GCC_VERSION + '/lib' + ], + libraries=['ca','Com','dl','cafe', 'Qt5Xml', 'Qt5Core']) + ], annotate=True, + compiler_directives={'embedsignature': False, 'language_level': 3, + 'c_string_type': 'str', 'c_string_encoding' : 'ascii', + 'py2_import': False, 'warn.unreachable': False, + 'remove_unreachable': False}, + compile_time_env={'PY_VERSION_HEX':sys.hexversion, + 'PY_EXT_C': True, 'BS_CAFE': False, + 'CAFE_VERSION': _CAFE_VERSION, 'EPICS_VERSION': _EPICS_VERSION } + ) + ) diff --git a/setup_py35_sls.py b/setup_py35_sls.py index c539323..8be24dd 100644 --- a/setup_py35_sls.py +++ b/setup_py35_sls.py @@ -10,7 +10,7 @@ from numpy import get_include _GCC_VERSION='7.3.0' _CAFE_VERSION='1.16.0-epics3-py35-gcc-' + _GCC_VERSION _EPICS_VERSION='3.14.12' -_EPICS_HOST_ARCH = os.environ['EPICS_HOST_ARCH'] #'SL6-x86_64' #os.environ['EPICS_HOST_ARCH'] +_EPICS_HOST_ARCH=os.environ['RHREL'] +'-x86_64' #os.environ['EPICS_HOST_ARCH'] #'SL6-x86_64' setup( ext_modules = cythonize([Extension('PyCafe',['PyCafe.pyx'], diff --git a/setup_py35_sls2.py b/setup_py35_sls2.py index 1184ba7..620a9c3 100644 --- a/setup_py35_sls2.py +++ b/setup_py35_sls2.py @@ -8,9 +8,9 @@ from Cython.Build import cythonize from numpy import get_include _GCC_VERSION='7.3.0' -_CAFE_VERSION='1.16.0-py35-gcc-' + _GCC_VERSION -_EPICS_VERSION='7.0.6' -_EPICS_HOST_ARCH ='RHEL7-x86_64' #os.environ['EPICS_HOST_ARCH'] +_CAFE_VERSION='1.19.3-py35-gcc-' + _GCC_VERSION +_EPICS_VERSION='7.0.7' +_EPICS_HOST_ARCH=os.environ['RHREL'] +'-x86_64' #os.environ['EPICS_HOST_ARCH'] setup( ext_modules = cythonize([Extension('PyCafe',['PyCafe.pyx'], @@ -29,8 +29,7 @@ setup( '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + '/lib/' + _EPICS_HOST_ARCH, os.environ['PSI_PREFIX'] + '/Programming/gcc/' + _GCC_VERSION + '/lib64', - os.environ['PSI_PREFIX'] + '/Programming/gcc/' + _GCC_VERSION + '/lib', - '/opt/gfa/python-3.5/latest/lib' + os.environ['PSI_PREFIX'] + '/Programming/gcc/' + _GCC_VERSION + '/lib' ], runtime_library_dirs=[ os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/lib/' diff --git a/setup_py37_sf.py b/setup_py37_sf.py index f125791..0cc02ae 100644 --- a/setup_py37_sf.py +++ b/setup_py37_sf.py @@ -7,44 +7,49 @@ default_options['emit_linenums'] = True from Cython.Build import cythonize from numpy import get_include - -_CAFE_VERSION='1.14.5' -_EPICS_VERSION='3.14.12' +_GCC_VERSION='7.3.0' +_CAFE_VERSION='1.19.3-sf-py37-gcc-' + _GCC_VERSION +_EPICS_VERSION='7.0.6' +_EPICS_HOST_ARCH =os.environ['RHREL'] + '-x86_64' setup( ext_modules = cythonize([Extension('PyCafe',['PyCafe.pyx'], language="c++", include_dirs=[ '/opt/gfa/python-3.7/latest/include/python3.7m', - os.environ['EPICS'] + '/base/include', - os.environ['EPICS'] + '/base/include/os/Linux', + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/include', + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/include/os/Linux', + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/include/compiler/gcc', '/opt/gfa/cafe/boost/boost_1_61_0/include', '/opt/gfa/cafe/boost/boost_1_61_0/include/boost', '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + - '-sf-py37-gcc-7.3.0/include', + '/include', '/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0/include', '/opt/gfa/zmq/curl-7.54.1/include', '/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/include', '.', get_include()], - library_dirs=[ os.environ['EPICS'] + '/base/lib/' + os.environ['EPICS_HOST_ARCH'], + library_dirs=[ os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/lib/' + + _EPICS_HOST_ARCH, '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + - '-sf-py37-gcc-7.3.0/lib/' + os.environ['EPICS_HOST_ARCH'], + '/lib/' + _EPICS_HOST_ARCH, '/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0/lib', '/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/libs/linux-gcc-6.3.0', '/opt/gfa/zmq/curl-7.54.1/lib', '/opt/gfa/python-3.7/latest/lib', os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib64', - os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib' + os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib', + '/opt/gfa/python-3.7/latest/lib' ], runtime_library_dirs=[ - os.environ['EPICS'] + '/base/lib/' + os.environ['EPICS_HOST_ARCH'], - '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + - '-sf-py37-gcc-7.3.0/lib/' + os.environ['EPICS_HOST_ARCH'], - '/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0/lib', - '/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/libs/linux-gcc-6.3.0', - '/opt/gfa/zmq/curl-7.54.1/lib', - '/opt/gfa/python-3.7/latest/lib', - os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib64', - os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib' + os.environ['EPICS'] + '/base-' + _EPICS_VERSION + '/lib/' + + _EPICS_HOST_ARCH, + '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + + '/lib/' + _EPICS_HOST_ARCH, + '/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0/lib', + '/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/libs/linux-gcc-6.3.0', + '/opt/gfa/zmq/curl-7.54.1/lib', + '/opt/gfa/python-3.7/latest/lib', + os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib64', + os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib' ], libraries=['ca','Com','dl','cafe']) ], annotate=True, diff --git a/setup_py37_sf_epics3.py b/setup_py37_sf_epics3.py new file mode 100644 index 0000000..f125791 --- /dev/null +++ b/setup_py37_sf_epics3.py @@ -0,0 +1,60 @@ +import os +import sys +from distutils.core import setup +from distutils.extension import Extension +from Cython.Compiler.Main import default_options +default_options['emit_linenums'] = True +from Cython.Build import cythonize +from numpy import get_include + + +_CAFE_VERSION='1.14.5' +_EPICS_VERSION='3.14.12' + +setup( + ext_modules = cythonize([Extension('PyCafe',['PyCafe.pyx'], + language="c++", + include_dirs=[ '/opt/gfa/python-3.7/latest/include/python3.7m', + os.environ['EPICS'] + '/base/include', + os.environ['EPICS'] + '/base/include/os/Linux', + '/opt/gfa/cafe/boost/boost_1_61_0/include', + '/opt/gfa/cafe/boost/boost_1_61_0/include/boost', + '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + + '-sf-py37-gcc-7.3.0/include', + '/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0/include', + '/opt/gfa/zmq/curl-7.54.1/include', + '/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/include', + '.', get_include()], + library_dirs=[ os.environ['EPICS'] + '/base/lib/' + os.environ['EPICS_HOST_ARCH'], + '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + + '-sf-py37-gcc-7.3.0/lib/' + os.environ['EPICS_HOST_ARCH'], + '/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0/lib', + '/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/libs/linux-gcc-6.3.0', + '/opt/gfa/zmq/curl-7.54.1/lib', + '/opt/gfa/python-3.7/latest/lib', + os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib64', + os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib' + ], + runtime_library_dirs=[ + os.environ['EPICS'] + '/base/lib/' + os.environ['EPICS_HOST_ARCH'], + '/opt/gfa/cafe/cpp/cafe-' + _CAFE_VERSION + + '-sf-py37-gcc-7.3.0/lib/' + os.environ['EPICS_HOST_ARCH'], + '/opt/gfa/zmq/zeromq-4.2.3-gcc-6.3.0/lib', + '/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/libs/linux-gcc-6.3.0', + '/opt/gfa/zmq/curl-7.54.1/lib', + '/opt/gfa/python-3.7/latest/lib', + os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib64', + os.environ['PSI_PREFIX'] + '/Programming/gcc/7.3.0/lib' + ], + libraries=['ca','Com','dl','cafe']) + ], annotate=True, + compiler_directives={'embedsignature': False, 'language_level': 3, + 'c_string_type': 'str', 'c_string_encoding' : 'ascii', + 'py2_import': False, 'warn.unreachable': False, + 'remove_unreachable': False}, + compile_time_env={'PY_VERSION_HEX':sys.hexversion, + 'PY_EXT_C': True, 'BS_CAFE': True, + 'CAFE_VERSION': _CAFE_VERSION, + 'EPICS_VERSION': _EPICS_VERSION} + ) + ) diff --git a/setup_py37_sls2.py b/setup_py37_sls2.py index 4a8bc32..934d54e 100644 --- a/setup_py37_sls2.py +++ b/setup_py37_sls2.py @@ -8,9 +8,9 @@ from Cython.Build import cythonize from numpy import get_include _GCC_VERSION='7.3.0' -_CAFE_VERSION='1.18.0-py37-gcc-' + _GCC_VERSION +_CAFE_VERSION='1.19.3-py37-gcc-' + _GCC_VERSION _EPICS_VERSION='7.0.6' -_EPICS_HOST_ARCH ='RHEL7-x86_64' #os.environ['EPICS_HOST_ARCH'] +_EPICS_HOST_ARCH =os.environ['RHREL'] + '-x86_64' #os.environ['EPICS_HOST_ARCH'] setup( ext_modules = cythonize([Extension('PyCafe',['PyCafe.pyx'], diff --git a/setup_py38_sls2.py b/setup_py38_sls2.py index a84da83..cef91ab 100644 --- a/setup_py38_sls2.py +++ b/setup_py38_sls2.py @@ -8,9 +8,9 @@ from Cython.Build import cythonize from numpy import get_include _GCC_VERSION='7.5.0' -_CAFE_VERSION='1.19.0-py38-gcc-' + _GCC_VERSION -_EPICS_VERSION='7.0.6' -_EPICS_HOST_ARCH ='RHEL7-x86_64' +_CAFE_VERSION='1.19.3-py38-gcc-' + _GCC_VERSION +_EPICS_VERSION='7.0.7' +_EPICS_HOST_ARCH =os.environ['RHREL'] + '-x86_64' setup( ext_modules = cythonize([Extension('PyCafe',['PyCafe.pyx'],