diff --git a/conda/rattler_setup/recipe.yaml b/conda/rattler_setup/recipe.yaml index 7125f26..2375d20 100644 --- a/conda/rattler_setup/recipe.yaml +++ b/conda/rattler_setup/recipe.yaml @@ -1,7 +1,7 @@ # recipe file for use by rattler-config in building conda packages for pyimfit context: - version: 0.13.1 + version: 0.13.2 package: name: pyimfit diff --git a/howto_new_distribution.txt b/howto_new_distribution.txt index 7574707..2c762fc 100644 --- a/howto_new_distribution.txt +++ b/howto_new_distribution.txt @@ -67,10 +67,11 @@ Working by default in ~/coding/pyimfit on Mac. 9. Test installation via pip -10. Generate conda packages on Mac +10. Generate conda packages on Intel Mac A. cd conda B. Update rattler_setup/recipe.yaml file [e.g., update version number] - C. + C. rattler-build build --recipe ./rattler_setup --variant-config ./rattler_setup/variant_config.yaml + D. 11. Generate conda packages on Linux VM A. [vm] cd /home/vagrant/build/pyimfit diff --git a/pyimfit/pyimfit_lib.cpp b/pyimfit/pyimfit_lib.cpp index e62e562..7e0f4ad 100644 --- a/pyimfit/pyimfit_lib.cpp +++ b/pyimfit/pyimfit_lib.cpp @@ -15,11 +15,11 @@ "/Users/erwin/coding/pyimfit/libimfit/include/psf_oversampling_info.h", "/Users/erwin/coding/pyimfit/libimfit/include/solver_results.h", "/Users/erwin/coding/pyimfit/libimfit/include/statistics.h", - "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/arrayobject.h", - "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/arrayscalars.h", - "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/ndarrayobject.h", - "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/ndarraytypes.h", - "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/ufuncobject.h" + "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/arrayobject.h", + "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/arrayscalars.h", + "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/ndarrayobject.h", + "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/ndarraytypes.h", + "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/core/include/numpy/ufuncobject.h" ], "extra_compile_args": [ "-Xpreprocessor", @@ -32,20 +32,22 @@ "-Xlinker", "-w" ], + "extra_objects": [ + "/usr/local/lib/libgsl.a", + "/usr/local/lib/libgslcblas.a", + "/usr/local/lib/libfftw3.a", + "/usr/local/lib/libfftw3_threads.a", + "/usr/local/lib/libnlopt.a" + ], "include_dirs": [ "/Users/erwin/coding/pyimfit/libimfit/include", ".", "/Users/erwin/coding/pyimfit/extra_libs/include", - "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/core/include" + "/private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/core/include" ], "language": "c++", "libraries": [ "imfit", - "gsl", - "gslcblas", - "nlopt", - "fftw3", - "fftw3_threads", "omp" ], "library_dirs": [ @@ -1753,7 +1755,7 @@ typedef struct { /* #### Code section: numeric_typedefs ### */ -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":730 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":730 * # in Cython to enable them only on the right systems. * * ctypedef npy_int8 int8_t # <<<<<<<<<<<<<< @@ -1762,7 +1764,7 @@ typedef struct { */ typedef npy_int8 __pyx_t_5numpy_int8_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":731 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":731 * * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t # <<<<<<<<<<<<<< @@ -1771,7 +1773,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t; */ typedef npy_int16 __pyx_t_5numpy_int16_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":732 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":732 * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t # <<<<<<<<<<<<<< @@ -1780,7 +1782,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t; */ typedef npy_int32 __pyx_t_5numpy_int32_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":733 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":733 * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t * ctypedef npy_int64 int64_t # <<<<<<<<<<<<<< @@ -1789,7 +1791,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t; */ typedef npy_int64 __pyx_t_5numpy_int64_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":737 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":737 * #ctypedef npy_int128 int128_t * * ctypedef npy_uint8 uint8_t # <<<<<<<<<<<<<< @@ -1798,7 +1800,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t; */ typedef npy_uint8 __pyx_t_5numpy_uint8_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":738 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":738 * * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t # <<<<<<<<<<<<<< @@ -1807,7 +1809,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t; */ typedef npy_uint16 __pyx_t_5numpy_uint16_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":739 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":739 * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t # <<<<<<<<<<<<<< @@ -1816,7 +1818,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t; */ typedef npy_uint32 __pyx_t_5numpy_uint32_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":740 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":740 * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t * ctypedef npy_uint64 uint64_t # <<<<<<<<<<<<<< @@ -1825,7 +1827,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t; */ typedef npy_uint64 __pyx_t_5numpy_uint64_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":744 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":744 * #ctypedef npy_uint128 uint128_t * * ctypedef npy_float32 float32_t # <<<<<<<<<<<<<< @@ -1834,7 +1836,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t; */ typedef npy_float32 __pyx_t_5numpy_float32_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":745 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":745 * * ctypedef npy_float32 float32_t * ctypedef npy_float64 float64_t # <<<<<<<<<<<<<< @@ -1843,7 +1845,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t; */ typedef npy_float64 __pyx_t_5numpy_float64_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":754 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":754 * # The int types are mapped a bit surprising -- * # numpy.int corresponds to 'l' and numpy.long to 'q' * ctypedef npy_long int_t # <<<<<<<<<<<<<< @@ -1852,7 +1854,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t; */ typedef npy_long __pyx_t_5numpy_int_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":755 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":755 * # numpy.int corresponds to 'l' and numpy.long to 'q' * ctypedef npy_long int_t * ctypedef npy_longlong longlong_t # <<<<<<<<<<<<<< @@ -1861,7 +1863,7 @@ typedef npy_long __pyx_t_5numpy_int_t; */ typedef npy_longlong __pyx_t_5numpy_longlong_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":757 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":757 * ctypedef npy_longlong longlong_t * * ctypedef npy_ulong uint_t # <<<<<<<<<<<<<< @@ -1870,7 +1872,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t; */ typedef npy_ulong __pyx_t_5numpy_uint_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":758 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":758 * * ctypedef npy_ulong uint_t * ctypedef npy_ulonglong ulonglong_t # <<<<<<<<<<<<<< @@ -1879,7 +1881,7 @@ typedef npy_ulong __pyx_t_5numpy_uint_t; */ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":760 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":760 * ctypedef npy_ulonglong ulonglong_t * * ctypedef npy_intp intp_t # <<<<<<<<<<<<<< @@ -1888,7 +1890,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; */ typedef npy_intp __pyx_t_5numpy_intp_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":761 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":761 * * ctypedef npy_intp intp_t * ctypedef npy_uintp uintp_t # <<<<<<<<<<<<<< @@ -1897,7 +1899,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t; */ typedef npy_uintp __pyx_t_5numpy_uintp_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":763 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":763 * ctypedef npy_uintp uintp_t * * ctypedef npy_double float_t # <<<<<<<<<<<<<< @@ -1906,7 +1908,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t; */ typedef npy_double __pyx_t_5numpy_float_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":764 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":764 * * ctypedef npy_double float_t * ctypedef npy_double double_t # <<<<<<<<<<<<<< @@ -1915,7 +1917,7 @@ typedef npy_double __pyx_t_5numpy_float_t; */ typedef npy_double __pyx_t_5numpy_double_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":765 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":765 * ctypedef npy_double float_t * ctypedef npy_double double_t * ctypedef npy_longdouble longdouble_t # <<<<<<<<<<<<<< @@ -1958,7 +1960,7 @@ struct __pyx_MemviewEnum_obj; struct __pyx_memoryview_obj; struct __pyx_memoryviewslice_obj; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":767 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":767 * ctypedef npy_longdouble longdouble_t * * ctypedef npy_cfloat cfloat_t # <<<<<<<<<<<<<< @@ -1967,7 +1969,7 @@ struct __pyx_memoryviewslice_obj; */ typedef npy_cfloat __pyx_t_5numpy_cfloat_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":768 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":768 * * ctypedef npy_cfloat cfloat_t * ctypedef npy_cdouble cdouble_t # <<<<<<<<<<<<<< @@ -1976,7 +1978,7 @@ typedef npy_cfloat __pyx_t_5numpy_cfloat_t; */ typedef npy_cdouble __pyx_t_5numpy_cdouble_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":769 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":769 * ctypedef npy_cfloat cfloat_t * ctypedef npy_cdouble cdouble_t * ctypedef npy_clongdouble clongdouble_t # <<<<<<<<<<<<<< @@ -1985,7 +1987,7 @@ typedef npy_cdouble __pyx_t_5numpy_cdouble_t; */ typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t; -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":771 * ctypedef npy_clongdouble clongdouble_t * * ctypedef npy_cdouble complex_t # <<<<<<<<<<<<<< @@ -20793,7 +20795,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":245 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":245 * * @property * cdef inline PyObject* base(self) nogil: # <<<<<<<<<<<<<< @@ -20804,7 +20806,7 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) { PyObject *__pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":248 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":248 * """Returns a borrowed reference to the object owning the data/memory. * """ * return PyArray_BASE(self) # <<<<<<<<<<<<<< @@ -20814,7 +20816,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject __pyx_r = PyArray_BASE(__pyx_v_self); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":245 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":245 * * @property * cdef inline PyObject* base(self) nogil: # <<<<<<<<<<<<<< @@ -20827,7 +20829,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":251 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":251 * * @property * cdef inline dtype descr(self): # <<<<<<<<<<<<<< @@ -20841,7 +20843,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray PyArray_Descr *__pyx_t_1; __Pyx_RefNannySetupContext("descr", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":254 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":254 * """Returns an owned reference to the dtype of the array. * """ * return PyArray_DESCR(self) # <<<<<<<<<<<<<< @@ -20854,7 +20856,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray __pyx_r = ((PyArray_Descr *)__pyx_t_1); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":251 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":251 * * @property * cdef inline dtype descr(self): # <<<<<<<<<<<<<< @@ -20869,7 +20871,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":257 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":257 * * @property * cdef inline int ndim(self) nogil: # <<<<<<<<<<<<<< @@ -20880,7 +20882,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) { int __pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":260 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":260 * """Returns the number of dimensions in the array. * """ * return PyArray_NDIM(self) # <<<<<<<<<<<<<< @@ -20890,7 +20892,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx __pyx_r = PyArray_NDIM(__pyx_v_self); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":257 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":257 * * @property * cdef inline int ndim(self) nogil: # <<<<<<<<<<<<<< @@ -20903,7 +20905,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":263 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":263 * * @property * cdef inline npy_intp *shape(self) nogil: # <<<<<<<<<<<<<< @@ -20914,7 +20916,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) { npy_intp *__pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":268 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":268 * Can return NULL for 0-dimensional arrays. * """ * return PyArray_DIMS(self) # <<<<<<<<<<<<<< @@ -20924,7 +20926,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec __pyx_r = PyArray_DIMS(__pyx_v_self); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":263 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":263 * * @property * cdef inline npy_intp *shape(self) nogil: # <<<<<<<<<<<<<< @@ -20937,7 +20939,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":271 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":271 * * @property * cdef inline npy_intp *strides(self) nogil: # <<<<<<<<<<<<<< @@ -20948,7 +20950,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) { npy_intp *__pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":275 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":275 * The number of elements matches the number of dimensions of the array (ndim). * """ * return PyArray_STRIDES(self) # <<<<<<<<<<<<<< @@ -20958,7 +20960,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO __pyx_r = PyArray_STRIDES(__pyx_v_self); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":271 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":271 * * @property * cdef inline npy_intp *strides(self) nogil: # <<<<<<<<<<<<<< @@ -20971,7 +20973,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":278 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":278 * * @property * cdef inline npy_intp size(self) nogil: # <<<<<<<<<<<<<< @@ -20982,7 +20984,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) { npy_intp __pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":281 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":281 * """Returns the total size (in number of elements) of the array. * """ * return PyArray_SIZE(self) # <<<<<<<<<<<<<< @@ -20992,7 +20994,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject * __pyx_r = PyArray_SIZE(__pyx_v_self); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":278 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":278 * * @property * cdef inline npy_intp size(self) nogil: # <<<<<<<<<<<<<< @@ -21005,7 +21007,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject * return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":284 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":284 * * @property * cdef inline char* data(self) nogil: # <<<<<<<<<<<<<< @@ -21016,7 +21018,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject * static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) { char *__pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":290 * of `PyArray_DATA()` instead, which returns a 'void*'. * """ * return PyArray_BYTES(self) # <<<<<<<<<<<<<< @@ -21026,7 +21028,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p __pyx_r = PyArray_BYTES(__pyx_v_self); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":284 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":284 * * @property * cdef inline char* data(self) nogil: # <<<<<<<<<<<<<< @@ -21039,7 +21041,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -21056,7 +21058,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":774 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":774 * * cdef inline object PyArray_MultiIterNew1(a): * return PyArray_MultiIterNew(1, a) # <<<<<<<<<<<<<< @@ -21070,7 +21072,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":773 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -21089,7 +21091,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":776 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":776 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -21106,7 +21108,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":777 * * cdef inline object PyArray_MultiIterNew2(a, b): * return PyArray_MultiIterNew(2, a, b) # <<<<<<<<<<<<<< @@ -21120,7 +21122,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":776 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":776 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -21139,7 +21141,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -21156,7 +21158,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":780 * * cdef inline object PyArray_MultiIterNew3(a, b, c): * return PyArray_MultiIterNew(3, a, b, c) # <<<<<<<<<<<<<< @@ -21170,7 +21172,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":779 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -21189,7 +21191,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":782 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":782 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -21206,7 +21208,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":783 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":783 * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): * return PyArray_MultiIterNew(4, a, b, c, d) # <<<<<<<<<<<<<< @@ -21220,7 +21222,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":782 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":782 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -21239,7 +21241,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -21256,7 +21258,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":786 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":786 * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): * return PyArray_MultiIterNew(5, a, b, c, d, e) # <<<<<<<<<<<<<< @@ -21270,7 +21272,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":785 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -21289,7 +21291,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":788 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":788 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -21303,7 +21305,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ int __pyx_t_1; __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":789 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":789 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -21313,7 +21315,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d); if (__pyx_t_1) { - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":790 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":790 * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): * return d.subarray.shape # <<<<<<<<<<<<<< @@ -21325,7 +21327,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":789 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":789 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -21334,7 +21336,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ */ } - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":792 * return d.subarray.shape * else: * return () # <<<<<<<<<<<<<< @@ -21348,7 +21350,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ goto __pyx_L0; } - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":788 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":788 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -21363,7 +21365,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":968 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":968 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -21377,7 +21379,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a const char *__pyx_filename = NULL; int __pyx_clineno = 0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":969 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":969 * * cdef inline void set_array_base(ndarray arr, object base): * Py_INCREF(base) # important to do this before stealing the reference below! # <<<<<<<<<<<<<< @@ -21386,7 +21388,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ Py_INCREF(__pyx_v_base); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":970 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":970 * 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) # <<<<<<<<<<<<<< @@ -21395,7 +21397,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(2, 970, __pyx_L1_error) - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":968 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":968 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -21410,7 +21412,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __pyx_L0:; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":972 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":972 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -21425,7 +21427,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py int __pyx_t_1; __Pyx_RefNannySetupContext("get_array_base", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":973 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":973 * * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) # <<<<<<<<<<<<<< @@ -21434,7 +21436,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ __pyx_v_base = PyArray_BASE(__pyx_v_arr); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":974 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":974 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -21444,7 +21446,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_t_1 = (__pyx_v_base == NULL); if (__pyx_t_1) { - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":975 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":975 * base = PyArray_BASE(arr) * if base is NULL: * return None # <<<<<<<<<<<<<< @@ -21455,7 +21457,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":974 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":974 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -21464,7 +21466,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ } - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":976 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":976 * if base is NULL: * return None * return base # <<<<<<<<<<<<<< @@ -21476,7 +21478,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = ((PyObject *)__pyx_v_base); goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":972 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":972 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -21491,7 +21493,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":980 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":980 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -21515,7 +21517,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_array", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":981 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":981 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -21531,7 +21533,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":982 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":982 * cdef inline int import_array() except -1: * try: * __pyx_import_array() # <<<<<<<<<<<<<< @@ -21540,7 +21542,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { */ __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 982, __pyx_L3_error) - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":981 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":981 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -21554,7 +21556,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":983 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":983 * try: * __pyx_import_array() * except Exception: # <<<<<<<<<<<<<< @@ -21569,7 +21571,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":984 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":984 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -21584,7 +21586,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { } goto __pyx_L5_except_error; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":981 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":981 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -21600,7 +21602,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_L8_try_end:; } - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":980 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":980 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -21623,7 +21625,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":986 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":986 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -21647,7 +21649,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_umath", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":987 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":987 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -21663,7 +21665,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":988 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":988 * cdef inline int import_umath() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -21672,7 +21674,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 988, __pyx_L3_error) - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":987 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":987 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -21686,7 +21688,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":989 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":989 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -21701,7 +21703,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":990 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":990 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -21716,7 +21718,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { } goto __pyx_L5_except_error; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":987 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":987 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -21732,7 +21734,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_L8_try_end:; } - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":986 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":986 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -21755,7 +21757,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":992 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":992 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -21779,7 +21781,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_ufunc", 1); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":993 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":993 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -21795,7 +21797,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":994 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":994 * cdef inline int import_ufunc() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -21804,7 +21806,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(2, 994, __pyx_L3_error) - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":993 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":993 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -21818,7 +21820,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":995 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":995 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -21833,7 +21835,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_6); __Pyx_XGOTREF(__pyx_t_7); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":996 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":996 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -21848,7 +21850,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { } goto __pyx_L5_except_error; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":993 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":993 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -21864,7 +21866,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_L8_try_end:; } - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":992 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":992 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -21887,7 +21889,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":999 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":999 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -21898,7 +21900,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) { int __pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1011 * bool * """ * return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<< @@ -21908,7 +21910,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; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":999 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":999 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -21921,7 +21923,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -21932,7 +21934,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) { int __pyx_r; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1026 * bool * """ * return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<< @@ -21942,7 +21944,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; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1014 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -21955,7 +21957,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -21966,7 +21968,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; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1036 * also needed. That can be found using `get_datetime64_unit`. * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -21976,7 +21978,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1029 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -21989,7 +21991,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1039 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1039 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -22000,7 +22002,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; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1043 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1043 * returns the int64 value underlying scalar numpy timedelta64 object * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -22010,7 +22012,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1039 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1039 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -22023,7 +22025,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject return __pyx_r; } -/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1046 +/* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1046 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -22034,7 +22036,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; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1050 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1050 * returns the unit part of the dtype for a numpy datetime64 object. * """ * return (obj).obmeta.base # <<<<<<<<<<<<<< @@ -22042,7 +22044,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; - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1046 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":1046 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -35134,7 +35136,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple__8); __Pyx_GIVEREF(__pyx_tuple__8); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":984 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":984 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -35145,7 +35147,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple__9); __Pyx_GIVEREF(__pyx_tuple__9); - /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-nfn5_hz_/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":990 + /* "../../../../private/var/folders/rj/3r6_hsl93l737byvn_vy_tmm0000gp/T/pip-build-env-rq42y61t/overlay/lib/python3.12/site-packages/numpy/__init__.cython-30.pxd":990 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< diff --git a/setup.py b/setup.py index 00a2308..9a8211c 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # For development work, execute this via: -# $ python3 setup.py develop -# OR # $ pip3 install -e . +# OR +# $ python3 -m pip install -e . # # To generate source distribution # $ python3 setup.py sdist @@ -174,9 +174,20 @@ def check_gcc_version( compilerName="gcc", getVersionNum=False ): # kludge: assume dynamic library versions of FFTW3, GSL, etc. are in Homebrew # /opt/homebrew/lib location (arm64 version of Homebrew) libPath.append(HOMEBREW_LIB_PATH_ARM) + MAC_STATIC_LIBRARY_PATH = "/opt/homebrew/lib/" +elif MACOS_PROCESSOR == "i386": + MAC_STATIC_LIBRARY_PATH = "/usr/local/lib/" # Note two versions of NLopt library ("nlopt_cxx" is for case of version with extra C++ # interfaces (e.g., CentOS package) -libraryList = ["imfit", "gsl", "gslcblas", "nlopt", "fftw3", "fftw3_threads"] +# If we're compiling on Mac, force use of static libraries for GSL, FFTW3, NLOPT; +# if Linux, then for now stick with dynamic linking +if MACOS_COMPILATION: + libraryList = ["imfit"] # OK, since there's no dynamic-library version of libimfit to confuse the linker + staticLibraries = [MAC_STATIC_LIBRARY_PATH + libname for libname in + ["libgsl.a", "libgslcblas.a", "libfftw3.a", "libfftw3_threads.a", "libnlopt.a"]] +else: # Linux + libraryList = ["imfit", "gsl", "gslcblas", "nlopt", "fftw3", "fftw3_threads"] + staticLibraries = None if MACOS_COMPILATION and (compilerName == "clang++"): libraryList.append("omp") @@ -266,7 +277,7 @@ def run(self): Extension(SRC_DIR + ".pyimfit_lib", # [= pyimfit.pyimfit_lib] = base name for .so file # (e.g., pyimfit_lib.cpython-312m-darwin.so) [SRC_DIR + "/pyimfit_lib" + ext], # source code files - libraries=libraryList, + libraries=libraryList, extra_objects=staticLibraries, include_dirs=headerPath, library_dirs=libPath, extra_compile_args=extraCompileArgs,