forked from pool/mayavi
* This is a bugfix release to work correctly with traitsui-8,
Python-3.12, VTK-9.3 and above, and PyQt6. 18 PRs were merged.
* Port changes from upstream QVTKRenderWindowInteractor.
* ENH: Add support for PyQt6
* Fix bug with latest VTK
* Improve compatibility with traitsui 8
* Fix issue with `mlab.process_ui_events`
* ENH: Add support for Python 3.11
* Just exclude the zip file so the sdist does not ship it. This
way the file on pypi is much smaller.
- Unpin numpy 2
* add mayavi-pr1303-cython-np2.patch gh#enthought/mayavi#1303
* add mayavi-pr1315-np2tests.patch gh#enthought/mayavi#1315
- Drop patches merged upstream
* mayavi-pr1290-vtk-9.3.patch
* python-311-support.patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/mayavi?expand=0&rev=21
6477 lines
270 KiB
Diff
6477 lines
270 KiB
Diff
diff -urNP mayavi-4.8.1.current/tvtk/src/array_ext.c mayavi-4.8.1/tvtk/src/array_ext.c
|
|
--- mayavi-4.8.1.current/tvtk/src/array_ext.c 2016-08-02 05:02:36.000000000 +1000
|
|
+++ mayavi-4.8.1/tvtk/src/array_ext.c 2023-03-21 14:33:42.842593221 +1100
|
|
@@ -1,16 +1,21 @@
|
|
-/* Generated by Cython 0.14.1 on Sun Feb 13 21:50:50 2011 */
|
|
+/* Generated by Cython 0.29.32 */
|
|
|
|
+#ifndef PY_SSIZE_T_CLEAN
|
|
#define PY_SSIZE_T_CLEAN
|
|
+#endif /* PY_SSIZE_T_CLEAN */
|
|
#include "Python.h"
|
|
#ifndef Py_PYTHON_H
|
|
#error Python headers needed to compile C extensions, please install development version of Python.
|
|
+#elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000)
|
|
+ #error Cython requires Python 2.6+ or Python 3.3+.
|
|
#else
|
|
-
|
|
-#include <stddef.h> /* For offsetof */
|
|
+#define CYTHON_ABI "0_29_32"
|
|
+#define CYTHON_HEX_VERSION 0x001D20F0
|
|
+#define CYTHON_FUTURE_DIVISION 1
|
|
+#include <stddef.h>
|
|
#ifndef offsetof
|
|
-#define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
|
|
+ #define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
|
|
#endif
|
|
-
|
|
#if !defined(WIN32) && !defined(MS_WINDOWS)
|
|
#ifndef __stdcall
|
|
#define __stdcall
|
|
@@ -22,122 +27,627 @@
|
|
#define __fastcall
|
|
#endif
|
|
#endif
|
|
-
|
|
#ifndef DL_IMPORT
|
|
#define DL_IMPORT(t) t
|
|
#endif
|
|
#ifndef DL_EXPORT
|
|
#define DL_EXPORT(t) t
|
|
#endif
|
|
-
|
|
+#define __PYX_COMMA ,
|
|
+#ifndef HAVE_LONG_LONG
|
|
+ #if PY_VERSION_HEX >= 0x02070000
|
|
+ #define HAVE_LONG_LONG
|
|
+ #endif
|
|
+#endif
|
|
#ifndef PY_LONG_LONG
|
|
#define PY_LONG_LONG LONG_LONG
|
|
#endif
|
|
+#ifndef Py_HUGE_VAL
|
|
+ #define Py_HUGE_VAL HUGE_VAL
|
|
+#endif
|
|
+#ifdef PYPY_VERSION
|
|
+ #define CYTHON_COMPILING_IN_PYPY 1
|
|
+ #define CYTHON_COMPILING_IN_PYSTON 0
|
|
+ #define CYTHON_COMPILING_IN_CPYTHON 0
|
|
+ #define CYTHON_COMPILING_IN_NOGIL 0
|
|
+ #undef CYTHON_USE_TYPE_SLOTS
|
|
+ #define CYTHON_USE_TYPE_SLOTS 0
|
|
+ #undef CYTHON_USE_PYTYPE_LOOKUP
|
|
+ #define CYTHON_USE_PYTYPE_LOOKUP 0
|
|
+ #if PY_VERSION_HEX < 0x03050000
|
|
+ #undef CYTHON_USE_ASYNC_SLOTS
|
|
+ #define CYTHON_USE_ASYNC_SLOTS 0
|
|
+ #elif !defined(CYTHON_USE_ASYNC_SLOTS)
|
|
+ #define CYTHON_USE_ASYNC_SLOTS 1
|
|
+ #endif
|
|
+ #undef CYTHON_USE_PYLIST_INTERNALS
|
|
+ #define CYTHON_USE_PYLIST_INTERNALS 0
|
|
+ #undef CYTHON_USE_UNICODE_INTERNALS
|
|
+ #define CYTHON_USE_UNICODE_INTERNALS 0
|
|
+ #undef CYTHON_USE_UNICODE_WRITER
|
|
+ #define CYTHON_USE_UNICODE_WRITER 0
|
|
+ #undef CYTHON_USE_PYLONG_INTERNALS
|
|
+ #define CYTHON_USE_PYLONG_INTERNALS 0
|
|
+ #undef CYTHON_AVOID_BORROWED_REFS
|
|
+ #define CYTHON_AVOID_BORROWED_REFS 1
|
|
+ #undef CYTHON_ASSUME_SAFE_MACROS
|
|
+ #define CYTHON_ASSUME_SAFE_MACROS 0
|
|
+ #undef CYTHON_UNPACK_METHODS
|
|
+ #define CYTHON_UNPACK_METHODS 0
|
|
+ #undef CYTHON_FAST_THREAD_STATE
|
|
+ #define CYTHON_FAST_THREAD_STATE 0
|
|
+ #undef CYTHON_FAST_PYCALL
|
|
+ #define CYTHON_FAST_PYCALL 0
|
|
+ #undef CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ #define CYTHON_PEP489_MULTI_PHASE_INIT 0
|
|
+ #undef CYTHON_USE_TP_FINALIZE
|
|
+ #define CYTHON_USE_TP_FINALIZE 0
|
|
+ #undef CYTHON_USE_DICT_VERSIONS
|
|
+ #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
|
|
+ #define CYTHON_COMPILING_IN_CPYTHON 0
|
|
+ #define CYTHON_COMPILING_IN_NOGIL 0
|
|
+ #ifndef CYTHON_USE_TYPE_SLOTS
|
|
+ #define CYTHON_USE_TYPE_SLOTS 1
|
|
+ #endif
|
|
+ #undef CYTHON_USE_PYTYPE_LOOKUP
|
|
+ #define CYTHON_USE_PYTYPE_LOOKUP 0
|
|
+ #undef CYTHON_USE_ASYNC_SLOTS
|
|
+ #define CYTHON_USE_ASYNC_SLOTS 0
|
|
+ #undef CYTHON_USE_PYLIST_INTERNALS
|
|
+ #define CYTHON_USE_PYLIST_INTERNALS 0
|
|
+ #ifndef CYTHON_USE_UNICODE_INTERNALS
|
|
+ #define CYTHON_USE_UNICODE_INTERNALS 1
|
|
+ #endif
|
|
+ #undef CYTHON_USE_UNICODE_WRITER
|
|
+ #define CYTHON_USE_UNICODE_WRITER 0
|
|
+ #undef CYTHON_USE_PYLONG_INTERNALS
|
|
+ #define CYTHON_USE_PYLONG_INTERNALS 0
|
|
+ #ifndef CYTHON_AVOID_BORROWED_REFS
|
|
+ #define CYTHON_AVOID_BORROWED_REFS 0
|
|
+ #endif
|
|
+ #ifndef CYTHON_ASSUME_SAFE_MACROS
|
|
+ #define CYTHON_ASSUME_SAFE_MACROS 1
|
|
+ #endif
|
|
+ #ifndef CYTHON_UNPACK_METHODS
|
|
+ #define CYTHON_UNPACK_METHODS 1
|
|
+ #endif
|
|
+ #undef CYTHON_FAST_THREAD_STATE
|
|
+ #define CYTHON_FAST_THREAD_STATE 0
|
|
+ #undef CYTHON_FAST_PYCALL
|
|
+ #define CYTHON_FAST_PYCALL 0
|
|
+ #undef CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ #define CYTHON_PEP489_MULTI_PHASE_INIT 0
|
|
+ #undef CYTHON_USE_TP_FINALIZE
|
|
+ #define CYTHON_USE_TP_FINALIZE 0
|
|
+ #undef CYTHON_USE_DICT_VERSIONS
|
|
+ #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
|
|
+#elif defined(PY_NOGIL)
|
|
+ #define CYTHON_COMPILING_IN_PYPY 0
|
|
+ #define CYTHON_COMPILING_IN_PYSTON 0
|
|
+ #define CYTHON_COMPILING_IN_CPYTHON 0
|
|
+ #define CYTHON_COMPILING_IN_NOGIL 1
|
|
+ #ifndef CYTHON_USE_TYPE_SLOTS
|
|
+ #define CYTHON_USE_TYPE_SLOTS 1
|
|
+ #endif
|
|
+ #undef CYTHON_USE_PYTYPE_LOOKUP
|
|
+ #define CYTHON_USE_PYTYPE_LOOKUP 0
|
|
+ #ifndef CYTHON_USE_ASYNC_SLOTS
|
|
+ #define CYTHON_USE_ASYNC_SLOTS 1
|
|
+ #endif
|
|
+ #undef CYTHON_USE_PYLIST_INTERNALS
|
|
+ #define CYTHON_USE_PYLIST_INTERNALS 0
|
|
+ #ifndef CYTHON_USE_UNICODE_INTERNALS
|
|
+ #define CYTHON_USE_UNICODE_INTERNALS 1
|
|
+ #endif
|
|
+ #undef CYTHON_USE_UNICODE_WRITER
|
|
+ #define CYTHON_USE_UNICODE_WRITER 0
|
|
+ #undef CYTHON_USE_PYLONG_INTERNALS
|
|
+ #define CYTHON_USE_PYLONG_INTERNALS 0
|
|
+ #ifndef CYTHON_AVOID_BORROWED_REFS
|
|
+ #define CYTHON_AVOID_BORROWED_REFS 0
|
|
+ #endif
|
|
+ #ifndef CYTHON_ASSUME_SAFE_MACROS
|
|
+ #define CYTHON_ASSUME_SAFE_MACROS 1
|
|
+ #endif
|
|
+ #ifndef CYTHON_UNPACK_METHODS
|
|
+ #define CYTHON_UNPACK_METHODS 1
|
|
+ #endif
|
|
+ #undef CYTHON_FAST_THREAD_STATE
|
|
+ #define CYTHON_FAST_THREAD_STATE 0
|
|
+ #undef CYTHON_FAST_PYCALL
|
|
+ #define CYTHON_FAST_PYCALL 0
|
|
+ #ifndef CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ #define CYTHON_PEP489_MULTI_PHASE_INIT 1
|
|
+ #endif
|
|
+ #ifndef CYTHON_USE_TP_FINALIZE
|
|
+ #define CYTHON_USE_TP_FINALIZE 1
|
|
+ #endif
|
|
+ #undef CYTHON_USE_DICT_VERSIONS
|
|
+ #define CYTHON_USE_DICT_VERSIONS 0
|
|
+ #undef CYTHON_USE_EXC_INFO_STACK
|
|
+ #define CYTHON_USE_EXC_INFO_STACK 0
|
|
+#else
|
|
+ #define CYTHON_COMPILING_IN_PYPY 0
|
|
+ #define CYTHON_COMPILING_IN_PYSTON 0
|
|
+ #define CYTHON_COMPILING_IN_CPYTHON 1
|
|
+ #define CYTHON_COMPILING_IN_NOGIL 0
|
|
+ #ifndef CYTHON_USE_TYPE_SLOTS
|
|
+ #define CYTHON_USE_TYPE_SLOTS 1
|
|
+ #endif
|
|
+ #if PY_VERSION_HEX < 0x02070000
|
|
+ #undef CYTHON_USE_PYTYPE_LOOKUP
|
|
+ #define CYTHON_USE_PYTYPE_LOOKUP 0
|
|
+ #elif !defined(CYTHON_USE_PYTYPE_LOOKUP)
|
|
+ #define CYTHON_USE_PYTYPE_LOOKUP 1
|
|
+ #endif
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ #undef CYTHON_USE_ASYNC_SLOTS
|
|
+ #define CYTHON_USE_ASYNC_SLOTS 0
|
|
+ #elif !defined(CYTHON_USE_ASYNC_SLOTS)
|
|
+ #define CYTHON_USE_ASYNC_SLOTS 1
|
|
+ #endif
|
|
+ #if PY_VERSION_HEX < 0x02070000
|
|
+ #undef CYTHON_USE_PYLONG_INTERNALS
|
|
+ #define CYTHON_USE_PYLONG_INTERNALS 0
|
|
+ #elif !defined(CYTHON_USE_PYLONG_INTERNALS)
|
|
+ #define CYTHON_USE_PYLONG_INTERNALS 1
|
|
+ #endif
|
|
+ #ifndef CYTHON_USE_PYLIST_INTERNALS
|
|
+ #define CYTHON_USE_PYLIST_INTERNALS 1
|
|
+ #endif
|
|
+ #ifndef CYTHON_USE_UNICODE_INTERNALS
|
|
+ #define CYTHON_USE_UNICODE_INTERNALS 1
|
|
+ #endif
|
|
+ #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)
|
|
+ #define CYTHON_USE_UNICODE_WRITER 1
|
|
+ #endif
|
|
+ #ifndef CYTHON_AVOID_BORROWED_REFS
|
|
+ #define CYTHON_AVOID_BORROWED_REFS 0
|
|
+ #endif
|
|
+ #ifndef CYTHON_ASSUME_SAFE_MACROS
|
|
+ #define CYTHON_ASSUME_SAFE_MACROS 1
|
|
+ #endif
|
|
+ #ifndef CYTHON_UNPACK_METHODS
|
|
+ #define CYTHON_UNPACK_METHODS 1
|
|
+ #endif
|
|
+ #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 (PY_VERSION_HEX < 0x030A0000)
|
|
+ #endif
|
|
+ #ifndef CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ #define CYTHON_PEP489_MULTI_PHASE_INIT (PY_VERSION_HEX >= 0x03050000)
|
|
+ #endif
|
|
+ #ifndef CYTHON_USE_TP_FINALIZE
|
|
+ #define CYTHON_USE_TP_FINALIZE (PY_VERSION_HEX >= 0x030400a1)
|
|
+ #endif
|
|
+ #ifndef CYTHON_USE_DICT_VERSIONS
|
|
+ #define CYTHON_USE_DICT_VERSIONS (PY_VERSION_HEX >= 0x030600B1)
|
|
+ #endif
|
|
+ #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
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ #include "longintrepr.h"
|
|
+ #endif
|
|
+ #undef SHIFT
|
|
+ #undef BASE
|
|
+ #undef MASK
|
|
+ #ifdef SIZEOF_VOID_P
|
|
+ enum { __pyx_check_sizeof_voidp = 1 / (int)(SIZEOF_VOID_P == sizeof(void*)) };
|
|
+ #endif
|
|
+#endif
|
|
+#ifndef __has_attribute
|
|
+ #define __has_attribute(x) 0
|
|
+#endif
|
|
+#ifndef __has_cpp_attribute
|
|
+ #define __has_cpp_attribute(x) 0
|
|
+#endif
|
|
+#ifndef CYTHON_RESTRICT
|
|
+ #if defined(__GNUC__)
|
|
+ #define CYTHON_RESTRICT __restrict__
|
|
+ #elif defined(_MSC_VER) && _MSC_VER >= 1400
|
|
+ #define CYTHON_RESTRICT __restrict
|
|
+ #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
|
+ #define CYTHON_RESTRICT restrict
|
|
+ #else
|
|
+ #define CYTHON_RESTRICT
|
|
+ #endif
|
|
+#endif
|
|
+#ifndef CYTHON_UNUSED
|
|
+# if defined(__GNUC__)
|
|
+# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
|
|
+# define CYTHON_UNUSED __attribute__ ((__unused__))
|
|
+# else
|
|
+# define CYTHON_UNUSED
|
|
+# endif
|
|
+# elif defined(__ICC) || (defined(__INTEL_COMPILER) && !defined(_MSC_VER))
|
|
+# define CYTHON_UNUSED __attribute__ ((__unused__))
|
|
+# else
|
|
+# define CYTHON_UNUSED
|
|
+# endif
|
|
+#endif
|
|
+#ifndef CYTHON_MAYBE_UNUSED_VAR
|
|
+# if defined(__cplusplus)
|
|
+ template<class T> void CYTHON_MAYBE_UNUSED_VAR( const T& ) { }
|
|
+# else
|
|
+# define CYTHON_MAYBE_UNUSED_VAR(x) (void)(x)
|
|
+# endif
|
|
+#endif
|
|
+#ifndef CYTHON_NCP_UNUSED
|
|
+# if CYTHON_COMPILING_IN_CPYTHON
|
|
+# define CYTHON_NCP_UNUSED
|
|
+# else
|
|
+# define CYTHON_NCP_UNUSED CYTHON_UNUSED
|
|
+# endif
|
|
+#endif
|
|
+#define __Pyx_void_to_None(void_result) ((void)(void_result), Py_INCREF(Py_None), Py_None)
|
|
+#ifdef _MSC_VER
|
|
+ #ifndef _MSC_STDINT_H_
|
|
+ #if _MSC_VER < 1300
|
|
+ typedef unsigned char uint8_t;
|
|
+ typedef unsigned int uint32_t;
|
|
+ #else
|
|
+ typedef unsigned __int8 uint8_t;
|
|
+ typedef unsigned __int32 uint32_t;
|
|
+ #endif
|
|
+ #endif
|
|
+#else
|
|
+ #include <stdint.h>
|
|
+#endif
|
|
+#ifndef CYTHON_FALLTHROUGH
|
|
+ #if defined(__cplusplus) && __cplusplus >= 201103L
|
|
+ #if __has_cpp_attribute(fallthrough)
|
|
+ #define CYTHON_FALLTHROUGH [[fallthrough]]
|
|
+ #elif __has_cpp_attribute(clang::fallthrough)
|
|
+ #define CYTHON_FALLTHROUGH [[clang::fallthrough]]
|
|
+ #elif __has_cpp_attribute(gnu::fallthrough)
|
|
+ #define CYTHON_FALLTHROUGH [[gnu::fallthrough]]
|
|
+ #endif
|
|
+ #endif
|
|
+ #ifndef CYTHON_FALLTHROUGH
|
|
+ #if __has_attribute(fallthrough)
|
|
+ #define CYTHON_FALLTHROUGH __attribute__((fallthrough))
|
|
+ #else
|
|
+ #define CYTHON_FALLTHROUGH
|
|
+ #endif
|
|
+ #endif
|
|
+ #if defined(__clang__ ) && defined(__apple_build_version__)
|
|
+ #if __apple_build_version__ < 7000000
|
|
+ #undef CYTHON_FALLTHROUGH
|
|
+ #define CYTHON_FALLTHROUGH
|
|
+ #endif
|
|
+ #endif
|
|
+#endif
|
|
|
|
-#if PY_VERSION_HEX < 0x02040000
|
|
- #define METH_COEXIST 0
|
|
- #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
|
|
- #define PyDict_Contains(d,o) PySequence_Contains(d,o)
|
|
-#endif
|
|
-
|
|
-#if PY_VERSION_HEX < 0x02050000
|
|
- typedef int Py_ssize_t;
|
|
- #define PY_SSIZE_T_MAX INT_MAX
|
|
- #define PY_SSIZE_T_MIN INT_MIN
|
|
- #define PY_FORMAT_SIZE_T ""
|
|
- #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
|
|
- #define PyInt_AsSsize_t(o) PyInt_AsLong(o)
|
|
- #define PyNumber_Index(o) PyNumber_Int(o)
|
|
- #define PyIndex_Check(o) PyNumber_Check(o)
|
|
- #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
|
|
-#endif
|
|
-
|
|
-#if PY_VERSION_HEX < 0x02060000
|
|
- #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
|
|
- #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
|
|
- #define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size)
|
|
- #define PyVarObject_HEAD_INIT(type, size) \
|
|
- PyObject_HEAD_INIT(type) size,
|
|
- #define PyType_Modified(t)
|
|
-
|
|
- typedef struct {
|
|
- void *buf;
|
|
- PyObject *obj;
|
|
- Py_ssize_t len;
|
|
- Py_ssize_t itemsize;
|
|
- int readonly;
|
|
- int ndim;
|
|
- char *format;
|
|
- Py_ssize_t *shape;
|
|
- Py_ssize_t *strides;
|
|
- Py_ssize_t *suboffsets;
|
|
- void *internal;
|
|
- } Py_buffer;
|
|
-
|
|
- #define PyBUF_SIMPLE 0
|
|
- #define PyBUF_WRITABLE 0x0001
|
|
- #define PyBUF_FORMAT 0x0004
|
|
- #define PyBUF_ND 0x0008
|
|
- #define PyBUF_STRIDES (0x0010 | PyBUF_ND)
|
|
- #define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
|
|
- #define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
|
|
- #define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
|
|
- #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
|
|
-
|
|
+#ifndef CYTHON_INLINE
|
|
+ #if defined(__clang__)
|
|
+ #define CYTHON_INLINE __inline__ __attribute__ ((__unused__))
|
|
+ #elif defined(__GNUC__)
|
|
+ #define CYTHON_INLINE __inline__
|
|
+ #elif defined(_MSC_VER)
|
|
+ #define CYTHON_INLINE __inline
|
|
+ #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
|
+ #define CYTHON_INLINE inline
|
|
+ #else
|
|
+ #define CYTHON_INLINE
|
|
+ #endif
|
|
#endif
|
|
|
|
+#if CYTHON_COMPILING_IN_PYPY && PY_VERSION_HEX < 0x02070600 && !defined(Py_OptimizeFlag)
|
|
+ #define Py_OptimizeFlag 0
|
|
+#endif
|
|
+#define __PYX_BUILD_PY_SSIZE_T "n"
|
|
+#define CYTHON_FORMAT_SSIZE_T "z"
|
|
#if PY_MAJOR_VERSION < 3
|
|
#define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
|
|
+ #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)
|
|
+ #define __Pyx_DefaultClassType PyClass_Type
|
|
#else
|
|
#define __Pyx_BUILTIN_MODULE_NAME "builtins"
|
|
+ #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)
|
|
#endif
|
|
-
|
|
-#if PY_MAJOR_VERSION >= 3
|
|
+ #define __Pyx_DefaultClassType PyType_Type
|
|
+#endif
|
|
+#ifndef Py_TPFLAGS_CHECKTYPES
|
|
#define Py_TPFLAGS_CHECKTYPES 0
|
|
+#endif
|
|
+#ifndef Py_TPFLAGS_HAVE_INDEX
|
|
#define Py_TPFLAGS_HAVE_INDEX 0
|
|
#endif
|
|
-
|
|
-#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
|
|
+#ifndef Py_TPFLAGS_HAVE_NEWBUFFER
|
|
#define Py_TPFLAGS_HAVE_NEWBUFFER 0
|
|
#endif
|
|
-
|
|
+#ifndef Py_TPFLAGS_HAVE_FINALIZE
|
|
+ #define Py_TPFLAGS_HAVE_FINALIZE 0
|
|
+#endif
|
|
+#ifndef METH_STACKLESS
|
|
+ #define METH_STACKLESS 0
|
|
+#endif
|
|
+#if PY_VERSION_HEX <= 0x030700A3 || !defined(METH_FASTCALL)
|
|
+ #ifndef METH_FASTCALL
|
|
+ #define METH_FASTCALL 0x80
|
|
+ #endif
|
|
+ typedef PyObject *(*__Pyx_PyCFunctionFast) (PyObject *self, PyObject *const *args, Py_ssize_t nargs);
|
|
+ typedef PyObject *(*__Pyx_PyCFunctionFastWithKeywords) (PyObject *self, PyObject *const *args,
|
|
+ Py_ssize_t nargs, PyObject *kwnames);
|
|
+#else
|
|
+ #define __Pyx_PyCFunctionFast _PyCFunctionFast
|
|
+ #define __Pyx_PyCFunctionFastWithKeywords _PyCFunctionFastWithKeywords
|
|
+#endif
|
|
+#if CYTHON_FAST_PYCCALL
|
|
+#define __Pyx_PyFastCFunction_Check(func)\
|
|
+ ((PyCFunction_Check(func) && (METH_FASTCALL == (PyCFunction_GET_FLAGS(func) & ~(METH_CLASS | METH_STATIC | METH_COEXIST | METH_KEYWORDS | METH_STACKLESS)))))
|
|
+#else
|
|
+#define __Pyx_PyFastCFunction_Check(func) 0
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_PYPY && !defined(PyObject_Malloc)
|
|
+ #define PyObject_Malloc(s) PyMem_Malloc(s)
|
|
+ #define PyObject_Free(p) PyMem_Free(p)
|
|
+ #define PyObject_Realloc(p) PyMem_Realloc(p)
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX < 0x030400A1
|
|
+ #define PyMem_RawMalloc(n) PyMem_Malloc(n)
|
|
+ #define PyMem_RawRealloc(p, n) PyMem_Realloc(p, n)
|
|
+ #define PyMem_RawFree(p) PyMem_Free(p)
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_PYSTON
|
|
+ #define __Pyx_PyCode_HasFreeVars(co) PyCode_HasFreeVars(co)
|
|
+ #define __Pyx_PyFrame_SetLineNumber(frame, lineno) PyFrame_SetLineNumber(frame, lineno)
|
|
+#else
|
|
+ #define __Pyx_PyCode_HasFreeVars(co) (PyCode_GetNumFree(co) > 0)
|
|
+ #define __Pyx_PyFrame_SetLineNumber(frame, lineno) (frame)->f_lineno = (lineno)
|
|
+#endif
|
|
+#if !CYTHON_FAST_THREAD_STATE || PY_VERSION_HEX < 0x02070000
|
|
+ #define __Pyx_PyThreadState_Current PyThreadState_GET()
|
|
+#elif PY_VERSION_HEX >= 0x03060000
|
|
+ #define __Pyx_PyThreadState_Current _PyThreadState_UncheckedGet()
|
|
+#elif PY_VERSION_HEX >= 0x03000000
|
|
+ #define __Pyx_PyThreadState_Current PyThreadState_GET()
|
|
+#else
|
|
+ #define __Pyx_PyThreadState_Current _PyThreadState_Current
|
|
+#endif
|
|
+#if PY_VERSION_HEX < 0x030700A2 && !defined(PyThread_tss_create) && !defined(Py_tss_NEEDS_INIT)
|
|
+#include "pythread.h"
|
|
+#define Py_tss_NEEDS_INIT 0
|
|
+typedef int Py_tss_t;
|
|
+static CYTHON_INLINE int PyThread_tss_create(Py_tss_t *key) {
|
|
+ *key = PyThread_create_key();
|
|
+ return 0;
|
|
+}
|
|
+static CYTHON_INLINE Py_tss_t * PyThread_tss_alloc(void) {
|
|
+ Py_tss_t *key = (Py_tss_t *)PyObject_Malloc(sizeof(Py_tss_t));
|
|
+ *key = Py_tss_NEEDS_INIT;
|
|
+ return key;
|
|
+}
|
|
+static CYTHON_INLINE void PyThread_tss_free(Py_tss_t *key) {
|
|
+ PyObject_Free(key);
|
|
+}
|
|
+static CYTHON_INLINE int PyThread_tss_is_created(Py_tss_t *key) {
|
|
+ return *key != Py_tss_NEEDS_INIT;
|
|
+}
|
|
+static CYTHON_INLINE void PyThread_tss_delete(Py_tss_t *key) {
|
|
+ PyThread_delete_key(*key);
|
|
+ *key = Py_tss_NEEDS_INIT;
|
|
+}
|
|
+static CYTHON_INLINE int PyThread_tss_set(Py_tss_t *key, void *value) {
|
|
+ return PyThread_set_key_value(*key, value);
|
|
+}
|
|
+static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) {
|
|
+ return PyThread_get_key_value(*key);
|
|
+}
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_CPYTHON || defined(_PyDict_NewPresized)
|
|
+#define __Pyx_PyDict_NewPresized(n) ((n <= 8) ? PyDict_New() : _PyDict_NewPresized(n))
|
|
+#else
|
|
+#define __Pyx_PyDict_NewPresized(n) PyDict_New()
|
|
+#endif
|
|
+#if PY_MAJOR_VERSION >= 3 || CYTHON_FUTURE_DIVISION
|
|
+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)
|
|
+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)
|
|
+#else
|
|
+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)
|
|
+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1 && CYTHON_USE_UNICODE_INTERNALS
|
|
+#define __Pyx_PyDict_GetItemStr(dict, name) _PyDict_GetItem_KnownHash(dict, name, ((PyASCIIObject *) name)->hash)
|
|
+#else
|
|
+#define __Pyx_PyDict_GetItemStr(dict, name) PyDict_GetItem(dict, name)
|
|
+#endif
|
|
+#if PY_VERSION_HEX > 0x03030000 && defined(PyUnicode_KIND)
|
|
+ #define CYTHON_PEP393_ENABLED 1
|
|
+ #if defined(PyUnicode_IS_READY)
|
|
+ #define __Pyx_PyUnicode_READY(op) (likely(PyUnicode_IS_READY(op)) ?\
|
|
+ 0 : _PyUnicode_Ready((PyObject *)(op)))
|
|
+ #else
|
|
+ #define __Pyx_PyUnicode_READY(op) (0)
|
|
+ #endif
|
|
+ #define __Pyx_PyUnicode_GET_LENGTH(u) PyUnicode_GET_LENGTH(u)
|
|
+ #define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_READ_CHAR(u, i)
|
|
+ #define __Pyx_PyUnicode_MAX_CHAR_VALUE(u) PyUnicode_MAX_CHAR_VALUE(u)
|
|
+ #define __Pyx_PyUnicode_KIND(u) PyUnicode_KIND(u)
|
|
+ #define __Pyx_PyUnicode_DATA(u) PyUnicode_DATA(u)
|
|
+ #define __Pyx_PyUnicode_READ(k, d, i) PyUnicode_READ(k, d, i)
|
|
+ #define __Pyx_PyUnicode_WRITE(k, d, i, ch) PyUnicode_WRITE(k, d, i, ch)
|
|
+ #if defined(PyUnicode_IS_READY) && defined(PyUnicode_GET_SIZE)
|
|
+ #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000
|
|
+ #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length))
|
|
+ #else
|
|
+ #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u)))
|
|
+ #endif
|
|
+ #else
|
|
+ #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u))
|
|
+ #endif
|
|
+#else
|
|
+ #define CYTHON_PEP393_ENABLED 0
|
|
+ #define PyUnicode_1BYTE_KIND 1
|
|
+ #define PyUnicode_2BYTE_KIND 2
|
|
+ #define PyUnicode_4BYTE_KIND 4
|
|
+ #define __Pyx_PyUnicode_READY(op) (0)
|
|
+ #define __Pyx_PyUnicode_GET_LENGTH(u) PyUnicode_GET_SIZE(u)
|
|
+ #define __Pyx_PyUnicode_READ_CHAR(u, i) ((Py_UCS4)(PyUnicode_AS_UNICODE(u)[i]))
|
|
+ #define __Pyx_PyUnicode_MAX_CHAR_VALUE(u) ((sizeof(Py_UNICODE) == 2) ? 65535 : 1114111)
|
|
+ #define __Pyx_PyUnicode_KIND(u) (sizeof(Py_UNICODE))
|
|
+ #define __Pyx_PyUnicode_DATA(u) ((void*)PyUnicode_AS_UNICODE(u))
|
|
+ #define __Pyx_PyUnicode_READ(k, d, i) ((void)(k), (Py_UCS4)(((Py_UNICODE*)d)[i]))
|
|
+ #define __Pyx_PyUnicode_WRITE(k, d, i, ch) (((void)(k)), ((Py_UNICODE*)d)[i] = ch)
|
|
+ #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_SIZE(u))
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_PYPY
|
|
+ #define __Pyx_PyUnicode_Concat(a, b) PyNumber_Add(a, b)
|
|
+ #define __Pyx_PyUnicode_ConcatSafe(a, b) PyNumber_Add(a, b)
|
|
+#else
|
|
+ #define __Pyx_PyUnicode_Concat(a, b) PyUnicode_Concat(a, b)
|
|
+ #define __Pyx_PyUnicode_ConcatSafe(a, b) ((unlikely((a) == Py_None) || unlikely((b) == Py_None)) ?\
|
|
+ PyNumber_Add(a, b) : __Pyx_PyUnicode_Concat(a, b))
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_PYPY && !defined(PyUnicode_Contains)
|
|
+ #define PyUnicode_Contains(u, s) PySequence_Contains(u, s)
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_PYPY && !defined(PyByteArray_Check)
|
|
+ #define PyByteArray_Check(obj) PyObject_TypeCheck(obj, &PyByteArray_Type)
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_PYPY && !defined(PyObject_Format)
|
|
+ #define PyObject_Format(obj, fmt) PyObject_CallMethod(obj, "__format__", "O", fmt)
|
|
+#endif
|
|
+#define __Pyx_PyString_FormatSafe(a, b) ((unlikely((a) == Py_None || (PyString_Check(b) && !PyString_CheckExact(b)))) ? PyNumber_Remainder(a, b) : __Pyx_PyString_Format(a, b))
|
|
+#define __Pyx_PyUnicode_FormatSafe(a, b) ((unlikely((a) == Py_None || (PyUnicode_Check(b) && !PyUnicode_CheckExact(b)))) ? PyNumber_Remainder(a, b) : PyUnicode_Format(a, b))
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ #define __Pyx_PyString_Format(a, b) PyUnicode_Format(a, b)
|
|
+#else
|
|
+ #define __Pyx_PyString_Format(a, b) PyString_Format(a, b)
|
|
+#endif
|
|
+#if PY_MAJOR_VERSION < 3 && !defined(PyObject_ASCII)
|
|
+ #define PyObject_ASCII(o) PyObject_Repr(o)
|
|
+#endif
|
|
#if PY_MAJOR_VERSION >= 3
|
|
#define PyBaseString_Type PyUnicode_Type
|
|
#define PyStringObject PyUnicodeObject
|
|
#define PyString_Type PyUnicode_Type
|
|
#define PyString_Check PyUnicode_Check
|
|
#define PyString_CheckExact PyUnicode_CheckExact
|
|
+#ifndef PyObject_Unicode
|
|
+ #define PyObject_Unicode PyObject_Str
|
|
#endif
|
|
-
|
|
-#if PY_VERSION_HEX < 0x02060000
|
|
- #define PyBytesObject PyStringObject
|
|
- #define PyBytes_Type PyString_Type
|
|
- #define PyBytes_Check PyString_Check
|
|
- #define PyBytes_CheckExact PyString_CheckExact
|
|
- #define PyBytes_FromString PyString_FromString
|
|
- #define PyBytes_FromStringAndSize PyString_FromStringAndSize
|
|
- #define PyBytes_FromFormat PyString_FromFormat
|
|
- #define PyBytes_DecodeEscape PyString_DecodeEscape
|
|
- #define PyBytes_AsString PyString_AsString
|
|
- #define PyBytes_AsStringAndSize PyString_AsStringAndSize
|
|
- #define PyBytes_Size PyString_Size
|
|
- #define PyBytes_AS_STRING PyString_AS_STRING
|
|
- #define PyBytes_GET_SIZE PyString_GET_SIZE
|
|
- #define PyBytes_Repr PyString_Repr
|
|
- #define PyBytes_Concat PyString_Concat
|
|
- #define PyBytes_ConcatAndDel PyString_ConcatAndDel
|
|
-#endif
|
|
-
|
|
-#if PY_VERSION_HEX < 0x02060000
|
|
- #define PySet_Check(obj) PyObject_TypeCheck(obj, &PySet_Type)
|
|
- #define PyFrozenSet_Check(obj) PyObject_TypeCheck(obj, &PyFrozenSet_Type)
|
|
+#endif
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ #define __Pyx_PyBaseString_Check(obj) PyUnicode_Check(obj)
|
|
+ #define __Pyx_PyBaseString_CheckExact(obj) PyUnicode_CheckExact(obj)
|
|
+#else
|
|
+ #define __Pyx_PyBaseString_Check(obj) (PyString_Check(obj) || PyUnicode_Check(obj))
|
|
+ #define __Pyx_PyBaseString_CheckExact(obj) (PyString_CheckExact(obj) || PyUnicode_CheckExact(obj))
|
|
#endif
|
|
#ifndef PySet_CheckExact
|
|
#define PySet_CheckExact(obj) (Py_TYPE(obj) == &PySet_Type)
|
|
#endif
|
|
-
|
|
-#define __Pyx_TypeCheck(obj, type) PyObject_TypeCheck(obj, (PyTypeObject *)type)
|
|
-
|
|
+#if PY_VERSION_HEX >= 0x030900A4
|
|
+ #define __Pyx_SET_REFCNT(obj, refcnt) Py_SET_REFCNT(obj, refcnt)
|
|
+ #define __Pyx_SET_SIZE(obj, size) Py_SET_SIZE(obj, size)
|
|
+#else
|
|
+ #define __Pyx_SET_REFCNT(obj, refcnt) Py_REFCNT(obj) = (refcnt)
|
|
+ #define __Pyx_SET_SIZE(obj, size) Py_SIZE(obj) = (size)
|
|
+#endif
|
|
+#if CYTHON_ASSUME_SAFE_MACROS
|
|
+ #define __Pyx_PySequence_SIZE(seq) Py_SIZE(seq)
|
|
+#else
|
|
+ #define __Pyx_PySequence_SIZE(seq) PySequence_Size(seq)
|
|
+#endif
|
|
#if PY_MAJOR_VERSION >= 3
|
|
#define PyIntObject PyLongObject
|
|
#define PyInt_Type PyLong_Type
|
|
@@ -153,145 +663,287 @@
|
|
#define PyInt_AsSsize_t PyLong_AsSsize_t
|
|
#define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
|
|
#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
|
|
+ #define PyNumber_Int PyNumber_Long
|
|
#endif
|
|
-
|
|
#if PY_MAJOR_VERSION >= 3
|
|
#define PyBoolObject PyLongObject
|
|
#endif
|
|
-
|
|
-
|
|
-#if PY_MAJOR_VERSION >= 3
|
|
- #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)
|
|
- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)
|
|
-#else
|
|
- #define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)
|
|
- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)
|
|
+#if PY_MAJOR_VERSION >= 3 && CYTHON_COMPILING_IN_PYPY
|
|
+ #ifndef PyUnicode_InternFromString
|
|
+ #define PyUnicode_InternFromString(s) PyUnicode_FromString(s)
|
|
+ #endif
|
|
#endif
|
|
-
|
|
-#if (PY_MAJOR_VERSION < 3) || (PY_VERSION_HEX >= 0x03010300)
|
|
- #define __Pyx_PySequence_GetSlice(obj, a, b) PySequence_GetSlice(obj, a, b)
|
|
- #define __Pyx_PySequence_SetSlice(obj, a, b, value) PySequence_SetSlice(obj, a, b, value)
|
|
- #define __Pyx_PySequence_DelSlice(obj, a, b) PySequence_DelSlice(obj, a, b)
|
|
-#else
|
|
- #define __Pyx_PySequence_GetSlice(obj, a, b) (unlikely(!(obj)) ? \
|
|
- (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), (PyObject*)0) : \
|
|
- (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_GetSlice(obj, a, b)) : \
|
|
- (PyErr_Format(PyExc_TypeError, "'%.200s' object is unsliceable", (obj)->ob_type->tp_name), (PyObject*)0)))
|
|
- #define __Pyx_PySequence_SetSlice(obj, a, b, value) (unlikely(!(obj)) ? \
|
|
- (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \
|
|
- (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_SetSlice(obj, a, b, value)) : \
|
|
- (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice assignment", (obj)->ob_type->tp_name), -1)))
|
|
- #define __Pyx_PySequence_DelSlice(obj, a, b) (unlikely(!(obj)) ? \
|
|
- (PyErr_SetString(PyExc_SystemError, "null argument to internal routine"), -1) : \
|
|
- (likely((obj)->ob_type->tp_as_mapping) ? (PySequence_DelSlice(obj, a, b)) : \
|
|
- (PyErr_Format(PyExc_TypeError, "'%.200s' object doesn't support slice deletion", (obj)->ob_type->tp_name), -1)))
|
|
+#if PY_VERSION_HEX < 0x030200A4
|
|
+ typedef long Py_hash_t;
|
|
+ #define __Pyx_PyInt_FromHash_t PyInt_FromLong
|
|
+ #define __Pyx_PyInt_AsHash_t __Pyx_PyIndex_AsHash_t
|
|
+#else
|
|
+ #define __Pyx_PyInt_FromHash_t PyInt_FromSsize_t
|
|
+ #define __Pyx_PyInt_AsHash_t __Pyx_PyIndex_AsSsize_t
|
|
#endif
|
|
-
|
|
#if PY_MAJOR_VERSION >= 3
|
|
- #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
|
|
+ #define __Pyx_PyMethod_New(func, self, klass) ((self) ? ((void)(klass), PyMethod_New(func, self)) : __Pyx_NewRef(func))
|
|
+#else
|
|
+ #define __Pyx_PyMethod_New(func, self, klass) PyMethod_New(func, self, klass)
|
|
#endif
|
|
-
|
|
-#if PY_VERSION_HEX < 0x02050000
|
|
- #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))
|
|
- #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
|
|
- #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),((char *)(n)))
|
|
+#if CYTHON_USE_ASYNC_SLOTS
|
|
+ #if PY_VERSION_HEX >= 0x030500B1
|
|
+ #define __Pyx_PyAsyncMethodsStruct PyAsyncMethods
|
|
+ #define __Pyx_PyType_AsAsync(obj) (Py_TYPE(obj)->tp_as_async)
|
|
+ #else
|
|
+ #define __Pyx_PyType_AsAsync(obj) ((__Pyx_PyAsyncMethodsStruct*) (Py_TYPE(obj)->tp_reserved))
|
|
+ #endif
|
|
#else
|
|
- #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),(n))
|
|
- #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
|
|
- #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),(n))
|
|
+ #define __Pyx_PyType_AsAsync(obj) NULL
|
|
+#endif
|
|
+#ifndef __Pyx_PyAsyncMethodsStruct
|
|
+ typedef struct {
|
|
+ unaryfunc am_await;
|
|
+ unaryfunc am_aiter;
|
|
+ unaryfunc am_anext;
|
|
+ } __Pyx_PyAsyncMethodsStruct;
|
|
#endif
|
|
|
|
-#if PY_VERSION_HEX < 0x02050000
|
|
- #define __Pyx_NAMESTR(n) ((char *)(n))
|
|
- #define __Pyx_DOCSTR(n) ((char *)(n))
|
|
+#if defined(_WIN32) || defined(WIN32) || defined(MS_WINDOWS)
|
|
+ #if !defined(_USE_MATH_DEFINES)
|
|
+ #define _USE_MATH_DEFINES
|
|
+ #endif
|
|
+#endif
|
|
+#include <math.h>
|
|
+#ifdef NAN
|
|
+#define __PYX_NAN() ((float) NAN)
|
|
#else
|
|
- #define __Pyx_NAMESTR(n) (n)
|
|
- #define __Pyx_DOCSTR(n) (n)
|
|
+static CYTHON_INLINE float __PYX_NAN() {
|
|
+ float value;
|
|
+ memset(&value, 0xFF, sizeof(value));
|
|
+ return value;
|
|
+}
|
|
#endif
|
|
-
|
|
-#ifdef __cplusplus
|
|
-#define __PYX_EXTERN_C extern "C"
|
|
+#if defined(__CYGWIN__) && defined(_LDBL_EQ_DBL)
|
|
+#define __Pyx_truncl trunc
|
|
#else
|
|
-#define __PYX_EXTERN_C extern
|
|
+#define __Pyx_truncl truncl
|
|
#endif
|
|
|
|
-#if defined(WIN32) || defined(MS_WINDOWS)
|
|
-#define _USE_MATH_DEFINES
|
|
+#define __PYX_MARK_ERR_POS(f_index, lineno) \
|
|
+ { __pyx_filename = __pyx_f[f_index]; (void)__pyx_filename; __pyx_lineno = lineno; (void)__pyx_lineno; __pyx_clineno = __LINE__; (void)__pyx_clineno; }
|
|
+#define __PYX_ERR(f_index, lineno, Ln_error) \
|
|
+ { __PYX_MARK_ERR_POS(f_index, lineno) goto Ln_error; }
|
|
+
|
|
+#ifndef __PYX_EXTERN_C
|
|
+ #ifdef __cplusplus
|
|
+ #define __PYX_EXTERN_C extern "C"
|
|
+ #else
|
|
+ #define __PYX_EXTERN_C extern
|
|
+ #endif
|
|
#endif
|
|
-#include <math.h>
|
|
+
|
|
+#define __PYX_HAVE__array_ext
|
|
#define __PYX_HAVE_API__array_ext
|
|
+/* Early includes */
|
|
#include "numpy/arrayobject.h"
|
|
+#ifdef _OPENMP
|
|
+#include <omp.h>
|
|
+#endif /* _OPENMP */
|
|
|
|
-#ifdef PYREX_WITHOUT_ASSERTIONS
|
|
+#if defined(PYREX_WITHOUT_ASSERTIONS) && !defined(CYTHON_WITHOUT_ASSERTIONS)
|
|
#define CYTHON_WITHOUT_ASSERTIONS
|
|
#endif
|
|
|
|
+typedef struct {PyObject **p; const char *s; const Py_ssize_t n; const char* encoding;
|
|
+ const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry;
|
|
|
|
-/* inline attribute */
|
|
-#ifndef CYTHON_INLINE
|
|
- #if defined(__GNUC__)
|
|
- #define CYTHON_INLINE __inline__
|
|
- #elif defined(_MSC_VER)
|
|
- #define CYTHON_INLINE __inline
|
|
- #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
|
- #define CYTHON_INLINE inline
|
|
- #else
|
|
- #define CYTHON_INLINE
|
|
- #endif
|
|
+#define __PYX_DEFAULT_STRING_ENCODING_IS_ASCII 0
|
|
+#define __PYX_DEFAULT_STRING_ENCODING_IS_UTF8 0
|
|
+#define __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT (PY_MAJOR_VERSION >= 3 && __PYX_DEFAULT_STRING_ENCODING_IS_UTF8)
|
|
+#define __PYX_DEFAULT_STRING_ENCODING ""
|
|
+#define __Pyx_PyObject_FromString __Pyx_PyBytes_FromString
|
|
+#define __Pyx_PyObject_FromStringAndSize __Pyx_PyBytes_FromStringAndSize
|
|
+#define __Pyx_uchar_cast(c) ((unsigned char)c)
|
|
+#define __Pyx_long_cast(x) ((long)x)
|
|
+#define __Pyx_fits_Py_ssize_t(v, type, is_signed) (\
|
|
+ (sizeof(type) < sizeof(Py_ssize_t)) ||\
|
|
+ (sizeof(type) > sizeof(Py_ssize_t) &&\
|
|
+ likely(v < (type)PY_SSIZE_T_MAX ||\
|
|
+ v == (type)PY_SSIZE_T_MAX) &&\
|
|
+ (!is_signed || likely(v > (type)PY_SSIZE_T_MIN ||\
|
|
+ v == (type)PY_SSIZE_T_MIN))) ||\
|
|
+ (sizeof(type) == sizeof(Py_ssize_t) &&\
|
|
+ (is_signed || likely(v < (type)PY_SSIZE_T_MAX ||\
|
|
+ v == (type)PY_SSIZE_T_MAX))) )
|
|
+static CYTHON_INLINE int __Pyx_is_valid_index(Py_ssize_t i, Py_ssize_t limit) {
|
|
+ return (size_t) i < (size_t) limit;
|
|
+}
|
|
+#if defined (__cplusplus) && __cplusplus >= 201103L
|
|
+ #include <cstdlib>
|
|
+ #define __Pyx_sst_abs(value) std::abs(value)
|
|
+#elif SIZEOF_INT >= SIZEOF_SIZE_T
|
|
+ #define __Pyx_sst_abs(value) abs(value)
|
|
+#elif SIZEOF_LONG >= SIZEOF_SIZE_T
|
|
+ #define __Pyx_sst_abs(value) labs(value)
|
|
+#elif defined (_MSC_VER)
|
|
+ #define __Pyx_sst_abs(value) ((Py_ssize_t)_abs64(value))
|
|
+#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
|
+ #define __Pyx_sst_abs(value) llabs(value)
|
|
+#elif defined (__GNUC__)
|
|
+ #define __Pyx_sst_abs(value) __builtin_llabs(value)
|
|
+#else
|
|
+ #define __Pyx_sst_abs(value) ((value<0) ? -value : value)
|
|
#endif
|
|
-
|
|
-/* unused attribute */
|
|
-#ifndef CYTHON_UNUSED
|
|
-# if defined(__GNUC__)
|
|
-# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
|
|
-# define CYTHON_UNUSED __attribute__ ((__unused__))
|
|
-# else
|
|
-# define CYTHON_UNUSED
|
|
-# endif
|
|
-# elif defined(__ICC) || defined(__INTEL_COMPILER)
|
|
-# define CYTHON_UNUSED __attribute__ ((__unused__))
|
|
-# else
|
|
-# define CYTHON_UNUSED
|
|
-# endif
|
|
+static CYTHON_INLINE const char* __Pyx_PyObject_AsString(PyObject*);
|
|
+static CYTHON_INLINE const char* __Pyx_PyObject_AsStringAndSize(PyObject*, Py_ssize_t* length);
|
|
+#define __Pyx_PyByteArray_FromString(s) PyByteArray_FromStringAndSize((const char*)s, strlen((const char*)s))
|
|
+#define __Pyx_PyByteArray_FromStringAndSize(s, l) PyByteArray_FromStringAndSize((const char*)s, l)
|
|
+#define __Pyx_PyBytes_FromString PyBytes_FromString
|
|
+#define __Pyx_PyBytes_FromStringAndSize PyBytes_FromStringAndSize
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char*);
|
|
+#if PY_MAJOR_VERSION < 3
|
|
+ #define __Pyx_PyStr_FromString __Pyx_PyBytes_FromString
|
|
+ #define __Pyx_PyStr_FromStringAndSize __Pyx_PyBytes_FromStringAndSize
|
|
+#else
|
|
+ #define __Pyx_PyStr_FromString __Pyx_PyUnicode_FromString
|
|
+ #define __Pyx_PyStr_FromStringAndSize __Pyx_PyUnicode_FromStringAndSize
|
|
#endif
|
|
-
|
|
-typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/
|
|
-
|
|
-
|
|
-/* Type Conversion Predeclarations */
|
|
-
|
|
-#define __Pyx_PyBytes_FromUString(s) PyBytes_FromString((char*)s)
|
|
-#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) PyBytes_AsString(s))
|
|
-
|
|
-#define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
|
|
+#define __Pyx_PyBytes_AsWritableString(s) ((char*) PyBytes_AS_STRING(s))
|
|
+#define __Pyx_PyBytes_AsWritableSString(s) ((signed char*) PyBytes_AS_STRING(s))
|
|
+#define __Pyx_PyBytes_AsWritableUString(s) ((unsigned char*) PyBytes_AS_STRING(s))
|
|
+#define __Pyx_PyBytes_AsString(s) ((const char*) PyBytes_AS_STRING(s))
|
|
+#define __Pyx_PyBytes_AsSString(s) ((const signed char*) PyBytes_AS_STRING(s))
|
|
+#define __Pyx_PyBytes_AsUString(s) ((const unsigned char*) PyBytes_AS_STRING(s))
|
|
+#define __Pyx_PyObject_AsWritableString(s) ((char*) __Pyx_PyObject_AsString(s))
|
|
+#define __Pyx_PyObject_AsWritableSString(s) ((signed char*) __Pyx_PyObject_AsString(s))
|
|
+#define __Pyx_PyObject_AsWritableUString(s) ((unsigned char*) __Pyx_PyObject_AsString(s))
|
|
+#define __Pyx_PyObject_AsSString(s) ((const signed char*) __Pyx_PyObject_AsString(s))
|
|
+#define __Pyx_PyObject_AsUString(s) ((const unsigned char*) __Pyx_PyObject_AsString(s))
|
|
+#define __Pyx_PyObject_FromCString(s) __Pyx_PyObject_FromString((const char*)s)
|
|
+#define __Pyx_PyBytes_FromCString(s) __Pyx_PyBytes_FromString((const char*)s)
|
|
+#define __Pyx_PyByteArray_FromCString(s) __Pyx_PyByteArray_FromString((const char*)s)
|
|
+#define __Pyx_PyStr_FromCString(s) __Pyx_PyStr_FromString((const char*)s)
|
|
+#define __Pyx_PyUnicode_FromCString(s) __Pyx_PyUnicode_FromString((const char*)s)
|
|
+static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u) {
|
|
+ const Py_UNICODE *u_end = u;
|
|
+ while (*u_end++) ;
|
|
+ return (size_t)(u_end - u - 1);
|
|
+}
|
|
+#define __Pyx_PyUnicode_FromUnicode(u) PyUnicode_FromUnicode(u, __Pyx_Py_UNICODE_strlen(u))
|
|
+#define __Pyx_PyUnicode_FromUnicodeAndLength PyUnicode_FromUnicode
|
|
+#define __Pyx_PyUnicode_AsUnicode PyUnicode_AsUnicode
|
|
+#define __Pyx_NewRef(obj) (Py_INCREF(obj), obj)
|
|
+#define __Pyx_Owned_Py_None(b) __Pyx_NewRef(Py_None)
|
|
+static CYTHON_INLINE PyObject * __Pyx_PyBool_FromLong(long b);
|
|
static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
|
|
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
|
|
-
|
|
+static CYTHON_INLINE int __Pyx_PyObject_IsTrueAndDecref(PyObject*);
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyNumber_IntOrLong(PyObject* x);
|
|
+#define __Pyx_PySequence_Tuple(obj)\
|
|
+ (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 size_t __Pyx_PyInt_AsSize_t(PyObject*);
|
|
-
|
|
+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
|
|
+#define __pyx_PyFloat_AsDouble(x) PyFloat_AsDouble(x)
|
|
+#endif
|
|
+#define __pyx_PyFloat_AsFloat(x) ((float) __pyx_PyFloat_AsDouble(x))
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+#define __Pyx_PyNumber_Int(x) (PyLong_CheckExact(x) ? __Pyx_NewRef(x) : PyNumber_Long(x))
|
|
+#else
|
|
+#define __Pyx_PyNumber_Int(x) (PyInt_CheckExact(x) ? __Pyx_NewRef(x) : PyNumber_Int(x))
|
|
+#endif
|
|
+#define __Pyx_PyNumber_Float(x) (PyFloat_CheckExact(x) ? __Pyx_NewRef(x) : PyNumber_Float(x))
|
|
+#if PY_MAJOR_VERSION < 3 && __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
|
|
+static int __Pyx_sys_getdefaultencoding_not_ascii;
|
|
+static int __Pyx_init_sys_getdefaultencoding_params(void) {
|
|
+ PyObject* sys;
|
|
+ PyObject* default_encoding = NULL;
|
|
+ PyObject* ascii_chars_u = NULL;
|
|
+ PyObject* ascii_chars_b = NULL;
|
|
+ const char* default_encoding_c;
|
|
+ sys = PyImport_ImportModule("sys");
|
|
+ if (!sys) goto bad;
|
|
+ default_encoding = PyObject_CallMethod(sys, (char*) "getdefaultencoding", NULL);
|
|
+ Py_DECREF(sys);
|
|
+ if (!default_encoding) goto bad;
|
|
+ default_encoding_c = PyBytes_AsString(default_encoding);
|
|
+ if (!default_encoding_c) goto bad;
|
|
+ if (strcmp(default_encoding_c, "ascii") == 0) {
|
|
+ __Pyx_sys_getdefaultencoding_not_ascii = 0;
|
|
+ } else {
|
|
+ char ascii_chars[128];
|
|
+ int c;
|
|
+ for (c = 0; c < 128; c++) {
|
|
+ ascii_chars[c] = c;
|
|
+ }
|
|
+ __Pyx_sys_getdefaultencoding_not_ascii = 1;
|
|
+ ascii_chars_u = PyUnicode_DecodeASCII(ascii_chars, 128, NULL);
|
|
+ if (!ascii_chars_u) goto bad;
|
|
+ ascii_chars_b = PyUnicode_AsEncodedString(ascii_chars_u, default_encoding_c, NULL);
|
|
+ if (!ascii_chars_b || !PyBytes_Check(ascii_chars_b) || memcmp(ascii_chars, PyBytes_AS_STRING(ascii_chars_b), 128) != 0) {
|
|
+ PyErr_Format(
|
|
+ PyExc_ValueError,
|
|
+ "This module compiled with c_string_encoding=ascii, but default encoding '%.200s' is not a superset of ascii.",
|
|
+ default_encoding_c);
|
|
+ goto bad;
|
|
+ }
|
|
+ Py_DECREF(ascii_chars_u);
|
|
+ Py_DECREF(ascii_chars_b);
|
|
+ }
|
|
+ Py_DECREF(default_encoding);
|
|
+ return 0;
|
|
+bad:
|
|
+ Py_XDECREF(default_encoding);
|
|
+ Py_XDECREF(ascii_chars_u);
|
|
+ Py_XDECREF(ascii_chars_b);
|
|
+ return -1;
|
|
+}
|
|
+#endif
|
|
+#if __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT && PY_MAJOR_VERSION >= 3
|
|
+#define __Pyx_PyUnicode_FromStringAndSize(c_str, size) PyUnicode_DecodeUTF8(c_str, size, NULL)
|
|
+#else
|
|
+#define __Pyx_PyUnicode_FromStringAndSize(c_str, size) PyUnicode_Decode(c_str, size, __PYX_DEFAULT_STRING_ENCODING, NULL)
|
|
+#if __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT
|
|
+static char* __PYX_DEFAULT_STRING_ENCODING;
|
|
+static int __Pyx_init_sys_getdefaultencoding_params(void) {
|
|
+ PyObject* sys;
|
|
+ PyObject* default_encoding = NULL;
|
|
+ char* default_encoding_c;
|
|
+ sys = PyImport_ImportModule("sys");
|
|
+ if (!sys) goto bad;
|
|
+ default_encoding = PyObject_CallMethod(sys, (char*) (const char*) "getdefaultencoding", NULL);
|
|
+ Py_DECREF(sys);
|
|
+ if (!default_encoding) goto bad;
|
|
+ default_encoding_c = PyBytes_AsString(default_encoding);
|
|
+ if (!default_encoding_c) goto bad;
|
|
+ __PYX_DEFAULT_STRING_ENCODING = (char*) malloc(strlen(default_encoding_c) + 1);
|
|
+ if (!__PYX_DEFAULT_STRING_ENCODING) goto bad;
|
|
+ strcpy(__PYX_DEFAULT_STRING_ENCODING, default_encoding_c);
|
|
+ Py_DECREF(default_encoding);
|
|
+ return 0;
|
|
+bad:
|
|
+ Py_XDECREF(default_encoding);
|
|
+ return -1;
|
|
+}
|
|
+#endif
|
|
+#endif
|
|
|
|
|
|
-#ifdef __GNUC__
|
|
/* Test for GCC > 2.95 */
|
|
-#if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95))
|
|
-#define likely(x) __builtin_expect(!!(x), 1)
|
|
-#define unlikely(x) __builtin_expect(!!(x), 0)
|
|
-#else /* __GNUC__ > 2 ... */
|
|
-#define likely(x) (x)
|
|
-#define unlikely(x) (x)
|
|
-#endif /* __GNUC__ > 2 ... */
|
|
-#else /* __GNUC__ */
|
|
-#define likely(x) (x)
|
|
-#define unlikely(x) (x)
|
|
+#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95)))
|
|
+ #define likely(x) __builtin_expect(!!(x), 1)
|
|
+ #define unlikely(x) __builtin_expect(!!(x), 0)
|
|
+#else /* !__GNUC__ or GCC < 2.95 */
|
|
+ #define likely(x) (x)
|
|
+ #define unlikely(x) (x)
|
|
#endif /* __GNUC__ */
|
|
-
|
|
-static PyObject *__pyx_m;
|
|
+static CYTHON_INLINE void __Pyx_pretend_to_initialize(void* ptr) { (void)ptr; }
|
|
+
|
|
+static PyObject *__pyx_m = NULL;
|
|
+static PyObject *__pyx_d;
|
|
static PyObject *__pyx_b;
|
|
+static PyObject *__pyx_cython_runtime = NULL;
|
|
static PyObject *__pyx_empty_tuple;
|
|
static PyObject *__pyx_empty_bytes;
|
|
+static PyObject *__pyx_empty_unicode;
|
|
static int __pyx_lineno;
|
|
static int __pyx_clineno = 0;
|
|
static const char * __pyx_cfilenm= __FILE__;
|
|
@@ -299,15 +951,16 @@
|
|
|
|
|
|
static const char *__pyx_f[] = {
|
|
- "array_ext.pyx",
|
|
+ "tvtk/src/array_ext.pyx",
|
|
};
|
|
|
|
-/* Type declarations */
|
|
+/*--- Type declarations ---*/
|
|
|
|
+/* --- Runtime support code (head) --- */
|
|
+/* Refnanny.proto */
|
|
#ifndef CYTHON_REFNANNY
|
|
#define CYTHON_REFNANNY 0
|
|
#endif
|
|
-
|
|
#if CYTHON_REFNANNY
|
|
typedef struct {
|
|
void (*INCREF)(void*, PyObject*, int);
|
|
@@ -318,240 +971,433 @@
|
|
void (*FinishContext)(void**);
|
|
} __Pyx_RefNannyAPIStruct;
|
|
static __Pyx_RefNannyAPIStruct *__Pyx_RefNanny = NULL;
|
|
- static __Pyx_RefNannyAPIStruct * __Pyx_RefNannyImportAPI(const char *modname) {
|
|
- PyObject *m = NULL, *p = NULL;
|
|
- void *r = NULL;
|
|
- m = PyImport_ImportModule((char *)modname);
|
|
- if (!m) goto end;
|
|
- p = PyObject_GetAttrString(m, (char *)"RefNannyAPI");
|
|
- if (!p) goto end;
|
|
- r = PyLong_AsVoidPtr(p);
|
|
- end:
|
|
- Py_XDECREF(p);
|
|
- Py_XDECREF(m);
|
|
- return (__Pyx_RefNannyAPIStruct *)r;
|
|
- }
|
|
- #define __Pyx_RefNannySetupContext(name) void *__pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__)
|
|
- #define __Pyx_RefNannyFinishContext() __Pyx_RefNanny->FinishContext(&__pyx_refnanny)
|
|
- #define __Pyx_INCREF(r) __Pyx_RefNanny->INCREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
|
|
- #define __Pyx_DECREF(r) __Pyx_RefNanny->DECREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
|
|
- #define __Pyx_GOTREF(r) __Pyx_RefNanny->GOTREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
|
|
+ static __Pyx_RefNannyAPIStruct *__Pyx_RefNannyImportAPI(const char *modname);
|
|
+ #define __Pyx_RefNannyDeclarations void *__pyx_refnanny = NULL;
|
|
+#ifdef WITH_THREAD
|
|
+ #define __Pyx_RefNannySetupContext(name, acquire_gil)\
|
|
+ if (acquire_gil) {\
|
|
+ PyGILState_STATE __pyx_gilstate_save = PyGILState_Ensure();\
|
|
+ __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__);\
|
|
+ PyGILState_Release(__pyx_gilstate_save);\
|
|
+ } else {\
|
|
+ __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__);\
|
|
+ }
|
|
+#else
|
|
+ #define __Pyx_RefNannySetupContext(name, acquire_gil)\
|
|
+ __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__)
|
|
+#endif
|
|
+ #define __Pyx_RefNannyFinishContext()\
|
|
+ __Pyx_RefNanny->FinishContext(&__pyx_refnanny)
|
|
+ #define __Pyx_INCREF(r) __Pyx_RefNanny->INCREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
|
|
+ #define __Pyx_DECREF(r) __Pyx_RefNanny->DECREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
|
|
+ #define __Pyx_GOTREF(r) __Pyx_RefNanny->GOTREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
|
|
#define __Pyx_GIVEREF(r) __Pyx_RefNanny->GIVEREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
|
|
- #define __Pyx_XDECREF(r) do { if((r) != NULL) {__Pyx_DECREF(r);} } while(0)
|
|
+ #define __Pyx_XINCREF(r) do { if((r) != NULL) {__Pyx_INCREF(r); }} while(0)
|
|
+ #define __Pyx_XDECREF(r) do { if((r) != NULL) {__Pyx_DECREF(r); }} while(0)
|
|
+ #define __Pyx_XGOTREF(r) do { if((r) != NULL) {__Pyx_GOTREF(r); }} while(0)
|
|
+ #define __Pyx_XGIVEREF(r) do { if((r) != NULL) {__Pyx_GIVEREF(r);}} while(0)
|
|
#else
|
|
- #define __Pyx_RefNannySetupContext(name)
|
|
+ #define __Pyx_RefNannyDeclarations
|
|
+ #define __Pyx_RefNannySetupContext(name, acquire_gil)
|
|
#define __Pyx_RefNannyFinishContext()
|
|
#define __Pyx_INCREF(r) Py_INCREF(r)
|
|
#define __Pyx_DECREF(r) Py_DECREF(r)
|
|
#define __Pyx_GOTREF(r)
|
|
#define __Pyx_GIVEREF(r)
|
|
+ #define __Pyx_XINCREF(r) Py_XINCREF(r)
|
|
#define __Pyx_XDECREF(r) Py_XDECREF(r)
|
|
-#endif /* CYTHON_REFNANNY */
|
|
-#define __Pyx_XGIVEREF(r) do { if((r) != NULL) {__Pyx_GIVEREF(r);} } while(0)
|
|
-#define __Pyx_XGOTREF(r) do { if((r) != NULL) {__Pyx_GOTREF(r);} } while(0)
|
|
+ #define __Pyx_XGOTREF(r)
|
|
+ #define __Pyx_XGIVEREF(r)
|
|
+#endif
|
|
+#define __Pyx_XDECREF_SET(r, v) do {\
|
|
+ PyObject *tmp = (PyObject *) r;\
|
|
+ r = v; __Pyx_XDECREF(tmp);\
|
|
+ } while (0)
|
|
+#define __Pyx_DECREF_SET(r, v) do {\
|
|
+ PyObject *tmp = (PyObject *) r;\
|
|
+ r = v; __Pyx_DECREF(tmp);\
|
|
+ } while (0)
|
|
+#define __Pyx_CLEAR(r) do { PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);} while(0)
|
|
+#define __Pyx_XCLEAR(r) do { if((r) != NULL) {PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);}} while(0)
|
|
+
|
|
+/* PyObjectGetAttrStr.proto */
|
|
+#if CYTHON_USE_TYPE_SLOTS
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject* attr_name);
|
|
+#else
|
|
+#define __Pyx_PyObject_GetAttrStr(o,n) PyObject_GetAttr(o,n)
|
|
+#endif
|
|
|
|
-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
|
|
+/* GetBuiltinName.proto */
|
|
+static PyObject *__Pyx_GetBuiltinName(PyObject *name);
|
|
|
|
+/* RaiseArgTupleInvalid.proto */
|
|
static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,
|
|
- Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); /*proto*/
|
|
-
|
|
-static void __Pyx_RaiseDoubleKeywordsError(
|
|
- const char* func_name, PyObject* kw_name); /*proto*/
|
|
+ Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found);
|
|
|
|
-static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[], PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args, const char* function_name); /*proto*/
|
|
+/* RaiseDoubleKeywords.proto */
|
|
+static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name);
|
|
|
|
+/* ParseKeywords.proto */
|
|
+static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],\
|
|
+ PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,\
|
|
+ const char* function_name);
|
|
+
|
|
+/* Import.proto */
|
|
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level);
|
|
+
|
|
+/* PyFunctionFastCall.proto */
|
|
+#if CYTHON_FAST_PYCALL
|
|
+#define __Pyx_PyFunction_FastCall(func, args, nargs)\
|
|
+ __Pyx_PyFunction_FastCallDict((func), (args), (nargs), NULL)
|
|
+#if 1 || PY_VERSION_HEX < 0x030600B1
|
|
+static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs);
|
|
+#else
|
|
+#define __Pyx_PyFunction_FastCallDict(func, args, nargs, kwargs) _PyFunction_FastCallDict(func, args, nargs, kwargs)
|
|
+#endif
|
|
+#define __Pyx_BUILD_ASSERT_EXPR(cond)\
|
|
+ (sizeof(char [1 - 2*!(cond)]) - 1)
|
|
+#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
|
|
|
|
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
|
|
- PyObject *r;
|
|
- if (!j) return NULL;
|
|
- r = PyObject_GetItem(o, j);
|
|
- Py_DECREF(j);
|
|
- return r;
|
|
-}
|
|
-
|
|
+/* PyObjectCall.proto */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw);
|
|
+#else
|
|
+#define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw)
|
|
+#endif
|
|
|
|
-#define __Pyx_GetItemInt_List(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \
|
|
- __Pyx_GetItemInt_List_Fast(o, i) : \
|
|
- __Pyx_GetItemInt_Generic(o, to_py_func(i)))
|
|
-
|
|
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i) {
|
|
- if (likely(o != Py_None)) {
|
|
- if (likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {
|
|
- PyObject *r = PyList_GET_ITEM(o, i);
|
|
- Py_INCREF(r);
|
|
- return r;
|
|
- }
|
|
- else if ((-PyList_GET_SIZE(o) <= i) & (i < 0)) {
|
|
- PyObject *r = PyList_GET_ITEM(o, PyList_GET_SIZE(o) + i);
|
|
- Py_INCREF(r);
|
|
- return r;
|
|
- }
|
|
- }
|
|
- return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
|
|
-}
|
|
+/* PyObjectCallMethO.proto */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg);
|
|
+#endif
|
|
|
|
-#define __Pyx_GetItemInt_Tuple(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \
|
|
- __Pyx_GetItemInt_Tuple_Fast(o, i) : \
|
|
- __Pyx_GetItemInt_Generic(o, to_py_func(i)))
|
|
-
|
|
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i) {
|
|
- if (likely(o != Py_None)) {
|
|
- if (likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {
|
|
- PyObject *r = PyTuple_GET_ITEM(o, i);
|
|
- Py_INCREF(r);
|
|
- return r;
|
|
- }
|
|
- else if ((-PyTuple_GET_SIZE(o) <= i) & (i < 0)) {
|
|
- PyObject *r = PyTuple_GET_ITEM(o, PyTuple_GET_SIZE(o) + i);
|
|
- Py_INCREF(r);
|
|
- return r;
|
|
- }
|
|
- }
|
|
- return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
|
|
-}
|
|
+/* PyObjectCallNoArg.proto */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func);
|
|
+#else
|
|
+#define __Pyx_PyObject_CallNoArg(func) __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL)
|
|
+#endif
|
|
|
|
+/* PyCFunctionFastCall.proto */
|
|
+#if CYTHON_FAST_PYCCALL
|
|
+static CYTHON_INLINE PyObject *__Pyx_PyCFunction_FastCall(PyObject *func, PyObject **args, Py_ssize_t nargs);
|
|
+#else
|
|
+#define __Pyx_PyCFunction_FastCall(func, args, nargs) (assert(0), NULL)
|
|
+#endif
|
|
|
|
-#define __Pyx_GetItemInt(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \
|
|
- __Pyx_GetItemInt_Fast(o, i) : \
|
|
- __Pyx_GetItemInt_Generic(o, to_py_func(i)))
|
|
+/* PyObjectCallOneArg.proto */
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg);
|
|
|
|
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i) {
|
|
- PyObject *r;
|
|
- if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {
|
|
- r = PyList_GET_ITEM(o, i);
|
|
- Py_INCREF(r);
|
|
- }
|
|
- else if (PyTuple_CheckExact(o) && ((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {
|
|
- r = PyTuple_GET_ITEM(o, i);
|
|
- Py_INCREF(r);
|
|
- }
|
|
- else if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_item && (likely(i >= 0))) {
|
|
- r = PySequence_GetItem(o, i);
|
|
- }
|
|
- else {
|
|
- r = __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
|
|
- }
|
|
- return r;
|
|
+/* PyDictVersioning.proto */
|
|
+#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
|
|
+#define __PYX_DICT_VERSION_INIT ((PY_UINT64_T) -1)
|
|
+#define __PYX_GET_DICT_VERSION(dict) (((PyDictObject*)(dict))->ma_version_tag)
|
|
+#define __PYX_UPDATE_DICT_CACHE(dict, value, cache_var, version_var)\
|
|
+ (version_var) = __PYX_GET_DICT_VERSION(dict);\
|
|
+ (cache_var) = (value);
|
|
+#define __PYX_PY_DICT_LOOKUP_IF_MODIFIED(VAR, DICT, LOOKUP) {\
|
|
+ static PY_UINT64_T __pyx_dict_version = 0;\
|
|
+ static PyObject *__pyx_dict_cached_value = NULL;\
|
|
+ if (likely(__PYX_GET_DICT_VERSION(DICT) == __pyx_dict_version)) {\
|
|
+ (VAR) = __pyx_dict_cached_value;\
|
|
+ } else {\
|
|
+ (VAR) = __pyx_dict_cached_value = (LOOKUP);\
|
|
+ __pyx_dict_version = __PYX_GET_DICT_VERSION(DICT);\
|
|
+ }\
|
|
+}
|
|
+static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj);
|
|
+static CYTHON_INLINE PY_UINT64_T __Pyx_get_object_dict_version(PyObject *obj);
|
|
+static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UINT64_T tp_dict_version, PY_UINT64_T obj_dict_version);
|
|
+#else
|
|
+#define __PYX_GET_DICT_VERSION(dict) (0)
|
|
+#define __PYX_UPDATE_DICT_CACHE(dict, value, cache_var, version_var)
|
|
+#define __PYX_PY_DICT_LOOKUP_IF_MODIFIED(VAR, DICT, LOOKUP) (VAR) = (LOOKUP);
|
|
+#endif
|
|
+
|
|
+/* GetModuleGlobalName.proto */
|
|
+#if CYTHON_USE_DICT_VERSIONS
|
|
+#define __Pyx_GetModuleGlobalName(var, name) {\
|
|
+ static PY_UINT64_T __pyx_dict_version = 0;\
|
|
+ static PyObject *__pyx_dict_cached_value = NULL;\
|
|
+ (var) = (likely(__pyx_dict_version == __PYX_GET_DICT_VERSION(__pyx_d))) ?\
|
|
+ (likely(__pyx_dict_cached_value) ? __Pyx_NewRef(__pyx_dict_cached_value) : __Pyx_GetBuiltinName(name)) :\
|
|
+ __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\
|
|
+}
|
|
+#define __Pyx_GetModuleGlobalNameUncached(var, name) {\
|
|
+ PY_UINT64_T __pyx_dict_version;\
|
|
+ PyObject *__pyx_dict_cached_value;\
|
|
+ (var) = __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\
|
|
}
|
|
+static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value);
|
|
+#else
|
|
+#define __Pyx_GetModuleGlobalName(var, name) (var) = __Pyx__GetModuleGlobalName(name)
|
|
+#define __Pyx_GetModuleGlobalNameUncached(var, name) (var) = __Pyx__GetModuleGlobalName(name)
|
|
+static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name);
|
|
+#endif
|
|
+
|
|
+/* PyIntCompare.proto */
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyInt_EqObjC(PyObject *op1, PyObject *op2, long intval, long inplace);
|
|
+
|
|
+/* PyObjectCall2Args.proto */
|
|
+static CYTHON_UNUSED PyObject* __Pyx_PyObject_Call2Args(PyObject* function, PyObject* arg1, PyObject* arg2);
|
|
+
|
|
+/* GetItemInt.proto */
|
|
+#define __Pyx_GetItemInt(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck)\
|
|
+ (__Pyx_fits_Py_ssize_t(i, type, is_signed) ?\
|
|
+ __Pyx_GetItemInt_Fast(o, (Py_ssize_t)i, is_list, wraparound, boundscheck) :\
|
|
+ (is_list ? (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL) :\
|
|
+ __Pyx_GetItemInt_Generic(o, to_py_func(i))))
|
|
+#define __Pyx_GetItemInt_List(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck)\
|
|
+ (__Pyx_fits_Py_ssize_t(i, type, is_signed) ?\
|
|
+ __Pyx_GetItemInt_List_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) :\
|
|
+ (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL))
|
|
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i,
|
|
+ int wraparound, int boundscheck);
|
|
+#define __Pyx_GetItemInt_Tuple(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck)\
|
|
+ (__Pyx_fits_Py_ssize_t(i, type, is_signed) ?\
|
|
+ __Pyx_GetItemInt_Tuple_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) :\
|
|
+ (PyErr_SetString(PyExc_IndexError, "tuple index out of range"), (PyObject*)NULL))
|
|
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i,
|
|
+ int wraparound, int boundscheck);
|
|
+static PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j);
|
|
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i,
|
|
+ int is_list, int wraparound, int boundscheck);
|
|
+
|
|
+/* PyIntBinop.proto */
|
|
+#if !CYTHON_COMPILING_IN_PYPY
|
|
+static PyObject* __Pyx_PyInt_AddObjC(PyObject *op1, PyObject *op2, long intval, int inplace, int zerodivision_check);
|
|
+#else
|
|
+#define __Pyx_PyInt_AddObjC(op1, op2, intval, inplace, zerodivision_check)\
|
|
+ (inplace ? PyNumber_InPlaceAdd(op1, op2) : PyNumber_Add(op1, op2))
|
|
+#endif
|
|
|
|
-static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
|
|
-
|
|
-static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
|
|
-static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
|
|
-
|
|
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
|
|
-
|
|
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
|
|
-
|
|
-static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject *);
|
|
-
|
|
-static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
|
|
+/* PyObjectFormatAndDecref.proto */
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_FormatSimpleAndDecref(PyObject* s, PyObject* f);
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_FormatAndDecref(PyObject* s, PyObject* f);
|
|
|
|
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
|
|
+/* IncludeStringH.proto */
|
|
+#include <string.h>
|
|
|
|
-static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject *);
|
|
+/* JoinPyUnicode.proto */
|
|
+static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_count, Py_ssize_t result_ulength,
|
|
+ Py_UCS4 max_char);
|
|
|
|
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
|
|
+/* ExtTypeTest.proto */
|
|
+static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type);
|
|
|
|
-static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
|
|
+/* PyThreadStateGet.proto */
|
|
+#if CYTHON_FAST_THREAD_STATE
|
|
+#define __Pyx_PyThreadState_declare PyThreadState *__pyx_tstate;
|
|
+#define __Pyx_PyThreadState_assign __pyx_tstate = __Pyx_PyThreadState_Current;
|
|
+#define __Pyx_PyErr_Occurred() __pyx_tstate->curexc_type
|
|
+#else
|
|
+#define __Pyx_PyThreadState_declare
|
|
+#define __Pyx_PyThreadState_assign
|
|
+#define __Pyx_PyErr_Occurred() PyErr_Occurred()
|
|
+#endif
|
|
+
|
|
+/* PyErrFetchRestore.proto */
|
|
+#if CYTHON_FAST_THREAD_STATE
|
|
+#define __Pyx_PyErr_Clear() __Pyx_ErrRestore(NULL, NULL, NULL)
|
|
+#define __Pyx_ErrRestoreWithState(type, value, tb) __Pyx_ErrRestoreInState(PyThreadState_GET(), type, value, tb)
|
|
+#define __Pyx_ErrFetchWithState(type, value, tb) __Pyx_ErrFetchInState(PyThreadState_GET(), type, value, tb)
|
|
+#define __Pyx_ErrRestore(type, value, tb) __Pyx_ErrRestoreInState(__pyx_tstate, type, value, tb)
|
|
+#define __Pyx_ErrFetch(type, value, tb) __Pyx_ErrFetchInState(__pyx_tstate, type, value, tb)
|
|
+static CYTHON_INLINE void __Pyx_ErrRestoreInState(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb);
|
|
+static CYTHON_INLINE void __Pyx_ErrFetchInState(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+#define __Pyx_PyErr_SetNone(exc) (Py_INCREF(exc), __Pyx_ErrRestore((exc), NULL, NULL))
|
|
+#else
|
|
+#define __Pyx_PyErr_SetNone(exc) PyErr_SetNone(exc)
|
|
+#endif
|
|
+#else
|
|
+#define __Pyx_PyErr_Clear() PyErr_Clear()
|
|
+#define __Pyx_PyErr_SetNone(exc) PyErr_SetNone(exc)
|
|
+#define __Pyx_ErrRestoreWithState(type, value, tb) PyErr_Restore(type, value, tb)
|
|
+#define __Pyx_ErrFetchWithState(type, value, tb) PyErr_Fetch(type, value, tb)
|
|
+#define __Pyx_ErrRestoreInState(tstate, type, value, tb) PyErr_Restore(type, value, tb)
|
|
+#define __Pyx_ErrFetchInState(tstate, type, value, tb) PyErr_Fetch(type, value, tb)
|
|
+#define __Pyx_ErrRestore(type, value, tb) PyErr_Restore(type, value, tb)
|
|
+#define __Pyx_ErrFetch(type, value, tb) PyErr_Fetch(type, value, tb)
|
|
+#endif
|
|
+
|
|
+/* RaiseException.proto */
|
|
+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause);
|
|
+
|
|
+/* TypeImport.proto */
|
|
+#ifndef __PYX_HAVE_RT_ImportType_proto
|
|
+#define __PYX_HAVE_RT_ImportType_proto
|
|
+enum __Pyx_ImportType_CheckSize {
|
|
+ __Pyx_ImportType_CheckSize_Error = 0,
|
|
+ __Pyx_ImportType_CheckSize_Warn = 1,
|
|
+ __Pyx_ImportType_CheckSize_Ignore = 2
|
|
+};
|
|
+static PyTypeObject *__Pyx_ImportType(PyObject* module, const char *module_name, const char *class_name, size_t size, enum __Pyx_ImportType_CheckSize check_size);
|
|
+#endif
|
|
|
|
-static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
|
|
+/* CLineInTraceback.proto */
|
|
+#ifdef CYTHON_CLINE_IN_TRACEBACK
|
|
+#define __Pyx_CLineForTraceback(tstate, c_line) (((CYTHON_CLINE_IN_TRACEBACK)) ? c_line : 0)
|
|
+#else
|
|
+static int __Pyx_CLineForTraceback(PyThreadState *tstate, int c_line);
|
|
+#endif
|
|
|
|
-static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size, int strict); /*proto*/
|
|
+/* CodeObjectCache.proto */
|
|
+typedef struct {
|
|
+ PyCodeObject* code_object;
|
|
+ int code_line;
|
|
+} __Pyx_CodeObjectCacheEntry;
|
|
+struct __Pyx_CodeObjectCache {
|
|
+ int count;
|
|
+ int max_count;
|
|
+ __Pyx_CodeObjectCacheEntry* entries;
|
|
+};
|
|
+static struct __Pyx_CodeObjectCache __pyx_code_cache = {0,0,NULL};
|
|
+static int __pyx_bisect_code_objects(__Pyx_CodeObjectCacheEntry* entries, int count, int code_line);
|
|
+static PyCodeObject *__pyx_find_code_object(int code_line);
|
|
+static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object);
|
|
+
|
|
+/* AddTraceback.proto */
|
|
+static void __Pyx_AddTraceback(const char *funcname, int c_line,
|
|
+ int py_line, const char *filename);
|
|
+
|
|
+/* GCCDiagnostics.proto */
|
|
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
|
|
+#define __Pyx_HAS_GCC_DIAGNOSTIC
|
|
+#endif
|
|
+
|
|
+/* CIntToPy.proto */
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value);
|
|
+
|
|
+/* CIntFromPy.proto */
|
|
+static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *);
|
|
+
|
|
+/* CIntFromPy.proto */
|
|
+static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);
|
|
+
|
|
+/* FastTypeChecks.proto */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+#define __Pyx_TypeCheck(obj, type) __Pyx_IsSubtype(Py_TYPE(obj), (PyTypeObject *)type)
|
|
+static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b);
|
|
+static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObject *type);
|
|
+static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObject *type1, PyObject *type2);
|
|
+#else
|
|
+#define __Pyx_TypeCheck(obj, type) PyObject_TypeCheck(obj, (PyTypeObject *)type)
|
|
+#define __Pyx_PyErr_GivenExceptionMatches(err, type) PyErr_GivenExceptionMatches(err, type)
|
|
+#define __Pyx_PyErr_GivenExceptionMatches2(err, type1, type2) (PyErr_GivenExceptionMatches(err, type1) || PyErr_GivenExceptionMatches(err, type2))
|
|
+#endif
|
|
+#define __Pyx_PyException_Check(obj) __Pyx_TypeCheck(obj, PyExc_Exception)
|
|
|
|
-static PyObject *__Pyx_ImportModule(const char *name); /*proto*/
|
|
+/* CheckBinaryVersion.proto */
|
|
+static int __Pyx_check_binary_version(void);
|
|
|
|
-static void __Pyx_AddTraceback(const char *funcname); /*proto*/
|
|
+/* InitStrings.proto */
|
|
+static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
|
|
|
|
-static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
|
|
-/* Module declarations from numpy */
|
|
|
|
-/* Module declarations from array_ext */
|
|
+/* Module declarations from 'numpy' */
|
|
|
|
+/* Module declarations from 'array_ext' */
|
|
static PyTypeObject *__pyx_ptype_9array_ext_ndarray = 0;
|
|
static PyObject *__pyx_f_9array_ext_c_set_id_type_array(PyArrayObject *, PyArrayObject *); /*proto*/
|
|
static PyObject *__pyx_f_9array_ext_c_set_id_type_array_long(PyArrayObject *, PyArrayObject *); /*proto*/
|
|
#define __Pyx_MODULE_NAME "array_ext"
|
|
-static int __pyx_module_is_main_array_ext = 0;
|
|
+extern int __pyx_module_is_main_array_ext;
|
|
+int __pyx_module_is_main_array_ext = 0;
|
|
|
|
-/* Implementation of array_ext */
|
|
+/* Implementation of 'array_ext' */
|
|
static PyObject *__pyx_builtin_ValueError;
|
|
-static char __pyx_k_1[] = "out_array must be contiguous.";
|
|
-static char __pyx_k_2[] = "id_array must be a two dimensional array.";
|
|
-static char __pyx_k_3[] = "out_array size is incorrect, expected: %s, given: %s";
|
|
-static char __pyx_k_4[] = "Unsupported VTK_ID_TYPE_SIZE=%d";
|
|
-static char __pyx_k_5[] = "\nA Pyrex extension module for numpy. Currently this extension module\nallows us to massage a 2D scipy array into a form usable as a\n`vtkIdTypeArray`. This is then used to set the cells of a\n`vtkCellArray` instance.\n";
|
|
-static char __pyx_k__vtk[] = "vtk";
|
|
-static char __pyx_k__data[] = "data";
|
|
-static char __pyx_k__size[] = "size";
|
|
-static char __pyx_k__dtype[] = "dtype";
|
|
-static char __pyx_k__flags[] = "flags";
|
|
-static char __pyx_k__numpy[] = "numpy";
|
|
-static char __pyx_k__shape[] = "shape";
|
|
-static char __pyx_k__strides[] = "strides";
|
|
-static char __pyx_k____main__[] = "__main__";
|
|
-static char __pyx_k____test__[] = "__test__";
|
|
-static char __pyx_k__id_array[] = "id_array";
|
|
-static char __pyx_k__itemsize[] = "itemsize";
|
|
-static char __pyx_k__array_ext[] = "array_ext";
|
|
-static char __pyx_k__out_array[] = "out_array";
|
|
-static char __pyx_k__ValueError[] = "ValueError";
|
|
-static char __pyx_k__contiguous[] = "contiguous";
|
|
-static char __pyx_k__dimensions[] = "dimensions";
|
|
-static char __pyx_k__issubdtype[] = "issubdtype";
|
|
-static char __pyx_k__signedinteger[] = "signedinteger";
|
|
-static char __pyx_k__vtkIdTypeArray[] = "vtkIdTypeArray";
|
|
-static char __pyx_k__GetDataTypeSize[] = "GetDataTypeSize";
|
|
-static char __pyx_k__set_id_type_array[] = "set_id_type_array";
|
|
-static PyObject *__pyx_kp_s_1;
|
|
-static PyObject *__pyx_kp_s_2;
|
|
-static PyObject *__pyx_kp_s_3;
|
|
-static PyObject *__pyx_kp_s_4;
|
|
-static PyObject *__pyx_n_s__GetDataTypeSize;
|
|
-static PyObject *__pyx_n_s__ValueError;
|
|
-static PyObject *__pyx_n_s____main__;
|
|
-static PyObject *__pyx_n_s____test__;
|
|
-static PyObject *__pyx_n_s__array_ext;
|
|
-static PyObject *__pyx_n_s__contiguous;
|
|
-static PyObject *__pyx_n_s__data;
|
|
-static PyObject *__pyx_n_s__dimensions;
|
|
-static PyObject *__pyx_n_s__dtype;
|
|
-static PyObject *__pyx_n_s__flags;
|
|
-static PyObject *__pyx_n_s__id_array;
|
|
-static PyObject *__pyx_n_s__issubdtype;
|
|
-static PyObject *__pyx_n_s__itemsize;
|
|
-static PyObject *__pyx_n_s__numpy;
|
|
-static PyObject *__pyx_n_s__out_array;
|
|
-static PyObject *__pyx_n_s__set_id_type_array;
|
|
-static PyObject *__pyx_n_s__shape;
|
|
-static PyObject *__pyx_n_s__signedinteger;
|
|
-static PyObject *__pyx_n_s__size;
|
|
-static PyObject *__pyx_n_s__strides;
|
|
-static PyObject *__pyx_n_s__vtk;
|
|
-static PyObject *__pyx_n_s__vtkIdTypeArray;
|
|
+static const char __pyx_k_sz[] = "sz";
|
|
+static const char __pyx_k_shp[] = "shp";
|
|
+static const char __pyx_k_vtk[] = "vtk";
|
|
+static const char __pyx_k_e_sz[] = "e_sz";
|
|
+static const char __pyx_k_main[] = "__main__";
|
|
+static const char __pyx_k_name[] = "__name__";
|
|
+static const char __pyx_k_size[] = "size";
|
|
+static const char __pyx_k_test[] = "__test__";
|
|
+static const char __pyx_k_dtype[] = "dtype";
|
|
+static const char __pyx_k_flags[] = "flags";
|
|
+static const char __pyx_k_given[] = ", given: ";
|
|
+static const char __pyx_k_numpy[] = "numpy";
|
|
+static const char __pyx_k_shape[] = "shape";
|
|
+static const char __pyx_k_import[] = "__import__";
|
|
+static const char __pyx_k_id_array[] = "id_array";
|
|
+static const char __pyx_k_itemsize[] = "itemsize";
|
|
+static const char __pyx_k_array_ext[] = "array_ext";
|
|
+static const char __pyx_k_out_array[] = "out_array";
|
|
+static const char __pyx_k_ValueError[] = "ValueError";
|
|
+static const char __pyx_k_contiguous[] = "contiguous";
|
|
+static const char __pyx_k_issubdtype[] = "issubdtype";
|
|
+static const char __pyx_k_signedinteger[] = "signedinteger";
|
|
+static const char __pyx_k_vtkIdTypeArray[] = "vtkIdTypeArray";
|
|
+static const char __pyx_k_GetDataTypeSize[] = "GetDataTypeSize";
|
|
+static const char __pyx_k_VTK_ID_TYPE_SIZE[] = "VTK_ID_TYPE_SIZE";
|
|
+static const char __pyx_k_set_id_type_array[] = "set_id_type_array";
|
|
+static const char __pyx_k_cline_in_traceback[] = "cline_in_traceback";
|
|
+static const char __pyx_k_tvtk_src_array_ext_pyx[] = "tvtk/src/array_ext.pyx";
|
|
+static const char __pyx_k_out_array_must_be_contiguous[] = "out_array must be contiguous.";
|
|
+static const char __pyx_k_Unsupported_VTK_ID_TYPE_SIZE_d[] = "Unsupported VTK_ID_TYPE_SIZE=%d";
|
|
+static const char __pyx_k_A_Cython_extension_module_for_n[] = "\nA Cython extension module for numpy. Currently this extension module\nallows us to massage a 2D scipy array into a form usable as a\n`vtkIdTypeArray`. This is then used to set the cells of a\n`vtkCellArray` instance.\n";
|
|
+static const char __pyx_k_id_array_must_be_a_two_dimension[] = "id_array must be a two dimensional array.";
|
|
+static const char __pyx_k_out_array_size_is_incorrect_expe[] = "out_array size is incorrect, expected: ";
|
|
+static PyObject *__pyx_n_s_GetDataTypeSize;
|
|
+static PyObject *__pyx_kp_u_Unsupported_VTK_ID_TYPE_SIZE_d;
|
|
+static PyObject *__pyx_n_s_VTK_ID_TYPE_SIZE;
|
|
+static PyObject *__pyx_n_s_ValueError;
|
|
+static PyObject *__pyx_n_s_array_ext;
|
|
+static PyObject *__pyx_n_s_cline_in_traceback;
|
|
+static PyObject *__pyx_n_s_contiguous;
|
|
+static PyObject *__pyx_n_s_dtype;
|
|
+static PyObject *__pyx_n_s_e_sz;
|
|
+static PyObject *__pyx_n_s_flags;
|
|
+static PyObject *__pyx_kp_u_given;
|
|
+static PyObject *__pyx_n_s_id_array;
|
|
+static PyObject *__pyx_kp_u_id_array_must_be_a_two_dimension;
|
|
+static PyObject *__pyx_n_s_import;
|
|
+static PyObject *__pyx_n_s_issubdtype;
|
|
+static PyObject *__pyx_n_s_itemsize;
|
|
+static PyObject *__pyx_n_s_main;
|
|
+static PyObject *__pyx_n_s_name;
|
|
+static PyObject *__pyx_n_s_numpy;
|
|
+static PyObject *__pyx_n_s_out_array;
|
|
+static PyObject *__pyx_kp_u_out_array_must_be_contiguous;
|
|
+static PyObject *__pyx_kp_u_out_array_size_is_incorrect_expe;
|
|
+static PyObject *__pyx_n_s_set_id_type_array;
|
|
+static PyObject *__pyx_n_s_shape;
|
|
+static PyObject *__pyx_n_s_shp;
|
|
+static PyObject *__pyx_n_s_signedinteger;
|
|
+static PyObject *__pyx_n_s_size;
|
|
+static PyObject *__pyx_n_s_sz;
|
|
+static PyObject *__pyx_n_s_test;
|
|
+static PyObject *__pyx_kp_s_tvtk_src_array_ext_pyx;
|
|
+static PyObject *__pyx_n_s_vtk;
|
|
+static PyObject *__pyx_n_s_vtkIdTypeArray;
|
|
+static PyObject *__pyx_pf_9array_ext_set_id_type_array(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_id_array, PyObject *__pyx_v_out_array); /* proto */
|
|
static PyObject *__pyx_int_1;
|
|
static PyObject *__pyx_int_4;
|
|
static PyObject *__pyx_int_8;
|
|
+static PyObject *__pyx_tuple_;
|
|
+static PyObject *__pyx_codeobj__2;
|
|
+/* Late includes */
|
|
|
|
-/* "array_ext.pyx":43
|
|
+/* "array_ext.pyx":46
|
|
* ######################################################################
|
|
*
|
|
* cdef c_set_id_type_array(ndarray id_array, ndarray out_array): # <<<<<<<<<<<<<<
|
|
@@ -559,7 +1405,7 @@
|
|
* # passed out_array such that out_array can be used as a
|
|
*/
|
|
|
|
-static PyObject *__pyx_f_9array_ext_c_set_id_type_array(PyArrayObject *__pyx_v_id_array, PyArrayObject *__pyx_v_out_array) {
|
|
+static PyObject *__pyx_f_9array_ext_c_set_id_type_array(PyArrayObject *__pyx_v_id_array, PyArrayObject *__pyx_v_out_array) {
|
|
int __pyx_v_cell_length;
|
|
int __pyx_v_dim0;
|
|
int *__pyx_v_id_data;
|
|
@@ -571,12 +1417,16 @@
|
|
int __pyx_v_in_idx;
|
|
int __pyx_v_out_idx;
|
|
PyObject *__pyx_r = NULL;
|
|
+ __Pyx_RefNannyDeclarations
|
|
size_t __pyx_t_1;
|
|
int __pyx_t_2;
|
|
int __pyx_t_3;
|
|
- __Pyx_RefNannySetupContext("c_set_id_type_array");
|
|
+ int __pyx_lineno = 0;
|
|
+ const char *__pyx_filename = NULL;
|
|
+ int __pyx_clineno = 0;
|
|
+ __Pyx_RefNannySetupContext("c_set_id_type_array", 0);
|
|
|
|
- /* "array_ext.pyx":58
|
|
+ /* "array_ext.pyx":61
|
|
* cdef int stride0, stride1
|
|
*
|
|
* cell_length = id_array.dimensions[1]; # <<<<<<<<<<<<<<
|
|
@@ -585,7 +1435,7 @@
|
|
*/
|
|
__pyx_v_cell_length = (__pyx_v_id_array->dimensions[1]);
|
|
|
|
- /* "array_ext.pyx":59
|
|
+ /* "array_ext.pyx":62
|
|
*
|
|
* cell_length = id_array.dimensions[1];
|
|
* dim0 = id_array.dimensions[0] # <<<<<<<<<<<<<<
|
|
@@ -594,53 +1444,53 @@
|
|
*/
|
|
__pyx_v_dim0 = (__pyx_v_id_array->dimensions[0]);
|
|
|
|
- /* "array_ext.pyx":60
|
|
+ /* "array_ext.pyx":63
|
|
* cell_length = id_array.dimensions[1];
|
|
* dim0 = id_array.dimensions[0]
|
|
* id_data = <int*> id_array.data # <<<<<<<<<<<<<<
|
|
* out_data = <int*> out_array.data
|
|
- * stride0 = id_array.strides[0]/sizeof(int)
|
|
+ * stride0 = id_array.strides[0]//sizeof(int)
|
|
*/
|
|
__pyx_v_id_data = ((int *)__pyx_v_id_array->data);
|
|
|
|
- /* "array_ext.pyx":61
|
|
+ /* "array_ext.pyx":64
|
|
* dim0 = id_array.dimensions[0]
|
|
* id_data = <int*> id_array.data
|
|
* out_data = <int*> out_array.data # <<<<<<<<<<<<<<
|
|
- * stride0 = id_array.strides[0]/sizeof(int)
|
|
- * stride1 = id_array.strides[1]/sizeof(int)
|
|
+ * stride0 = id_array.strides[0]//sizeof(int)
|
|
+ * stride1 = id_array.strides[1]//sizeof(int)
|
|
*/
|
|
__pyx_v_out_data = ((int *)__pyx_v_out_array->data);
|
|
|
|
- /* "array_ext.pyx":62
|
|
+ /* "array_ext.pyx":65
|
|
* id_data = <int*> id_array.data
|
|
* out_data = <int*> out_array.data
|
|
- * stride0 = id_array.strides[0]/sizeof(int) # <<<<<<<<<<<<<<
|
|
- * stride1 = id_array.strides[1]/sizeof(int)
|
|
+ * stride0 = id_array.strides[0]//sizeof(int) # <<<<<<<<<<<<<<
|
|
+ * stride1 = id_array.strides[1]//sizeof(int)
|
|
*
|
|
*/
|
|
__pyx_t_1 = (sizeof(int));
|
|
if (unlikely(__pyx_t_1 == 0)) {
|
|
- PyErr_Format(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ PyErr_SetString(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
+ __PYX_ERR(0, 65, __pyx_L1_error)
|
|
}
|
|
__pyx_v_stride0 = ((__pyx_v_id_array->strides[0]) / __pyx_t_1);
|
|
|
|
- /* "array_ext.pyx":63
|
|
+ /* "array_ext.pyx":66
|
|
* out_data = <int*> out_array.data
|
|
- * stride0 = id_array.strides[0]/sizeof(int)
|
|
- * stride1 = id_array.strides[1]/sizeof(int) # <<<<<<<<<<<<<<
|
|
+ * stride0 = id_array.strides[0]//sizeof(int)
|
|
+ * stride1 = id_array.strides[1]//sizeof(int) # <<<<<<<<<<<<<<
|
|
*
|
|
* cdef int i, j, in_idx, out_idx
|
|
*/
|
|
__pyx_t_1 = (sizeof(int));
|
|
if (unlikely(__pyx_t_1 == 0)) {
|
|
- PyErr_Format(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ PyErr_SetString(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
+ __PYX_ERR(0, 66, __pyx_L1_error)
|
|
}
|
|
__pyx_v_stride1 = ((__pyx_v_id_array->strides[1]) / __pyx_t_1);
|
|
|
|
- /* "array_ext.pyx":66
|
|
+ /* "array_ext.pyx":69
|
|
*
|
|
* cdef int i, j, in_idx, out_idx
|
|
* for i from 0 <= i < dim0: # <<<<<<<<<<<<<<
|
|
@@ -650,7 +1500,7 @@
|
|
__pyx_t_2 = __pyx_v_dim0;
|
|
for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
|
|
|
|
- /* "array_ext.pyx":67
|
|
+ /* "array_ext.pyx":70
|
|
* cdef int i, j, in_idx, out_idx
|
|
* for i from 0 <= i < dim0:
|
|
* in_idx = i*stride0 # <<<<<<<<<<<<<<
|
|
@@ -659,7 +1509,7 @@
|
|
*/
|
|
__pyx_v_in_idx = (__pyx_v_i * __pyx_v_stride0);
|
|
|
|
- /* "array_ext.pyx":68
|
|
+ /* "array_ext.pyx":71
|
|
* for i from 0 <= i < dim0:
|
|
* in_idx = i*stride0
|
|
* out_idx = i*cell_length + i # <<<<<<<<<<<<<<
|
|
@@ -668,7 +1518,7 @@
|
|
*/
|
|
__pyx_v_out_idx = ((__pyx_v_i * __pyx_v_cell_length) + __pyx_v_i);
|
|
|
|
- /* "array_ext.pyx":69
|
|
+ /* "array_ext.pyx":72
|
|
* in_idx = i*stride0
|
|
* out_idx = i*cell_length + i
|
|
* out_data[out_idx] = cell_length # <<<<<<<<<<<<<<
|
|
@@ -677,7 +1527,7 @@
|
|
*/
|
|
(__pyx_v_out_data[__pyx_v_out_idx]) = __pyx_v_cell_length;
|
|
|
|
- /* "array_ext.pyx":70
|
|
+ /* "array_ext.pyx":73
|
|
* out_idx = i*cell_length + i
|
|
* out_data[out_idx] = cell_length
|
|
* for j from 0 <= j < cell_length: # <<<<<<<<<<<<<<
|
|
@@ -687,7 +1537,7 @@
|
|
__pyx_t_3 = __pyx_v_cell_length;
|
|
for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_3; __pyx_v_j++) {
|
|
|
|
- /* "array_ext.pyx":71
|
|
+ /* "array_ext.pyx":74
|
|
* out_data[out_idx] = cell_length
|
|
* for j from 0 <= j < cell_length:
|
|
* out_data[out_idx + j + 1] = id_data[in_idx + j*stride1] # <<<<<<<<<<<<<<
|
|
@@ -698,10 +1548,19 @@
|
|
}
|
|
}
|
|
|
|
+ /* "array_ext.pyx":46
|
|
+ * ######################################################################
|
|
+ *
|
|
+ * cdef c_set_id_type_array(ndarray id_array, ndarray out_array): # <<<<<<<<<<<<<<
|
|
+ * # This function sets the data of the passed 2D `id_array` into the
|
|
+ * # passed out_array such that out_array can be used as a
|
|
+ */
|
|
+
|
|
+ /* function exit code */
|
|
__pyx_r = Py_None; __Pyx_INCREF(Py_None);
|
|
goto __pyx_L0;
|
|
__pyx_L1_error:;
|
|
- __Pyx_AddTraceback("array_ext.c_set_id_type_array");
|
|
+ __Pyx_AddTraceback("array_ext.c_set_id_type_array", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
|
__pyx_r = 0;
|
|
__pyx_L0:;
|
|
__Pyx_XGIVEREF(__pyx_r);
|
|
@@ -709,7 +1568,7 @@
|
|
return __pyx_r;
|
|
}
|
|
|
|
-/* "array_ext.pyx":73
|
|
+/* "array_ext.pyx":76
|
|
* out_data[out_idx + j + 1] = id_data[in_idx + j*stride1]
|
|
*
|
|
* cdef c_set_id_type_array_long(ndarray id_array, ndarray out_array): # <<<<<<<<<<<<<<
|
|
@@ -717,7 +1576,7 @@
|
|
* # passed out_array such that out_array can be used as a
|
|
*/
|
|
|
|
-static PyObject *__pyx_f_9array_ext_c_set_id_type_array_long(PyArrayObject *__pyx_v_id_array, PyArrayObject *__pyx_v_out_array) {
|
|
+static PyObject *__pyx_f_9array_ext_c_set_id_type_array_long(PyArrayObject *__pyx_v_id_array, PyArrayObject *__pyx_v_out_array) {
|
|
Py_ssize_t __pyx_v_cell_length;
|
|
Py_ssize_t __pyx_v_dim0;
|
|
Py_ssize_t *__pyx_v_id_data;
|
|
@@ -729,12 +1588,16 @@
|
|
int __pyx_v_in_idx;
|
|
int __pyx_v_out_idx;
|
|
PyObject *__pyx_r = NULL;
|
|
+ __Pyx_RefNannyDeclarations
|
|
size_t __pyx_t_1;
|
|
Py_ssize_t __pyx_t_2;
|
|
Py_ssize_t __pyx_t_3;
|
|
- __Pyx_RefNannySetupContext("c_set_id_type_array_long");
|
|
+ int __pyx_lineno = 0;
|
|
+ const char *__pyx_filename = NULL;
|
|
+ int __pyx_clineno = 0;
|
|
+ __Pyx_RefNannySetupContext("c_set_id_type_array_long", 0);
|
|
|
|
- /* "array_ext.pyx":87
|
|
+ /* "array_ext.pyx":90
|
|
* cdef Py_ssize_t stride0, stride1
|
|
*
|
|
* cell_length = id_array.dimensions[1]; # <<<<<<<<<<<<<<
|
|
@@ -743,7 +1606,7 @@
|
|
*/
|
|
__pyx_v_cell_length = (__pyx_v_id_array->dimensions[1]);
|
|
|
|
- /* "array_ext.pyx":88
|
|
+ /* "array_ext.pyx":91
|
|
*
|
|
* cell_length = id_array.dimensions[1];
|
|
* dim0 = id_array.dimensions[0] # <<<<<<<<<<<<<<
|
|
@@ -752,53 +1615,53 @@
|
|
*/
|
|
__pyx_v_dim0 = (__pyx_v_id_array->dimensions[0]);
|
|
|
|
- /* "array_ext.pyx":89
|
|
+ /* "array_ext.pyx":92
|
|
* cell_length = id_array.dimensions[1];
|
|
* dim0 = id_array.dimensions[0]
|
|
* id_data = <Py_ssize_t*> id_array.data # <<<<<<<<<<<<<<
|
|
* out_data = <Py_ssize_t*> out_array.data
|
|
- * stride0 = id_array.strides[0]/sizeof(Py_ssize_t)
|
|
+ * stride0 = id_array.strides[0]//sizeof(Py_ssize_t)
|
|
*/
|
|
__pyx_v_id_data = ((Py_ssize_t *)__pyx_v_id_array->data);
|
|
|
|
- /* "array_ext.pyx":90
|
|
+ /* "array_ext.pyx":93
|
|
* dim0 = id_array.dimensions[0]
|
|
* id_data = <Py_ssize_t*> id_array.data
|
|
* out_data = <Py_ssize_t*> out_array.data # <<<<<<<<<<<<<<
|
|
- * stride0 = id_array.strides[0]/sizeof(Py_ssize_t)
|
|
- * stride1 = id_array.strides[1]/sizeof(Py_ssize_t)
|
|
+ * stride0 = id_array.strides[0]//sizeof(Py_ssize_t)
|
|
+ * stride1 = id_array.strides[1]//sizeof(Py_ssize_t)
|
|
*/
|
|
__pyx_v_out_data = ((Py_ssize_t *)__pyx_v_out_array->data);
|
|
|
|
- /* "array_ext.pyx":91
|
|
+ /* "array_ext.pyx":94
|
|
* id_data = <Py_ssize_t*> id_array.data
|
|
* out_data = <Py_ssize_t*> out_array.data
|
|
- * stride0 = id_array.strides[0]/sizeof(Py_ssize_t) # <<<<<<<<<<<<<<
|
|
- * stride1 = id_array.strides[1]/sizeof(Py_ssize_t)
|
|
+ * stride0 = id_array.strides[0]//sizeof(Py_ssize_t) # <<<<<<<<<<<<<<
|
|
+ * stride1 = id_array.strides[1]//sizeof(Py_ssize_t)
|
|
*
|
|
*/
|
|
__pyx_t_1 = (sizeof(Py_ssize_t));
|
|
if (unlikely(__pyx_t_1 == 0)) {
|
|
- PyErr_Format(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ PyErr_SetString(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
+ __PYX_ERR(0, 94, __pyx_L1_error)
|
|
}
|
|
__pyx_v_stride0 = ((__pyx_v_id_array->strides[0]) / __pyx_t_1);
|
|
|
|
- /* "array_ext.pyx":92
|
|
+ /* "array_ext.pyx":95
|
|
* out_data = <Py_ssize_t*> out_array.data
|
|
- * stride0 = id_array.strides[0]/sizeof(Py_ssize_t)
|
|
- * stride1 = id_array.strides[1]/sizeof(Py_ssize_t) # <<<<<<<<<<<<<<
|
|
+ * stride0 = id_array.strides[0]//sizeof(Py_ssize_t)
|
|
+ * stride1 = id_array.strides[1]//sizeof(Py_ssize_t) # <<<<<<<<<<<<<<
|
|
*
|
|
* cdef int i, j, in_idx, out_idx
|
|
*/
|
|
__pyx_t_1 = (sizeof(Py_ssize_t));
|
|
if (unlikely(__pyx_t_1 == 0)) {
|
|
- PyErr_Format(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ PyErr_SetString(PyExc_ZeroDivisionError, "integer division or modulo by zero");
|
|
+ __PYX_ERR(0, 95, __pyx_L1_error)
|
|
}
|
|
__pyx_v_stride1 = ((__pyx_v_id_array->strides[1]) / __pyx_t_1);
|
|
|
|
- /* "array_ext.pyx":95
|
|
+ /* "array_ext.pyx":98
|
|
*
|
|
* cdef int i, j, in_idx, out_idx
|
|
* for i from 0 <= i < dim0: # <<<<<<<<<<<<<<
|
|
@@ -808,7 +1671,7 @@
|
|
__pyx_t_2 = __pyx_v_dim0;
|
|
for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
|
|
|
|
- /* "array_ext.pyx":96
|
|
+ /* "array_ext.pyx":99
|
|
* cdef int i, j, in_idx, out_idx
|
|
* for i from 0 <= i < dim0:
|
|
* in_idx = i*stride0 # <<<<<<<<<<<<<<
|
|
@@ -817,7 +1680,7 @@
|
|
*/
|
|
__pyx_v_in_idx = (__pyx_v_i * __pyx_v_stride0);
|
|
|
|
- /* "array_ext.pyx":97
|
|
+ /* "array_ext.pyx":100
|
|
* for i from 0 <= i < dim0:
|
|
* in_idx = i*stride0
|
|
* out_idx = i*cell_length + i # <<<<<<<<<<<<<<
|
|
@@ -826,7 +1689,7 @@
|
|
*/
|
|
__pyx_v_out_idx = ((__pyx_v_i * __pyx_v_cell_length) + __pyx_v_i);
|
|
|
|
- /* "array_ext.pyx":98
|
|
+ /* "array_ext.pyx":101
|
|
* in_idx = i*stride0
|
|
* out_idx = i*cell_length + i
|
|
* out_data[out_idx] = cell_length # <<<<<<<<<<<<<<
|
|
@@ -835,7 +1698,7 @@
|
|
*/
|
|
(__pyx_v_out_data[__pyx_v_out_idx]) = __pyx_v_cell_length;
|
|
|
|
- /* "array_ext.pyx":99
|
|
+ /* "array_ext.pyx":102
|
|
* out_idx = i*cell_length + i
|
|
* out_data[out_idx] = cell_length
|
|
* for j from 0 <= j < cell_length: # <<<<<<<<<<<<<<
|
|
@@ -845,7 +1708,7 @@
|
|
__pyx_t_3 = __pyx_v_cell_length;
|
|
for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_3; __pyx_v_j++) {
|
|
|
|
- /* "array_ext.pyx":100
|
|
+ /* "array_ext.pyx":103
|
|
* out_data[out_idx] = cell_length
|
|
* for j from 0 <= j < cell_length:
|
|
* out_data[out_idx + j + 1] = id_data[in_idx + j*stride1] # <<<<<<<<<<<<<<
|
|
@@ -856,10 +1719,19 @@
|
|
}
|
|
}
|
|
|
|
+ /* "array_ext.pyx":76
|
|
+ * out_data[out_idx + j + 1] = id_data[in_idx + j*stride1]
|
|
+ *
|
|
+ * cdef c_set_id_type_array_long(ndarray id_array, ndarray out_array): # <<<<<<<<<<<<<<
|
|
+ * # This function sets the data of the passed 2D `id_array` into the
|
|
+ * # passed out_array such that out_array can be used as a
|
|
+ */
|
|
+
|
|
+ /* function exit code */
|
|
__pyx_r = Py_None; __Pyx_INCREF(Py_None);
|
|
goto __pyx_L0;
|
|
__pyx_L1_error:;
|
|
- __Pyx_AddTraceback("array_ext.c_set_id_type_array_long");
|
|
+ __Pyx_AddTraceback("array_ext.c_set_id_type_array_long", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
|
__pyx_r = 0;
|
|
__pyx_L0:;
|
|
__Pyx_XGIVEREF(__pyx_r);
|
|
@@ -867,7 +1739,7 @@
|
|
return __pyx_r;
|
|
}
|
|
|
|
-/* "array_ext.pyx":106
|
|
+/* "array_ext.pyx":109
|
|
* ######################################################################
|
|
*
|
|
* def set_id_type_array(id_array, out_array): # <<<<<<<<<<<<<<
|
|
@@ -875,111 +1747,154 @@
|
|
* array (`out_array`) having the correct size, this function sets
|
|
*/
|
|
|
|
-static PyObject *__pyx_pf_9array_ext_set_id_type_array(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
|
|
+/* Python wrapper */
|
|
+static PyObject *__pyx_pw_9array_ext_1set_id_type_array(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
|
|
static char __pyx_doc_9array_ext_set_id_type_array[] = "Given a 2D Int array (`id_array`), and a contiguous 1D numarray\n array (`out_array`) having the correct size, this function sets\n the data from `id_array` into `out_array` so that it can be used\n in place of a `vtkIdTypeArray` in order to set the cells of a\n `vtkCellArray`.\n\n Note that if `shape = id_array.shape` then `size(out_array) ==\n shape[0]*(shape[1] + 1)` should be true. If not you'll get an\n `AssertionError`.\n\n `id_array` need not be contiguous but `out_array` must be.\n ";
|
|
-static PyMethodDef __pyx_mdef_9array_ext_set_id_type_array = {__Pyx_NAMESTR("set_id_type_array"), (PyCFunction)__pyx_pf_9array_ext_set_id_type_array, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_9array_ext_set_id_type_array)};
|
|
-static PyObject *__pyx_pf_9array_ext_set_id_type_array(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
|
|
+static PyMethodDef __pyx_mdef_9array_ext_1set_id_type_array = {"set_id_type_array", (PyCFunction)(void*)(PyCFunctionWithKeywords)__pyx_pw_9array_ext_1set_id_type_array, METH_VARARGS|METH_KEYWORDS, __pyx_doc_9array_ext_set_id_type_array};
|
|
+static PyObject *__pyx_pw_9array_ext_1set_id_type_array(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
|
|
PyObject *__pyx_v_id_array = 0;
|
|
PyObject *__pyx_v_out_array = 0;
|
|
- PyObject *__pyx_v_vtk;
|
|
- PyObject *__pyx_v_VTK_ID_TYPE_SIZE;
|
|
- PyObject *__pyx_v_shp;
|
|
- PyObject *__pyx_v_sz;
|
|
- PyObject *__pyx_v_e_sz;
|
|
- PyObject *__pyx_r = NULL;
|
|
- PyObject *__pyx_t_1 = NULL;
|
|
- PyObject *__pyx_t_2 = NULL;
|
|
- PyObject *__pyx_t_3 = NULL;
|
|
- PyObject *__pyx_t_4 = NULL;
|
|
- int __pyx_t_5;
|
|
- int __pyx_t_6;
|
|
- int __pyx_t_7;
|
|
- Py_ssize_t __pyx_t_8;
|
|
- static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__id_array,&__pyx_n_s__out_array,0};
|
|
- __Pyx_RefNannySetupContext("set_id_type_array");
|
|
- __pyx_self = __pyx_self;
|
|
- if (unlikely(__pyx_kwds)) {
|
|
- Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
|
|
+ int __pyx_lineno = 0;
|
|
+ const char *__pyx_filename = NULL;
|
|
+ int __pyx_clineno = 0;
|
|
+ PyObject *__pyx_r = 0;
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("set_id_type_array (wrapper)", 0);
|
|
+ {
|
|
+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_id_array,&__pyx_n_s_out_array,0};
|
|
PyObject* values[2] = {0,0};
|
|
- switch (PyTuple_GET_SIZE(__pyx_args)) {
|
|
- case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
|
|
- case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
|
|
- case 0: break;
|
|
- default: goto __pyx_L5_argtuple_error;
|
|
- }
|
|
- switch (PyTuple_GET_SIZE(__pyx_args)) {
|
|
- case 0:
|
|
- values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__id_array);
|
|
- if (likely(values[0])) kw_args--;
|
|
- else goto __pyx_L5_argtuple_error;
|
|
- case 1:
|
|
- values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__out_array);
|
|
- if (likely(values[1])) kw_args--;
|
|
- else {
|
|
- __Pyx_RaiseArgtupleInvalid("set_id_type_array", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
|
|
+ if (unlikely(__pyx_kwds)) {
|
|
+ Py_ssize_t kw_args;
|
|
+ const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args);
|
|
+ switch (pos_args) {
|
|
+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case 0: break;
|
|
+ default: goto __pyx_L5_argtuple_error;
|
|
}
|
|
- }
|
|
- if (unlikely(kw_args > 0)) {
|
|
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "set_id_type_array") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
|
|
+ kw_args = PyDict_Size(__pyx_kwds);
|
|
+ switch (pos_args) {
|
|
+ case 0:
|
|
+ if (likely((values[0] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_id_array)) != 0)) kw_args--;
|
|
+ else goto __pyx_L5_argtuple_error;
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case 1:
|
|
+ if (likely((values[1] = __Pyx_PyDict_GetItemStr(__pyx_kwds, __pyx_n_s_out_array)) != 0)) kw_args--;
|
|
+ else {
|
|
+ __Pyx_RaiseArgtupleInvalid("set_id_type_array", 1, 2, 2, 1); __PYX_ERR(0, 109, __pyx_L3_error)
|
|
+ }
|
|
+ }
|
|
+ if (unlikely(kw_args > 0)) {
|
|
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "set_id_type_array") < 0)) __PYX_ERR(0, 109, __pyx_L3_error)
|
|
+ }
|
|
+ } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {
|
|
+ goto __pyx_L5_argtuple_error;
|
|
+ } else {
|
|
+ values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
|
|
+ values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
|
|
}
|
|
__pyx_v_id_array = values[0];
|
|
__pyx_v_out_array = values[1];
|
|
- } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {
|
|
- goto __pyx_L5_argtuple_error;
|
|
- } else {
|
|
- __pyx_v_id_array = PyTuple_GET_ITEM(__pyx_args, 0);
|
|
- __pyx_v_out_array = PyTuple_GET_ITEM(__pyx_args, 1);
|
|
}
|
|
goto __pyx_L4_argument_unpacking_done;
|
|
__pyx_L5_argtuple_error:;
|
|
- __Pyx_RaiseArgtupleInvalid("set_id_type_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
|
|
+ __Pyx_RaiseArgtupleInvalid("set_id_type_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 109, __pyx_L3_error)
|
|
__pyx_L3_error:;
|
|
- __Pyx_AddTraceback("array_ext.set_id_type_array");
|
|
+ __Pyx_AddTraceback("array_ext.set_id_type_array", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
|
__Pyx_RefNannyFinishContext();
|
|
return NULL;
|
|
__pyx_L4_argument_unpacking_done:;
|
|
- __pyx_v_vtk = Py_None; __Pyx_INCREF(Py_None);
|
|
- __pyx_v_VTK_ID_TYPE_SIZE = Py_None; __Pyx_INCREF(Py_None);
|
|
- __pyx_v_shp = Py_None; __Pyx_INCREF(Py_None);
|
|
- __pyx_v_sz = Py_None; __Pyx_INCREF(Py_None);
|
|
- __pyx_v_e_sz = Py_None; __Pyx_INCREF(Py_None);
|
|
+ __pyx_r = __pyx_pf_9array_ext_set_id_type_array(__pyx_self, __pyx_v_id_array, __pyx_v_out_array);
|
|
+
|
|
+ /* function exit code */
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return __pyx_r;
|
|
+}
|
|
+
|
|
+static PyObject *__pyx_pf_9array_ext_set_id_type_array(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_id_array, PyObject *__pyx_v_out_array) {
|
|
+ PyObject *__pyx_v_vtk = NULL;
|
|
+ PyObject *__pyx_v_VTK_ID_TYPE_SIZE = NULL;
|
|
+ PyObject *__pyx_v_shp = NULL;
|
|
+ PyObject *__pyx_v_sz = NULL;
|
|
+ PyObject *__pyx_v_e_sz = NULL;
|
|
+ PyObject *__pyx_r = NULL;
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ PyObject *__pyx_t_1 = NULL;
|
|
+ PyObject *__pyx_t_2 = NULL;
|
|
+ PyObject *__pyx_t_3 = NULL;
|
|
+ PyObject *__pyx_t_4 = NULL;
|
|
+ int __pyx_t_5;
|
|
+ PyObject *__pyx_t_6 = NULL;
|
|
+ int __pyx_t_7;
|
|
+ PyObject *__pyx_t_8 = NULL;
|
|
+ int __pyx_t_9;
|
|
+ Py_ssize_t __pyx_t_10;
|
|
+ Py_UCS4 __pyx_t_11;
|
|
+ int __pyx_lineno = 0;
|
|
+ const char *__pyx_filename = NULL;
|
|
+ int __pyx_clineno = 0;
|
|
+ __Pyx_RefNannySetupContext("set_id_type_array", 0);
|
|
|
|
- /* "array_ext.pyx":119
|
|
+ /* "array_ext.pyx":122
|
|
* `id_array` need not be contiguous but `out_array` must be.
|
|
* """
|
|
* import vtk # <<<<<<<<<<<<<<
|
|
* VTK_ID_TYPE_SIZE = vtk.vtkIdTypeArray().GetDataTypeSize()
|
|
* assert numpy.issubdtype(id_array.dtype, numpy.signedinteger) and \
|
|
*/
|
|
- __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__vtk), 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_vtk, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error)
|
|
__Pyx_GOTREF(__pyx_t_1);
|
|
- __Pyx_DECREF(__pyx_v_vtk);
|
|
__pyx_v_vtk = __pyx_t_1;
|
|
__pyx_t_1 = 0;
|
|
|
|
- /* "array_ext.pyx":120
|
|
+ /* "array_ext.pyx":123
|
|
* """
|
|
* import vtk
|
|
* VTK_ID_TYPE_SIZE = vtk.vtkIdTypeArray().GetDataTypeSize() # <<<<<<<<<<<<<<
|
|
* assert numpy.issubdtype(id_array.dtype, numpy.signedinteger) and \
|
|
* id_array.dtype.itemsize == VTK_ID_TYPE_SIZE
|
|
*/
|
|
- __pyx_t_1 = PyObject_GetAttr(__pyx_v_vtk, __pyx_n_s__vtkIdTypeArray); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_1);
|
|
- __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_vtk, __pyx_n_s_vtkIdTypeArray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 123, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_3);
|
|
+ __pyx_t_4 = NULL;
|
|
+ if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) {
|
|
+ __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3);
|
|
+ if (likely(__pyx_t_4)) {
|
|
+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
|
|
+ __Pyx_INCREF(__pyx_t_4);
|
|
+ __Pyx_INCREF(function);
|
|
+ __Pyx_DECREF_SET(__pyx_t_3, function);
|
|
+ }
|
|
+ }
|
|
+ __pyx_t_2 = (__pyx_t_4) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_4) : __Pyx_PyObject_CallNoArg(__pyx_t_3);
|
|
+ __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
+ if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 123, __pyx_L1_error)
|
|
__Pyx_GOTREF(__pyx_t_2);
|
|
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
- __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__GetDataTypeSize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_1);
|
|
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_GetDataTypeSize); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 123, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_3);
|
|
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
- __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_2);
|
|
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
- __Pyx_DECREF(__pyx_v_VTK_ID_TYPE_SIZE);
|
|
- __pyx_v_VTK_ID_TYPE_SIZE = __pyx_t_2;
|
|
- __pyx_t_2 = 0;
|
|
+ __pyx_t_2 = NULL;
|
|
+ if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) {
|
|
+ __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3);
|
|
+ if (likely(__pyx_t_2)) {
|
|
+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
|
|
+ __Pyx_INCREF(__pyx_t_2);
|
|
+ __Pyx_INCREF(function);
|
|
+ __Pyx_DECREF_SET(__pyx_t_3, function);
|
|
+ }
|
|
+ }
|
|
+ __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2) : __Pyx_PyObject_CallNoArg(__pyx_t_3);
|
|
+ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 123, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
+ __pyx_v_VTK_ID_TYPE_SIZE = __pyx_t_1;
|
|
+ __pyx_t_1 = 0;
|
|
|
|
- /* "array_ext.pyx":121
|
|
+ /* "array_ext.pyx":124
|
|
* import vtk
|
|
* VTK_ID_TYPE_SIZE = vtk.vtkIdTypeArray().GetDataTypeSize()
|
|
* assert numpy.issubdtype(id_array.dtype, numpy.signedinteger) and \ # <<<<<<<<<<<<<<
|
|
@@ -987,62 +1902,102 @@
|
|
*
|
|
*/
|
|
#ifndef CYTHON_WITHOUT_ASSERTIONS
|
|
- __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__numpy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_2);
|
|
- __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__issubdtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_1);
|
|
- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
- __pyx_t_2 = PyObject_GetAttr(__pyx_v_id_array, __pyx_n_s__dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_2);
|
|
- __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__numpy); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__signedinteger); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
|
|
- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
|
|
- __Pyx_GIVEREF(__pyx_t_2);
|
|
- PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4);
|
|
- __Pyx_GIVEREF(__pyx_t_4);
|
|
- __pyx_t_2 = 0;
|
|
- __pyx_t_4 = 0;
|
|
- __pyx_t_4 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
|
|
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- if (__pyx_t_5) {
|
|
+ if (unlikely(!Py_OptimizeFlag)) {
|
|
+ __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_numpy); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_3);
|
|
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_issubdtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_id_array, __pyx_n_s_dtype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_3);
|
|
+ __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_numpy); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_4);
|
|
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_signedinteger); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_6);
|
|
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
+ __pyx_t_4 = NULL;
|
|
+ __pyx_t_7 = 0;
|
|
+ if (CYTHON_UNPACK_METHODS && unlikely(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_INCREF(function);
|
|
+ __Pyx_DECREF_SET(__pyx_t_2, function);
|
|
+ __pyx_t_7 = 1;
|
|
+ }
|
|
+ }
|
|
+ #if CYTHON_FAST_PYCALL
|
|
+ if (PyFunction_Check(__pyx_t_2)) {
|
|
+ PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_t_3, __pyx_t_6};
|
|
+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
|
|
+ } else
|
|
+ #endif
|
|
+ #if CYTHON_FAST_PYCCALL
|
|
+ if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) {
|
|
+ PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_t_3, __pyx_t_6};
|
|
+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
|
|
+ } else
|
|
+ #endif
|
|
+ {
|
|
+ __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_8);
|
|
+ if (__pyx_t_4) {
|
|
+ __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_4); __pyx_t_4 = NULL;
|
|
+ }
|
|
+ __Pyx_GIVEREF(__pyx_t_3);
|
|
+ PyTuple_SET_ITEM(__pyx_t_8, 0+__pyx_t_7, __pyx_t_3);
|
|
+ __Pyx_GIVEREF(__pyx_t_6);
|
|
+ PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_t_6);
|
|
+ __pyx_t_3 = 0;
|
|
+ __pyx_t_6 = 0;
|
|
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
|
+ }
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
+ if (__pyx_t_9) {
|
|
+ } else {
|
|
+ __pyx_t_5 = __pyx_t_9;
|
|
+ goto __pyx_L3_bool_binop_done;
|
|
+ }
|
|
|
|
- /* "array_ext.pyx":122
|
|
+ /* "array_ext.pyx":125
|
|
* VTK_ID_TYPE_SIZE = vtk.vtkIdTypeArray().GetDataTypeSize()
|
|
* assert numpy.issubdtype(id_array.dtype, numpy.signedinteger) and \
|
|
* id_array.dtype.itemsize == VTK_ID_TYPE_SIZE # <<<<<<<<<<<<<<
|
|
*
|
|
* assert out_array.flags.contiguous == 1, \
|
|
*/
|
|
- __pyx_t_4 = PyObject_GetAttr(__pyx_v_id_array, __pyx_n_s__dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __pyx_t_3 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__itemsize); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_v_VTK_ID_TYPE_SIZE, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- __pyx_t_7 = __pyx_t_6;
|
|
- } else {
|
|
- __pyx_t_7 = __pyx_t_5;
|
|
- }
|
|
- if (unlikely(!__pyx_t_7)) {
|
|
- PyErr_SetNone(PyExc_AssertionError);
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_id_array, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 125, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_itemsize); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 125, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_v_VTK_ID_TYPE_SIZE, Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 125, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(0, 125, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
+ __pyx_t_5 = __pyx_t_9;
|
|
+ __pyx_L3_bool_binop_done:;
|
|
+ if (unlikely(!__pyx_t_5)) {
|
|
+ PyErr_SetNone(PyExc_AssertionError);
|
|
+ __PYX_ERR(0, 124, __pyx_L1_error)
|
|
+ }
|
|
}
|
|
#endif
|
|
|
|
- /* "array_ext.pyx":124
|
|
+ /* "array_ext.pyx":127
|
|
* id_array.dtype.itemsize == VTK_ID_TYPE_SIZE
|
|
*
|
|
* assert out_array.flags.contiguous == 1, \ # <<<<<<<<<<<<<<
|
|
@@ -1050,36 +2005,37 @@
|
|
*
|
|
*/
|
|
#ifndef CYTHON_WITHOUT_ASSERTIONS
|
|
- __pyx_t_4 = PyObject_GetAttr(__pyx_v_out_array, __pyx_n_s__flags); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __pyx_t_3 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__contiguous); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_int_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- if (unlikely(!__pyx_t_7)) {
|
|
- PyErr_SetObject(PyExc_AssertionError, ((PyObject *)__pyx_kp_s_1));
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ if (unlikely(!Py_OptimizeFlag)) {
|
|
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_out_array, __pyx_n_s_flags); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 127, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_contiguous); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
+ __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_t_2, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 127, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 127, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
+ if (unlikely(!__pyx_t_5)) {
|
|
+ PyErr_SetObject(PyExc_AssertionError, __pyx_kp_u_out_array_must_be_contiguous);
|
|
+ __PYX_ERR(0, 127, __pyx_L1_error)
|
|
+ }
|
|
}
|
|
#endif
|
|
|
|
- /* "array_ext.pyx":127
|
|
+ /* "array_ext.pyx":130
|
|
* "out_array must be contiguous."
|
|
*
|
|
* shp = id_array.shape # <<<<<<<<<<<<<<
|
|
* assert len(shp) == 2, "id_array must be a two dimensional array."
|
|
*
|
|
*/
|
|
- __pyx_t_4 = PyObject_GetAttr(__pyx_v_id_array, __pyx_n_s__shape); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __Pyx_DECREF(__pyx_v_shp);
|
|
- __pyx_v_shp = __pyx_t_4;
|
|
- __pyx_t_4 = 0;
|
|
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_id_array, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 130, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __pyx_v_shp = __pyx_t_1;
|
|
+ __pyx_t_1 = 0;
|
|
|
|
- /* "array_ext.pyx":128
|
|
+ /* "array_ext.pyx":131
|
|
*
|
|
* shp = id_array.shape
|
|
* assert len(shp) == 2, "id_array must be a two dimensional array." # <<<<<<<<<<<<<<
|
|
@@ -1087,61 +2043,67 @@
|
|
* sz = numpy.size(out_array)
|
|
*/
|
|
#ifndef CYTHON_WITHOUT_ASSERTIONS
|
|
- __pyx_t_8 = PyObject_Length(__pyx_v_shp); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- if (unlikely(!(__pyx_t_8 == 2))) {
|
|
- PyErr_SetObject(PyExc_AssertionError, ((PyObject *)__pyx_kp_s_2));
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ if (unlikely(!Py_OptimizeFlag)) {
|
|
+ __pyx_t_10 = PyObject_Length(__pyx_v_shp); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(0, 131, __pyx_L1_error)
|
|
+ if (unlikely(!((__pyx_t_10 == 2) != 0))) {
|
|
+ PyErr_SetObject(PyExc_AssertionError, __pyx_kp_u_id_array_must_be_a_two_dimension);
|
|
+ __PYX_ERR(0, 131, __pyx_L1_error)
|
|
+ }
|
|
}
|
|
#endif
|
|
|
|
- /* "array_ext.pyx":130
|
|
+ /* "array_ext.pyx":133
|
|
* assert len(shp) == 2, "id_array must be a two dimensional array."
|
|
*
|
|
* sz = numpy.size(out_array) # <<<<<<<<<<<<<<
|
|
* e_sz = shp[0]*(shp[1]+1)
|
|
* assert sz == e_sz, \
|
|
*/
|
|
- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__numpy); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __pyx_t_3 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__size); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(((PyObject *)__pyx_t_4));
|
|
- __Pyx_INCREF(__pyx_v_out_array);
|
|
- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_out_array);
|
|
- __Pyx_GIVEREF(__pyx_v_out_array);
|
|
- __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_numpy); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_size); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 133, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_8);
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ __pyx_t_2 = NULL;
|
|
+ if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_8))) {
|
|
+ __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_8);
|
|
+ if (likely(__pyx_t_2)) {
|
|
+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8);
|
|
+ __Pyx_INCREF(__pyx_t_2);
|
|
+ __Pyx_INCREF(function);
|
|
+ __Pyx_DECREF_SET(__pyx_t_8, function);
|
|
+ }
|
|
+ }
|
|
+ __pyx_t_1 = (__pyx_t_2) ? __Pyx_PyObject_Call2Args(__pyx_t_8, __pyx_t_2, __pyx_v_out_array) : __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_v_out_array);
|
|
+ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 133, __pyx_L1_error)
|
|
__Pyx_GOTREF(__pyx_t_1);
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
|
|
- __Pyx_DECREF(__pyx_v_sz);
|
|
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
|
__pyx_v_sz = __pyx_t_1;
|
|
__pyx_t_1 = 0;
|
|
|
|
- /* "array_ext.pyx":131
|
|
+ /* "array_ext.pyx":134
|
|
*
|
|
* sz = numpy.size(out_array)
|
|
* e_sz = shp[0]*(shp[1]+1) # <<<<<<<<<<<<<<
|
|
* assert sz == e_sz, \
|
|
* "out_array size is incorrect, expected: %s, given: %s"%(e_sz, sz)
|
|
*/
|
|
- __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_shp, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_shp, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 134, __pyx_L1_error)
|
|
__Pyx_GOTREF(__pyx_t_1);
|
|
- __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_shp, 1, sizeof(long), PyInt_FromLong); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_int_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- __pyx_t_4 = PyNumber_Multiply(__pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
+ __pyx_t_8 = __Pyx_GetItemInt(__pyx_v_shp, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 134, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_8);
|
|
+ __pyx_t_2 = __Pyx_PyInt_AddObjC(__pyx_t_8, __pyx_int_1, 1, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
|
+ __pyx_t_8 = PyNumber_Multiply(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 134, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_8);
|
|
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- __Pyx_DECREF(__pyx_v_e_sz);
|
|
- __pyx_v_e_sz = __pyx_t_4;
|
|
- __pyx_t_4 = 0;
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ __pyx_v_e_sz = __pyx_t_8;
|
|
+ __pyx_t_8 = 0;
|
|
|
|
- /* "array_ext.pyx":132
|
|
+ /* "array_ext.pyx":135
|
|
* sz = numpy.size(out_array)
|
|
* e_sz = shp[0]*(shp[1]+1)
|
|
* assert sz == e_sz, \ # <<<<<<<<<<<<<<
|
|
@@ -1149,127 +2111,167 @@
|
|
*
|
|
*/
|
|
#ifndef CYTHON_WITHOUT_ASSERTIONS
|
|
- __pyx_t_4 = PyObject_RichCompare(__pyx_v_sz, __pyx_v_e_sz, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_4);
|
|
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- if (unlikely(!__pyx_t_7)) {
|
|
+ if (unlikely(!Py_OptimizeFlag)) {
|
|
+ __pyx_t_8 = PyObject_RichCompare(__pyx_v_sz, __pyx_v_e_sz, Py_EQ); __Pyx_XGOTREF(__pyx_t_8); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 135, __pyx_L1_error)
|
|
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_8); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 135, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
|
+ if (unlikely(!__pyx_t_5)) {
|
|
|
|
- /* "array_ext.pyx":133
|
|
+ /* "array_ext.pyx":136
|
|
* e_sz = shp[0]*(shp[1]+1)
|
|
* assert sz == e_sz, \
|
|
* "out_array size is incorrect, expected: %s, given: %s"%(e_sz, sz) # <<<<<<<<<<<<<<
|
|
*
|
|
* if VTK_ID_TYPE_SIZE == 4:
|
|
*/
|
|
- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(((PyObject *)__pyx_t_4));
|
|
- __Pyx_INCREF(__pyx_v_e_sz);
|
|
- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_e_sz);
|
|
- __Pyx_GIVEREF(__pyx_v_e_sz);
|
|
- __Pyx_INCREF(__pyx_v_sz);
|
|
- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_v_sz);
|
|
- __Pyx_GIVEREF(__pyx_v_sz);
|
|
- __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_3), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
|
|
- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
|
|
- PyErr_SetObject(PyExc_AssertionError, ((PyObject *)__pyx_t_3));
|
|
- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_8 = PyTuple_New(4); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 136, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_8);
|
|
+ __pyx_t_10 = 0;
|
|
+ __pyx_t_11 = 127;
|
|
+ __Pyx_INCREF(__pyx_kp_u_out_array_size_is_incorrect_expe);
|
|
+ __pyx_t_10 += 39;
|
|
+ __Pyx_GIVEREF(__pyx_kp_u_out_array_size_is_incorrect_expe);
|
|
+ PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_kp_u_out_array_size_is_incorrect_expe);
|
|
+ __pyx_t_2 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Unicode(__pyx_v_e_sz), __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __pyx_t_11 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_11) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_11;
|
|
+ __pyx_t_10 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_2);
|
|
+ __Pyx_GIVEREF(__pyx_t_2);
|
|
+ PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_2);
|
|
+ __pyx_t_2 = 0;
|
|
+ __Pyx_INCREF(__pyx_kp_u_given);
|
|
+ __pyx_t_10 += 9;
|
|
+ __Pyx_GIVEREF(__pyx_kp_u_given);
|
|
+ PyTuple_SET_ITEM(__pyx_t_8, 2, __pyx_kp_u_given);
|
|
+ __pyx_t_2 = __Pyx_PyObject_FormatSimpleAndDecref(PyObject_Unicode(__pyx_v_sz), __pyx_empty_unicode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __pyx_t_11 = (__Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) > __pyx_t_11) ? __Pyx_PyUnicode_MAX_CHAR_VALUE(__pyx_t_2) : __pyx_t_11;
|
|
+ __pyx_t_10 += __Pyx_PyUnicode_GET_LENGTH(__pyx_t_2);
|
|
+ __Pyx_GIVEREF(__pyx_t_2);
|
|
+ PyTuple_SET_ITEM(__pyx_t_8, 3, __pyx_t_2);
|
|
+ __pyx_t_2 = 0;
|
|
+ __pyx_t_2 = __Pyx_PyUnicode_Join(__pyx_t_8, 4, __pyx_t_10, __pyx_t_11); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
|
+ PyErr_SetObject(PyExc_AssertionError, __pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ __PYX_ERR(0, 135, __pyx_L1_error)
|
|
+ }
|
|
}
|
|
#endif
|
|
|
|
- /* "array_ext.pyx":135
|
|
+ /* "array_ext.pyx":138
|
|
* "out_array size is incorrect, expected: %s, given: %s"%(e_sz, sz)
|
|
*
|
|
* if VTK_ID_TYPE_SIZE == 4: # <<<<<<<<<<<<<<
|
|
* c_set_id_type_array(id_array, out_array)
|
|
* elif VTK_ID_TYPE_SIZE == 8:
|
|
*/
|
|
- __pyx_t_3 = PyObject_RichCompare(__pyx_v_VTK_ID_TYPE_SIZE, __pyx_int_4, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- if (__pyx_t_7) {
|
|
+ __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_v_VTK_ID_TYPE_SIZE, __pyx_int_4, 4, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 138, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ if (__pyx_t_5) {
|
|
|
|
- /* "array_ext.pyx":136
|
|
+ /* "array_ext.pyx":139
|
|
*
|
|
* if VTK_ID_TYPE_SIZE == 4:
|
|
* c_set_id_type_array(id_array, out_array) # <<<<<<<<<<<<<<
|
|
* elif VTK_ID_TYPE_SIZE == 8:
|
|
* c_set_id_type_array_long(id_array, out_array)
|
|
*/
|
|
- if (!(likely(((__pyx_v_id_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_id_array, __pyx_ptype_9array_ext_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __pyx_t_3 = __pyx_v_id_array;
|
|
- __Pyx_INCREF(__pyx_t_3);
|
|
- if (!(likely(((__pyx_v_out_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out_array, __pyx_ptype_9array_ext_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __pyx_t_4 = __pyx_v_out_array;
|
|
- __Pyx_INCREF(__pyx_t_4);
|
|
- __pyx_t_1 = __pyx_f_9array_ext_c_set_id_type_array(((PyArrayObject *)__pyx_t_3), ((PyArrayObject *)__pyx_t_4)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_1);
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
- goto __pyx_L6;
|
|
+ if (!(likely(((__pyx_v_id_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_id_array, __pyx_ptype_9array_ext_ndarray))))) __PYX_ERR(0, 139, __pyx_L1_error)
|
|
+ if (!(likely(((__pyx_v_out_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out_array, __pyx_ptype_9array_ext_ndarray))))) __PYX_ERR(0, 139, __pyx_L1_error)
|
|
+ __pyx_t_2 = __pyx_f_9array_ext_c_set_id_type_array(((PyArrayObject *)__pyx_v_id_array), ((PyArrayObject *)__pyx_v_out_array)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 139, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+
|
|
+ /* "array_ext.pyx":138
|
|
+ * "out_array size is incorrect, expected: %s, given: %s"%(e_sz, sz)
|
|
+ *
|
|
+ * if VTK_ID_TYPE_SIZE == 4: # <<<<<<<<<<<<<<
|
|
+ * c_set_id_type_array(id_array, out_array)
|
|
+ * elif VTK_ID_TYPE_SIZE == 8:
|
|
+ */
|
|
+ goto __pyx_L5;
|
|
}
|
|
|
|
- /* "array_ext.pyx":137
|
|
+ /* "array_ext.pyx":140
|
|
* if VTK_ID_TYPE_SIZE == 4:
|
|
* c_set_id_type_array(id_array, out_array)
|
|
* elif VTK_ID_TYPE_SIZE == 8: # <<<<<<<<<<<<<<
|
|
* c_set_id_type_array_long(id_array, out_array)
|
|
* else:
|
|
*/
|
|
- __pyx_t_1 = PyObject_RichCompare(__pyx_v_VTK_ID_TYPE_SIZE, __pyx_int_8, Py_EQ); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_1);
|
|
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
- if (__pyx_t_7) {
|
|
+ __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_v_VTK_ID_TYPE_SIZE, __pyx_int_8, 8, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 140, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ if (likely(__pyx_t_5)) {
|
|
|
|
- /* "array_ext.pyx":138
|
|
+ /* "array_ext.pyx":141
|
|
* c_set_id_type_array(id_array, out_array)
|
|
* elif VTK_ID_TYPE_SIZE == 8:
|
|
* c_set_id_type_array_long(id_array, out_array) # <<<<<<<<<<<<<<
|
|
* else:
|
|
* raise ValueError('Unsupported VTK_ID_TYPE_SIZE=%d'\
|
|
*/
|
|
- if (!(likely(((__pyx_v_id_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_id_array, __pyx_ptype_9array_ext_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __pyx_t_1 = __pyx_v_id_array;
|
|
- __Pyx_INCREF(__pyx_t_1);
|
|
- if (!(likely(((__pyx_v_out_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out_array, __pyx_ptype_9array_ext_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __pyx_t_4 = __pyx_v_out_array;
|
|
- __Pyx_INCREF(__pyx_t_4);
|
|
- __pyx_t_3 = __pyx_f_9array_ext_c_set_id_type_array_long(((PyArrayObject *)__pyx_t_1), ((PyArrayObject *)__pyx_t_4)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- goto __pyx_L6;
|
|
+ if (!(likely(((__pyx_v_id_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_id_array, __pyx_ptype_9array_ext_ndarray))))) __PYX_ERR(0, 141, __pyx_L1_error)
|
|
+ if (!(likely(((__pyx_v_out_array) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out_array, __pyx_ptype_9array_ext_ndarray))))) __PYX_ERR(0, 141, __pyx_L1_error)
|
|
+ __pyx_t_2 = __pyx_f_9array_ext_c_set_id_type_array_long(((PyArrayObject *)__pyx_v_id_array), ((PyArrayObject *)__pyx_v_out_array)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 141, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+
|
|
+ /* "array_ext.pyx":140
|
|
+ * if VTK_ID_TYPE_SIZE == 4:
|
|
+ * c_set_id_type_array(id_array, out_array)
|
|
+ * elif VTK_ID_TYPE_SIZE == 8: # <<<<<<<<<<<<<<
|
|
+ * c_set_id_type_array_long(id_array, out_array)
|
|
+ * else:
|
|
+ */
|
|
+ goto __pyx_L5;
|
|
}
|
|
+
|
|
+ /* "array_ext.pyx":143
|
|
+ * c_set_id_type_array_long(id_array, out_array)
|
|
+ * else:
|
|
+ * raise ValueError('Unsupported VTK_ID_TYPE_SIZE=%d'\ # <<<<<<<<<<<<<<
|
|
+ * %VTK_ID_TYPE_SIZE)
|
|
+ */
|
|
/*else*/ {
|
|
|
|
- /* "array_ext.pyx":141
|
|
+ /* "array_ext.pyx":144
|
|
* else:
|
|
* raise ValueError('Unsupported VTK_ID_TYPE_SIZE=%d'\
|
|
* %VTK_ID_TYPE_SIZE) # <<<<<<<<<<<<<<
|
|
- *
|
|
*/
|
|
- __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_4), __pyx_v_VTK_ID_TYPE_SIZE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
|
|
- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(((PyObject *)__pyx_t_4));
|
|
- PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
|
|
- __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
|
|
- __pyx_t_3 = 0;
|
|
- __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(__pyx_t_3);
|
|
- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
|
|
- __Pyx_Raise(__pyx_t_3, 0, 0);
|
|
- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
|
|
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_2 = __Pyx_PyUnicode_FormatSafe(__pyx_kp_u_Unsupported_VTK_ID_TYPE_SIZE_d, __pyx_v_VTK_ID_TYPE_SIZE); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 144, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_2);
|
|
+
|
|
+ /* "array_ext.pyx":143
|
|
+ * c_set_id_type_array_long(id_array, out_array)
|
|
+ * else:
|
|
+ * raise ValueError('Unsupported VTK_ID_TYPE_SIZE=%d'\ # <<<<<<<<<<<<<<
|
|
+ * %VTK_ID_TYPE_SIZE)
|
|
+ */
|
|
+ __pyx_t_8 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 143, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_8);
|
|
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
|
|
+ __Pyx_Raise(__pyx_t_8, 0, 0, 0);
|
|
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
|
|
+ __PYX_ERR(0, 143, __pyx_L1_error)
|
|
}
|
|
- __pyx_L6:;
|
|
+ __pyx_L5:;
|
|
|
|
+ /* "array_ext.pyx":109
|
|
+ * ######################################################################
|
|
+ *
|
|
+ * def set_id_type_array(id_array, out_array): # <<<<<<<<<<<<<<
|
|
+ * """Given a 2D Int array (`id_array`), and a contiguous 1D numarray
|
|
+ * array (`out_array`) having the correct size, this function sets
|
|
+ */
|
|
+
|
|
+ /* function exit code */
|
|
__pyx_r = Py_None; __Pyx_INCREF(Py_None);
|
|
goto __pyx_L0;
|
|
__pyx_L1_error:;
|
|
@@ -1277,14 +2279,16 @@
|
|
__Pyx_XDECREF(__pyx_t_2);
|
|
__Pyx_XDECREF(__pyx_t_3);
|
|
__Pyx_XDECREF(__pyx_t_4);
|
|
- __Pyx_AddTraceback("array_ext.set_id_type_array");
|
|
+ __Pyx_XDECREF(__pyx_t_6);
|
|
+ __Pyx_XDECREF(__pyx_t_8);
|
|
+ __Pyx_AddTraceback("array_ext.set_id_type_array", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
|
__pyx_r = NULL;
|
|
__pyx_L0:;
|
|
- __Pyx_DECREF(__pyx_v_vtk);
|
|
- __Pyx_DECREF(__pyx_v_VTK_ID_TYPE_SIZE);
|
|
- __Pyx_DECREF(__pyx_v_shp);
|
|
- __Pyx_DECREF(__pyx_v_sz);
|
|
- __Pyx_DECREF(__pyx_v_e_sz);
|
|
+ __Pyx_XDECREF(__pyx_v_vtk);
|
|
+ __Pyx_XDECREF(__pyx_v_VTK_ID_TYPE_SIZE);
|
|
+ __Pyx_XDECREF(__pyx_v_shp);
|
|
+ __Pyx_XDECREF(__pyx_v_sz);
|
|
+ __Pyx_XDECREF(__pyx_v_e_sz);
|
|
__Pyx_XGIVEREF(__pyx_r);
|
|
__Pyx_RefNannyFinishContext();
|
|
return __pyx_r;
|
|
@@ -1295,146 +2299,410 @@
|
|
};
|
|
|
|
#if PY_MAJOR_VERSION >= 3
|
|
+#if CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+static PyObject* __pyx_pymod_create(PyObject *spec, PyModuleDef *def); /*proto*/
|
|
+static int __pyx_pymod_exec_array_ext(PyObject* module); /*proto*/
|
|
+static PyModuleDef_Slot __pyx_moduledef_slots[] = {
|
|
+ {Py_mod_create, (void*)__pyx_pymod_create},
|
|
+ {Py_mod_exec, (void*)__pyx_pymod_exec_array_ext},
|
|
+ {0, NULL}
|
|
+};
|
|
+#endif
|
|
+
|
|
static struct PyModuleDef __pyx_moduledef = {
|
|
PyModuleDef_HEAD_INIT,
|
|
- __Pyx_NAMESTR("array_ext"),
|
|
- __Pyx_DOCSTR(__pyx_k_5), /* m_doc */
|
|
+ "array_ext",
|
|
+ __pyx_k_A_Cython_extension_module_for_n, /* m_doc */
|
|
+ #if CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ 0, /* m_size */
|
|
+ #else
|
|
-1, /* m_size */
|
|
+ #endif
|
|
__pyx_methods /* m_methods */,
|
|
+ #if CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ __pyx_moduledef_slots, /* m_slots */
|
|
+ #else
|
|
NULL, /* m_reload */
|
|
+ #endif
|
|
NULL, /* m_traverse */
|
|
NULL, /* m_clear */
|
|
NULL /* m_free */
|
|
};
|
|
#endif
|
|
+#ifndef CYTHON_SMALL_CODE
|
|
+#if defined(__clang__)
|
|
+ #define CYTHON_SMALL_CODE
|
|
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
|
|
+ #define CYTHON_SMALL_CODE __attribute__((cold))
|
|
+#else
|
|
+ #define CYTHON_SMALL_CODE
|
|
+#endif
|
|
+#endif
|
|
|
|
static __Pyx_StringTabEntry __pyx_string_tab[] = {
|
|
- {&__pyx_kp_s_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 1, 0},
|
|
- {&__pyx_kp_s_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 1, 0},
|
|
- {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0},
|
|
- {&__pyx_kp_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 0},
|
|
- {&__pyx_n_s__GetDataTypeSize, __pyx_k__GetDataTypeSize, sizeof(__pyx_k__GetDataTypeSize), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__ValueError, __pyx_k__ValueError, sizeof(__pyx_k__ValueError), 0, 0, 1, 1},
|
|
- {&__pyx_n_s____main__, __pyx_k____main__, sizeof(__pyx_k____main__), 0, 0, 1, 1},
|
|
- {&__pyx_n_s____test__, __pyx_k____test__, sizeof(__pyx_k____test__), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__array_ext, __pyx_k__array_ext, sizeof(__pyx_k__array_ext), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__contiguous, __pyx_k__contiguous, sizeof(__pyx_k__contiguous), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__data, __pyx_k__data, sizeof(__pyx_k__data), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__dimensions, __pyx_k__dimensions, sizeof(__pyx_k__dimensions), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__dtype, __pyx_k__dtype, sizeof(__pyx_k__dtype), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__flags, __pyx_k__flags, sizeof(__pyx_k__flags), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__id_array, __pyx_k__id_array, sizeof(__pyx_k__id_array), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__issubdtype, __pyx_k__issubdtype, sizeof(__pyx_k__issubdtype), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__itemsize, __pyx_k__itemsize, sizeof(__pyx_k__itemsize), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__numpy, __pyx_k__numpy, sizeof(__pyx_k__numpy), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__out_array, __pyx_k__out_array, sizeof(__pyx_k__out_array), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__set_id_type_array, __pyx_k__set_id_type_array, sizeof(__pyx_k__set_id_type_array), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__shape, __pyx_k__shape, sizeof(__pyx_k__shape), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__signedinteger, __pyx_k__signedinteger, sizeof(__pyx_k__signedinteger), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__size, __pyx_k__size, sizeof(__pyx_k__size), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__strides, __pyx_k__strides, sizeof(__pyx_k__strides), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__vtk, __pyx_k__vtk, sizeof(__pyx_k__vtk), 0, 0, 1, 1},
|
|
- {&__pyx_n_s__vtkIdTypeArray, __pyx_k__vtkIdTypeArray, sizeof(__pyx_k__vtkIdTypeArray), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_GetDataTypeSize, __pyx_k_GetDataTypeSize, sizeof(__pyx_k_GetDataTypeSize), 0, 0, 1, 1},
|
|
+ {&__pyx_kp_u_Unsupported_VTK_ID_TYPE_SIZE_d, __pyx_k_Unsupported_VTK_ID_TYPE_SIZE_d, sizeof(__pyx_k_Unsupported_VTK_ID_TYPE_SIZE_d), 0, 1, 0, 0},
|
|
+ {&__pyx_n_s_VTK_ID_TYPE_SIZE, __pyx_k_VTK_ID_TYPE_SIZE, sizeof(__pyx_k_VTK_ID_TYPE_SIZE), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_array_ext, __pyx_k_array_ext, sizeof(__pyx_k_array_ext), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_cline_in_traceback, __pyx_k_cline_in_traceback, sizeof(__pyx_k_cline_in_traceback), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_contiguous, __pyx_k_contiguous, sizeof(__pyx_k_contiguous), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_e_sz, __pyx_k_e_sz, sizeof(__pyx_k_e_sz), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_flags, __pyx_k_flags, sizeof(__pyx_k_flags), 0, 0, 1, 1},
|
|
+ {&__pyx_kp_u_given, __pyx_k_given, sizeof(__pyx_k_given), 0, 1, 0, 0},
|
|
+ {&__pyx_n_s_id_array, __pyx_k_id_array, sizeof(__pyx_k_id_array), 0, 0, 1, 1},
|
|
+ {&__pyx_kp_u_id_array_must_be_a_two_dimension, __pyx_k_id_array_must_be_a_two_dimension, sizeof(__pyx_k_id_array_must_be_a_two_dimension), 0, 1, 0, 0},
|
|
+ {&__pyx_n_s_import, __pyx_k_import, sizeof(__pyx_k_import), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_issubdtype, __pyx_k_issubdtype, sizeof(__pyx_k_issubdtype), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_itemsize, __pyx_k_itemsize, sizeof(__pyx_k_itemsize), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_main, __pyx_k_main, sizeof(__pyx_k_main), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_out_array, __pyx_k_out_array, sizeof(__pyx_k_out_array), 0, 0, 1, 1},
|
|
+ {&__pyx_kp_u_out_array_must_be_contiguous, __pyx_k_out_array_must_be_contiguous, sizeof(__pyx_k_out_array_must_be_contiguous), 0, 1, 0, 0},
|
|
+ {&__pyx_kp_u_out_array_size_is_incorrect_expe, __pyx_k_out_array_size_is_incorrect_expe, sizeof(__pyx_k_out_array_size_is_incorrect_expe), 0, 1, 0, 0},
|
|
+ {&__pyx_n_s_set_id_type_array, __pyx_k_set_id_type_array, sizeof(__pyx_k_set_id_type_array), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_shape, __pyx_k_shape, sizeof(__pyx_k_shape), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_shp, __pyx_k_shp, sizeof(__pyx_k_shp), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_signedinteger, __pyx_k_signedinteger, sizeof(__pyx_k_signedinteger), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_size, __pyx_k_size, sizeof(__pyx_k_size), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_sz, __pyx_k_sz, sizeof(__pyx_k_sz), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1},
|
|
+ {&__pyx_kp_s_tvtk_src_array_ext_pyx, __pyx_k_tvtk_src_array_ext_pyx, sizeof(__pyx_k_tvtk_src_array_ext_pyx), 0, 0, 1, 0},
|
|
+ {&__pyx_n_s_vtk, __pyx_k_vtk, sizeof(__pyx_k_vtk), 0, 0, 1, 1},
|
|
+ {&__pyx_n_s_vtkIdTypeArray, __pyx_k_vtkIdTypeArray, sizeof(__pyx_k_vtkIdTypeArray), 0, 0, 1, 1},
|
|
{0, 0, 0, 0, 0, 0, 0}
|
|
};
|
|
-static int __Pyx_InitCachedBuiltins(void) {
|
|
- __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+static CYTHON_SMALL_CODE int __Pyx_InitCachedBuiltins(void) {
|
|
+ __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 143, __pyx_L1_error)
|
|
+ return 0;
|
|
+ __pyx_L1_error:;
|
|
+ return -1;
|
|
+}
|
|
+
|
|
+static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
|
|
+
|
|
+ /* "array_ext.pyx":109
|
|
+ * ######################################################################
|
|
+ *
|
|
+ * def set_id_type_array(id_array, out_array): # <<<<<<<<<<<<<<
|
|
+ * """Given a 2D Int array (`id_array`), and a contiguous 1D numarray
|
|
+ * array (`out_array`) having the correct size, this function sets
|
|
+ */
|
|
+ __pyx_tuple_ = PyTuple_Pack(7, __pyx_n_s_id_array, __pyx_n_s_out_array, __pyx_n_s_vtk, __pyx_n_s_VTK_ID_TYPE_SIZE, __pyx_n_s_shp, __pyx_n_s_sz, __pyx_n_s_e_sz); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 109, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_tuple_);
|
|
+ __Pyx_GIVEREF(__pyx_tuple_);
|
|
+ __pyx_codeobj__2 = (PyObject*)__Pyx_PyCode_New(2, 0, 7, 0, CO_OPTIMIZED|CO_NEWLOCALS, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple_, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_tvtk_src_array_ext_pyx, __pyx_n_s_set_id_type_array, 109, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__2)) __PYX_ERR(0, 109, __pyx_L1_error)
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return 0;
|
|
+ __pyx_L1_error:;
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return -1;
|
|
+}
|
|
+
|
|
+static CYTHON_SMALL_CODE int __Pyx_InitGlobals(void) {
|
|
+ if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 1, __pyx_L1_error);
|
|
+ __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ __pyx_int_4 = PyInt_FromLong(4); if (unlikely(!__pyx_int_4)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ __pyx_int_8 = PyInt_FromLong(8); if (unlikely(!__pyx_int_8)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
return 0;
|
|
__pyx_L1_error:;
|
|
return -1;
|
|
}
|
|
|
|
-static int __Pyx_InitCachedConstants(void) {
|
|
- __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants");
|
|
+static CYTHON_SMALL_CODE int __Pyx_modinit_global_init_code(void); /*proto*/
|
|
+static CYTHON_SMALL_CODE int __Pyx_modinit_variable_export_code(void); /*proto*/
|
|
+static CYTHON_SMALL_CODE int __Pyx_modinit_function_export_code(void); /*proto*/
|
|
+static CYTHON_SMALL_CODE int __Pyx_modinit_type_init_code(void); /*proto*/
|
|
+static CYTHON_SMALL_CODE int __Pyx_modinit_type_import_code(void); /*proto*/
|
|
+static CYTHON_SMALL_CODE int __Pyx_modinit_variable_import_code(void); /*proto*/
|
|
+static CYTHON_SMALL_CODE int __Pyx_modinit_function_import_code(void); /*proto*/
|
|
+
|
|
+static int __Pyx_modinit_global_init_code(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("__Pyx_modinit_global_init_code", 0);
|
|
+ /*--- Global init code ---*/
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int __Pyx_modinit_variable_export_code(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("__Pyx_modinit_variable_export_code", 0);
|
|
+ /*--- Variable export code ---*/
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int __Pyx_modinit_function_export_code(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("__Pyx_modinit_function_export_code", 0);
|
|
+ /*--- Function export code ---*/
|
|
__Pyx_RefNannyFinishContext();
|
|
return 0;
|
|
}
|
|
|
|
-static int __Pyx_InitGlobals(void) {
|
|
- if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
- __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
- __pyx_int_4 = PyInt_FromLong(4); if (unlikely(!__pyx_int_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
- __pyx_int_8 = PyInt_FromLong(8); if (unlikely(!__pyx_int_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
+static int __Pyx_modinit_type_init_code(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ PyObject *__pyx_t_1 = NULL;
|
|
+ int __pyx_lineno = 0;
|
|
+ const char *__pyx_filename = NULL;
|
|
+ int __pyx_clineno = 0;
|
|
+ __Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0);
|
|
+ /*--- Type init code ---*/
|
|
+ __pyx_t_1 = PyImport_ImportModule("numpy"); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 29, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ __pyx_ptype_9array_ext_ndarray = __Pyx_ImportType(__pyx_t_1, "numpy", "ndarray", sizeof(PyArrayObject), __Pyx_ImportType_CheckSize_Warn);
|
|
+ if (!__pyx_ptype_9array_ext_ndarray) __PYX_ERR(0, 29, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
+ __Pyx_RefNannyFinishContext();
|
|
return 0;
|
|
__pyx_L1_error:;
|
|
+ __Pyx_XDECREF(__pyx_t_1);
|
|
+ __Pyx_RefNannyFinishContext();
|
|
return -1;
|
|
}
|
|
|
|
+static int __Pyx_modinit_type_import_code(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("__Pyx_modinit_type_import_code", 0);
|
|
+ /*--- Type import code ---*/
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int __Pyx_modinit_variable_import_code(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("__Pyx_modinit_variable_import_code", 0);
|
|
+ /*--- Variable import code ---*/
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int __Pyx_modinit_function_import_code(void) {
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ __Pyx_RefNannySetupContext("__Pyx_modinit_function_import_code", 0);
|
|
+ /*--- Function import code ---*/
|
|
+ __Pyx_RefNannyFinishContext();
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
+#ifndef CYTHON_NO_PYINIT_EXPORT
|
|
+#define __Pyx_PyMODINIT_FUNC PyMODINIT_FUNC
|
|
+#elif PY_MAJOR_VERSION < 3
|
|
+#ifdef __cplusplus
|
|
+#define __Pyx_PyMODINIT_FUNC extern "C" void
|
|
+#else
|
|
+#define __Pyx_PyMODINIT_FUNC void
|
|
+#endif
|
|
+#else
|
|
+#ifdef __cplusplus
|
|
+#define __Pyx_PyMODINIT_FUNC extern "C" PyObject *
|
|
+#else
|
|
+#define __Pyx_PyMODINIT_FUNC PyObject *
|
|
+#endif
|
|
+#endif
|
|
+
|
|
+
|
|
#if PY_MAJOR_VERSION < 3
|
|
-PyMODINIT_FUNC initarray_ext(void); /*proto*/
|
|
-PyMODINIT_FUNC initarray_ext(void)
|
|
+__Pyx_PyMODINIT_FUNC initarray_ext(void) CYTHON_SMALL_CODE; /*proto*/
|
|
+__Pyx_PyMODINIT_FUNC initarray_ext(void)
|
|
#else
|
|
-PyMODINIT_FUNC PyInit_array_ext(void); /*proto*/
|
|
-PyMODINIT_FUNC PyInit_array_ext(void)
|
|
+__Pyx_PyMODINIT_FUNC PyInit_array_ext(void) CYTHON_SMALL_CODE; /*proto*/
|
|
+__Pyx_PyMODINIT_FUNC PyInit_array_ext(void)
|
|
+#if CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+{
|
|
+ return PyModuleDef_Init(&__pyx_moduledef);
|
|
+}
|
|
+static CYTHON_SMALL_CODE int __Pyx_check_single_interpreter(void) {
|
|
+ #if PY_VERSION_HEX >= 0x030700A1
|
|
+ static PY_INT64_T main_interpreter_id = -1;
|
|
+ PY_INT64_T current_id = PyInterpreterState_GetID(PyThreadState_Get()->interp);
|
|
+ if (main_interpreter_id == -1) {
|
|
+ main_interpreter_id = current_id;
|
|
+ return (unlikely(current_id == -1)) ? -1 : 0;
|
|
+ } else if (unlikely(main_interpreter_id != current_id))
|
|
+ #else
|
|
+ static PyInterpreterState *main_interpreter = NULL;
|
|
+ PyInterpreterState *current_interpreter = PyThreadState_Get()->interp;
|
|
+ if (!main_interpreter) {
|
|
+ main_interpreter = current_interpreter;
|
|
+ } else if (unlikely(main_interpreter != current_interpreter))
|
|
+ #endif
|
|
+ {
|
|
+ PyErr_SetString(
|
|
+ PyExc_ImportError,
|
|
+ "Interpreter change detected - this module can only be loaded into one interpreter per process.");
|
|
+ return -1;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+static CYTHON_SMALL_CODE int __Pyx_copy_spec_to_module(PyObject *spec, PyObject *moddict, const char* from_name, const char* to_name, int allow_none) {
|
|
+ PyObject *value = PyObject_GetAttrString(spec, from_name);
|
|
+ int result = 0;
|
|
+ if (likely(value)) {
|
|
+ if (allow_none || value != Py_None) {
|
|
+ result = PyDict_SetItemString(moddict, to_name, value);
|
|
+ }
|
|
+ Py_DECREF(value);
|
|
+ } else if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
|
|
+ PyErr_Clear();
|
|
+ } else {
|
|
+ result = -1;
|
|
+ }
|
|
+ return result;
|
|
+}
|
|
+static CYTHON_SMALL_CODE PyObject* __pyx_pymod_create(PyObject *spec, CYTHON_UNUSED PyModuleDef *def) {
|
|
+ PyObject *module = NULL, *moddict, *modname;
|
|
+ if (__Pyx_check_single_interpreter())
|
|
+ return NULL;
|
|
+ if (__pyx_m)
|
|
+ return __Pyx_NewRef(__pyx_m);
|
|
+ modname = PyObject_GetAttrString(spec, "name");
|
|
+ if (unlikely(!modname)) goto bad;
|
|
+ module = PyModule_NewObject(modname);
|
|
+ Py_DECREF(modname);
|
|
+ if (unlikely(!module)) goto bad;
|
|
+ moddict = PyModule_GetDict(module);
|
|
+ if (unlikely(!moddict)) goto bad;
|
|
+ if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "loader", "__loader__", 1) < 0)) goto bad;
|
|
+ if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "origin", "__file__", 1) < 0)) goto bad;
|
|
+ if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "parent", "__package__", 1) < 0)) goto bad;
|
|
+ if (unlikely(__Pyx_copy_spec_to_module(spec, moddict, "submodule_search_locations", "__path__", 0) < 0)) goto bad;
|
|
+ return module;
|
|
+bad:
|
|
+ Py_XDECREF(module);
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
+
|
|
+static CYTHON_SMALL_CODE int __pyx_pymod_exec_array_ext(PyObject *__pyx_pyinit_module)
|
|
+#endif
|
|
#endif
|
|
{
|
|
PyObject *__pyx_t_1 = NULL;
|
|
+ int __pyx_lineno = 0;
|
|
+ const char *__pyx_filename = NULL;
|
|
+ int __pyx_clineno = 0;
|
|
+ __Pyx_RefNannyDeclarations
|
|
+ #if CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ if (__pyx_m) {
|
|
+ if (__pyx_m == __pyx_pyinit_module) return 0;
|
|
+ PyErr_SetString(PyExc_RuntimeError, "Module 'array_ext' has already been imported. Re-initialisation is not supported.");
|
|
+ return -1;
|
|
+ }
|
|
+ #elif PY_MAJOR_VERSION >= 3
|
|
+ if (__pyx_m) return __Pyx_NewRef(__pyx_m);
|
|
+ #endif
|
|
#if CYTHON_REFNANNY
|
|
- void* __pyx_refnanny = NULL;
|
|
- __Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny");
|
|
- if (!__Pyx_RefNanny) {
|
|
- PyErr_Clear();
|
|
- __Pyx_RefNanny = __Pyx_RefNannyImportAPI("Cython.Runtime.refnanny");
|
|
- if (!__Pyx_RefNanny)
|
|
- Py_FatalError("failed to import 'refnanny' module");
|
|
- }
|
|
- __pyx_refnanny = __Pyx_RefNanny->SetupContext("PyMODINIT_FUNC PyInit_array_ext(void)", __LINE__, __FILE__);
|
|
- #endif
|
|
- __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- #ifdef __pyx_binding_PyCFunctionType_USED
|
|
- if (__pyx_binding_PyCFunctionType_init() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+__Pyx_RefNanny = __Pyx_RefNannyImportAPI("refnanny");
|
|
+if (!__Pyx_RefNanny) {
|
|
+ PyErr_Clear();
|
|
+ __Pyx_RefNanny = __Pyx_RefNannyImportAPI("Cython.Runtime.refnanny");
|
|
+ if (!__Pyx_RefNanny)
|
|
+ Py_FatalError("failed to import 'refnanny' module");
|
|
+}
|
|
+#endif
|
|
+ __Pyx_RefNannySetupContext("__Pyx_PyMODINIT_FUNC PyInit_array_ext(void)", 0);
|
|
+ if (__Pyx_check_binary_version() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #ifdef __Pxy_PyFrame_Initialize_Offsets
|
|
+ __Pxy_PyFrame_Initialize_Offsets();
|
|
+ #endif
|
|
+ __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ __pyx_empty_unicode = PyUnicode_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_unicode)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #ifdef __Pyx_CyFunction_USED
|
|
+ if (__pyx_CyFunction_init() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #endif
|
|
+ #ifdef __Pyx_FusedFunction_USED
|
|
+ if (__pyx_FusedFunction_init() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #endif
|
|
+ #ifdef __Pyx_Coroutine_USED
|
|
+ if (__pyx_Coroutine_init() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #endif
|
|
+ #ifdef __Pyx_Generator_USED
|
|
+ if (__pyx_Generator_init() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #endif
|
|
+ #ifdef __Pyx_AsyncGen_USED
|
|
+ if (__pyx_AsyncGen_init() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #endif
|
|
+ #ifdef __Pyx_StopAsyncIteration_USED
|
|
+ if (__pyx_StopAsyncIteration_init() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
#endif
|
|
/*--- Library function declarations ---*/
|
|
/*--- Threads initialization code ---*/
|
|
- #if defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS
|
|
- #ifdef WITH_THREAD /* Python build with threading support? */
|
|
+ #if defined(WITH_THREAD) && PY_VERSION_HEX < 0x030700F0 && defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS
|
|
PyEval_InitThreads();
|
|
#endif
|
|
- #endif
|
|
/*--- Module creation code ---*/
|
|
+ #if CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ __pyx_m = __pyx_pyinit_module;
|
|
+ Py_INCREF(__pyx_m);
|
|
+ #else
|
|
#if PY_MAJOR_VERSION < 3
|
|
- __pyx_m = Py_InitModule4(__Pyx_NAMESTR("array_ext"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_5), 0, PYTHON_API_VERSION);
|
|
+ __pyx_m = Py_InitModule4("array_ext", __pyx_methods, __pyx_k_A_Cython_extension_module_for_n, 0, PYTHON_API_VERSION); Py_XINCREF(__pyx_m);
|
|
#else
|
|
__pyx_m = PyModule_Create(&__pyx_moduledef);
|
|
#endif
|
|
- if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- Py_INCREF(__pyx_m);
|
|
+ if (unlikely(!__pyx_m)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
#endif
|
|
- __pyx_b = PyImport_AddModule(__Pyx_NAMESTR(__Pyx_BUILTIN_MODULE_NAME));
|
|
- if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
- if (__Pyx_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
+ __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ Py_INCREF(__pyx_d);
|
|
+ __pyx_b = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ Py_INCREF(__pyx_b);
|
|
+ __pyx_cython_runtime = PyImport_AddModule((char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ Py_INCREF(__pyx_cython_runtime);
|
|
+ if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(0, 1, __pyx_L1_error);
|
|
/*--- Initialize various global constants etc. ---*/
|
|
- if (unlikely(__Pyx_InitGlobals() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ if (__Pyx_InitGlobals() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #if PY_MAJOR_VERSION < 3 && (__PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT)
|
|
+ if (__Pyx_init_sys_getdefaultencoding_params() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #endif
|
|
if (__pyx_module_is_main_array_ext) {
|
|
- if (__Pyx_SetAttrString(__pyx_m, "__name__", __pyx_n_s____main__) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
|
|
+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s_name, __pyx_n_s_main) < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
}
|
|
+ #if PY_MAJOR_VERSION >= 3
|
|
+ {
|
|
+ PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ if (!PyDict_GetItemString(modules, "array_ext")) {
|
|
+ if (unlikely(PyDict_SetItemString(modules, "array_ext", __pyx_m) < 0)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ }
|
|
+ }
|
|
+ #endif
|
|
/*--- Builtin init code ---*/
|
|
- if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ if (__Pyx_InitCachedBuiltins() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
/*--- Constants init code ---*/
|
|
- if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- /*--- Global init code ---*/
|
|
- /*--- Function export code ---*/
|
|
- /*--- Type init code ---*/
|
|
- __pyx_ptype_9array_ext_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_9array_ext_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- /*--- Type import code ---*/
|
|
- /*--- Function import code ---*/
|
|
+ if (__Pyx_InitCachedConstants() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ /*--- Global type/function init code ---*/
|
|
+ (void)__Pyx_modinit_global_init_code();
|
|
+ (void)__Pyx_modinit_variable_export_code();
|
|
+ (void)__Pyx_modinit_function_export_code();
|
|
+ if (unlikely(__Pyx_modinit_type_init_code() < 0)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ (void)__Pyx_modinit_type_import_code();
|
|
+ (void)__Pyx_modinit_variable_import_code();
|
|
+ (void)__Pyx_modinit_function_import_code();
|
|
/*--- Execution code ---*/
|
|
+ #if defined(__Pyx_Generator_USED) || defined(__Pyx_Coroutine_USED)
|
|
+ if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ #endif
|
|
|
|
- /* "array_ext.pyx":12
|
|
- * # License: BSD Style.
|
|
+ /* "array_ext.pyx":15
|
|
+ *
|
|
*
|
|
* import numpy # <<<<<<<<<<<<<<
|
|
*
|
|
* ######################################################################
|
|
*/
|
|
- __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__numpy), 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 15, __pyx_L1_error)
|
|
__Pyx_GOTREF(__pyx_t_1);
|
|
- if (PyObject_SetAttr(__pyx_m, __pyx_n_s__numpy, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_numpy, __pyx_t_1) < 0) __PYX_ERR(0, 15, __pyx_L1_error)
|
|
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
|
|
- /* "array_ext.pyx":37
|
|
+ /* "array_ext.pyx":40
|
|
* void import_array()
|
|
*
|
|
* import_array() # <<<<<<<<<<<<<<
|
|
@@ -1443,55 +2711,99 @@
|
|
*/
|
|
import_array();
|
|
|
|
- /* "array_ext.pyx":106
|
|
+ /* "array_ext.pyx":109
|
|
* ######################################################################
|
|
*
|
|
* def set_id_type_array(id_array, out_array): # <<<<<<<<<<<<<<
|
|
* """Given a 2D Int array (`id_array`), and a contiguous 1D numarray
|
|
* array (`out_array`) having the correct size, this function sets
|
|
*/
|
|
- __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_9array_ext_set_id_type_array, NULL, __pyx_n_s__array_ext); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_9array_ext_1set_id_type_array, NULL, __pyx_n_s_array_ext); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
|
|
__Pyx_GOTREF(__pyx_t_1);
|
|
- if (PyObject_SetAttr(__pyx_m, __pyx_n_s__set_id_type_array, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_set_id_type_array, __pyx_t_1) < 0) __PYX_ERR(0, 109, __pyx_L1_error)
|
|
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
|
|
/* "array_ext.pyx":1
|
|
- * """ # <<<<<<<<<<<<<<
|
|
- * A Pyrex extension module for numpy. Currently this extension module
|
|
- * allows us to massage a 2D scipy array into a form usable as a
|
|
- */
|
|
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_GOTREF(((PyObject *)__pyx_t_1));
|
|
- if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
|
|
- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
|
|
+ * #cython: language_level=3 # <<<<<<<<<<<<<<
|
|
+ *
|
|
+ * """
|
|
+ */
|
|
+ __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ __Pyx_GOTREF(__pyx_t_1);
|
|
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_1) < 0) __PYX_ERR(0, 1, __pyx_L1_error)
|
|
+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
|
|
+
|
|
+ /*--- Wrapped vars code ---*/
|
|
+
|
|
goto __pyx_L0;
|
|
__pyx_L1_error:;
|
|
__Pyx_XDECREF(__pyx_t_1);
|
|
if (__pyx_m) {
|
|
- __Pyx_AddTraceback("init array_ext");
|
|
- Py_DECREF(__pyx_m); __pyx_m = 0;
|
|
+ if (__pyx_d) {
|
|
+ __Pyx_AddTraceback("init array_ext", __pyx_clineno, __pyx_lineno, __pyx_filename);
|
|
+ }
|
|
+ Py_CLEAR(__pyx_m);
|
|
} else if (!PyErr_Occurred()) {
|
|
PyErr_SetString(PyExc_ImportError, "init array_ext");
|
|
}
|
|
__pyx_L0:;
|
|
__Pyx_RefNannyFinishContext();
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- return;
|
|
- #else
|
|
+ #if CYTHON_PEP489_MULTI_PHASE_INIT
|
|
+ return (__pyx_m != NULL) ? 0 : -1;
|
|
+ #elif PY_MAJOR_VERSION >= 3
|
|
return __pyx_m;
|
|
+ #else
|
|
+ return;
|
|
#endif
|
|
}
|
|
|
|
-/* Runtime support code */
|
|
+/* --- Runtime support code --- */
|
|
+/* Refnanny */
|
|
+#if CYTHON_REFNANNY
|
|
+static __Pyx_RefNannyAPIStruct *__Pyx_RefNannyImportAPI(const char *modname) {
|
|
+ PyObject *m = NULL, *p = NULL;
|
|
+ void *r = NULL;
|
|
+ m = PyImport_ImportModule(modname);
|
|
+ if (!m) goto end;
|
|
+ p = PyObject_GetAttrString(m, "RefNannyAPI");
|
|
+ if (!p) goto end;
|
|
+ r = PyLong_AsVoidPtr(p);
|
|
+end:
|
|
+ Py_XDECREF(p);
|
|
+ Py_XDECREF(m);
|
|
+ return (__Pyx_RefNannyAPIStruct *)r;
|
|
+}
|
|
+#endif
|
|
|
|
-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {
|
|
- PyObject *result;
|
|
- result = PyObject_GetAttr(dict, name);
|
|
- if (!result)
|
|
- PyErr_SetObject(PyExc_NameError, name);
|
|
+/* PyObjectGetAttrStr */
|
|
+#if CYTHON_USE_TYPE_SLOTS
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject* attr_name) {
|
|
+ PyTypeObject* tp = Py_TYPE(obj);
|
|
+ if (likely(tp->tp_getattro))
|
|
+ return tp->tp_getattro(obj, attr_name);
|
|
+#if PY_MAJOR_VERSION < 3
|
|
+ if (likely(tp->tp_getattr))
|
|
+ return tp->tp_getattr(obj, PyString_AS_STRING(attr_name));
|
|
+#endif
|
|
+ return PyObject_GetAttr(obj, attr_name);
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* GetBuiltinName */
|
|
+static PyObject *__Pyx_GetBuiltinName(PyObject *name) {
|
|
+ PyObject* result = __Pyx_PyObject_GetAttrStr(__pyx_b, name);
|
|
+ if (unlikely(!result)) {
|
|
+ PyErr_Format(PyExc_NameError,
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ "name '%U' is not defined", name);
|
|
+#else
|
|
+ "name '%.200s' is not defined", PyString_AS_STRING(name));
|
|
+#endif
|
|
+ }
|
|
return result;
|
|
}
|
|
|
|
+/* RaiseArgTupleInvalid */
|
|
static void __Pyx_RaiseArgtupleInvalid(
|
|
const char* func_name,
|
|
int exact,
|
|
@@ -1500,8 +2812,7 @@
|
|
Py_ssize_t num_found)
|
|
{
|
|
Py_ssize_t num_expected;
|
|
- const char *number, *more_or_less;
|
|
-
|
|
+ const char *more_or_less;
|
|
if (num_found < num_min) {
|
|
num_expected = num_min;
|
|
more_or_less = "at least";
|
|
@@ -1512,16 +2823,13 @@
|
|
if (exact) {
|
|
more_or_less = "exactly";
|
|
}
|
|
- number = (num_expected == 1) ? "" : "s";
|
|
PyErr_Format(PyExc_TypeError,
|
|
- #if PY_VERSION_HEX < 0x02050000
|
|
- "%s() takes %s %d positional argument%s (%d given)",
|
|
- #else
|
|
- "%s() takes %s %zd positional argument%s (%zd given)",
|
|
- #endif
|
|
- func_name, more_or_less, num_expected, number, num_found);
|
|
+ "%.200s() takes %.8s %" CYTHON_FORMAT_SSIZE_T "d positional argument%.1s (%" CYTHON_FORMAT_SSIZE_T "d given)",
|
|
+ func_name, more_or_less, num_expected,
|
|
+ (num_expected == 1) ? "" : "s", num_found);
|
|
}
|
|
|
|
+/* RaiseDoubleKeywords */
|
|
static void __Pyx_RaiseDoubleKeywordsError(
|
|
const char* func_name,
|
|
PyObject* kw_name)
|
|
@@ -1531,10 +2839,11 @@
|
|
"%s() got multiple values for keyword argument '%U'", func_name, kw_name);
|
|
#else
|
|
"%s() got multiple values for keyword argument '%s'", func_name,
|
|
- PyString_AS_STRING(kw_name));
|
|
+ PyString_AsString(kw_name));
|
|
#endif
|
|
}
|
|
|
|
+/* ParseKeywords */
|
|
static int __Pyx_ParseOptionalKeywords(
|
|
PyObject *kwds,
|
|
PyObject **argnames[],
|
|
@@ -1547,64 +2856,86 @@
|
|
Py_ssize_t pos = 0;
|
|
PyObject*** name;
|
|
PyObject*** first_kw_arg = argnames + num_pos_args;
|
|
-
|
|
while (PyDict_Next(kwds, &pos, &key, &value)) {
|
|
name = first_kw_arg;
|
|
while (*name && (**name != key)) name++;
|
|
if (*name) {
|
|
values[name-argnames] = value;
|
|
- } else {
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- if (unlikely(!PyString_CheckExact(key)) && unlikely(!PyString_Check(key))) {
|
|
- #else
|
|
- if (unlikely(!PyUnicode_CheckExact(key)) && unlikely(!PyUnicode_Check(key))) {
|
|
- #endif
|
|
- goto invalid_keyword_type;
|
|
- } else {
|
|
- for (name = first_kw_arg; *name; name++) {
|
|
- #if PY_MAJOR_VERSION >= 3
|
|
- if (PyUnicode_GET_SIZE(**name) == PyUnicode_GET_SIZE(key) &&
|
|
- PyUnicode_Compare(**name, key) == 0) break;
|
|
- #else
|
|
- if (PyString_GET_SIZE(**name) == PyString_GET_SIZE(key) &&
|
|
- _PyString_Eq(**name, key)) break;
|
|
- #endif
|
|
- }
|
|
- if (*name) {
|
|
+ continue;
|
|
+ }
|
|
+ name = first_kw_arg;
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ if (likely(PyString_Check(key))) {
|
|
+ while (*name) {
|
|
+ if ((CYTHON_COMPILING_IN_PYPY || PyString_GET_SIZE(**name) == PyString_GET_SIZE(key))
|
|
+ && _PyString_Eq(**name, key)) {
|
|
values[name-argnames] = value;
|
|
- } else {
|
|
- /* unexpected keyword found */
|
|
- for (name=argnames; name != first_kw_arg; name++) {
|
|
- if (**name == key) goto arg_passed_twice;
|
|
- #if PY_MAJOR_VERSION >= 3
|
|
- if (PyUnicode_GET_SIZE(**name) == PyUnicode_GET_SIZE(key) &&
|
|
- PyUnicode_Compare(**name, key) == 0) goto arg_passed_twice;
|
|
- #else
|
|
- if (PyString_GET_SIZE(**name) == PyString_GET_SIZE(key) &&
|
|
- _PyString_Eq(**name, key)) goto arg_passed_twice;
|
|
- #endif
|
|
- }
|
|
- if (kwds2) {
|
|
- if (unlikely(PyDict_SetItem(kwds2, key, value))) goto bad;
|
|
- } else {
|
|
- goto invalid_keyword;
|
|
+ break;
|
|
+ }
|
|
+ name++;
|
|
+ }
|
|
+ if (*name) continue;
|
|
+ else {
|
|
+ PyObject*** argname = argnames;
|
|
+ while (argname != first_kw_arg) {
|
|
+ if ((**argname == key) || (
|
|
+ (CYTHON_COMPILING_IN_PYPY || PyString_GET_SIZE(**argname) == PyString_GET_SIZE(key))
|
|
+ && _PyString_Eq(**argname, key))) {
|
|
+ goto arg_passed_twice;
|
|
}
|
|
+ argname++;
|
|
+ }
|
|
+ }
|
|
+ } else
|
|
+ #endif
|
|
+ if (likely(PyUnicode_Check(key))) {
|
|
+ while (*name) {
|
|
+ int cmp = (**name == key) ? 0 :
|
|
+ #if !CYTHON_COMPILING_IN_PYPY && PY_MAJOR_VERSION >= 3
|
|
+ (__Pyx_PyUnicode_GET_LENGTH(**name) != __Pyx_PyUnicode_GET_LENGTH(key)) ? 1 :
|
|
+ #endif
|
|
+ PyUnicode_Compare(**name, key);
|
|
+ if (cmp < 0 && unlikely(PyErr_Occurred())) goto bad;
|
|
+ if (cmp == 0) {
|
|
+ values[name-argnames] = value;
|
|
+ break;
|
|
+ }
|
|
+ name++;
|
|
+ }
|
|
+ if (*name) continue;
|
|
+ else {
|
|
+ PyObject*** argname = argnames;
|
|
+ while (argname != first_kw_arg) {
|
|
+ int cmp = (**argname == key) ? 0 :
|
|
+ #if !CYTHON_COMPILING_IN_PYPY && PY_MAJOR_VERSION >= 3
|
|
+ (__Pyx_PyUnicode_GET_LENGTH(**argname) != __Pyx_PyUnicode_GET_LENGTH(key)) ? 1 :
|
|
+ #endif
|
|
+ PyUnicode_Compare(**argname, key);
|
|
+ if (cmp < 0 && unlikely(PyErr_Occurred())) goto bad;
|
|
+ if (cmp == 0) goto arg_passed_twice;
|
|
+ argname++;
|
|
}
|
|
}
|
|
+ } else
|
|
+ goto invalid_keyword_type;
|
|
+ if (kwds2) {
|
|
+ if (unlikely(PyDict_SetItem(kwds2, key, value))) goto bad;
|
|
+ } else {
|
|
+ goto invalid_keyword;
|
|
}
|
|
}
|
|
return 0;
|
|
arg_passed_twice:
|
|
- __Pyx_RaiseDoubleKeywordsError(function_name, **name);
|
|
+ __Pyx_RaiseDoubleKeywordsError(function_name, key);
|
|
goto bad;
|
|
invalid_keyword_type:
|
|
PyErr_Format(PyExc_TypeError,
|
|
- "%s() keywords must be strings", function_name);
|
|
+ "%.200s() keywords must be strings", function_name);
|
|
goto bad;
|
|
invalid_keyword:
|
|
PyErr_Format(PyExc_TypeError,
|
|
#if PY_MAJOR_VERSION < 3
|
|
- "%s() got an unexpected keyword argument '%s'",
|
|
+ "%.200s() got an unexpected keyword argument '%.200s'",
|
|
function_name, PyString_AsString(key));
|
|
#else
|
|
"%s() got an unexpected keyword argument '%U'",
|
|
@@ -1614,23 +2945,781 @@
|
|
return -1;
|
|
}
|
|
|
|
+/* Import */
|
|
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level) {
|
|
+ PyObject *empty_list = 0;
|
|
+ PyObject *module = 0;
|
|
+ PyObject *global_dict = 0;
|
|
+ PyObject *empty_dict = 0;
|
|
+ PyObject *list;
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ PyObject *py_import;
|
|
+ py_import = __Pyx_PyObject_GetAttrStr(__pyx_b, __pyx_n_s_import);
|
|
+ if (!py_import)
|
|
+ goto bad;
|
|
+ #endif
|
|
+ if (from_list)
|
|
+ list = from_list;
|
|
+ else {
|
|
+ empty_list = PyList_New(0);
|
|
+ if (!empty_list)
|
|
+ goto bad;
|
|
+ list = empty_list;
|
|
+ }
|
|
+ global_dict = PyModule_GetDict(__pyx_m);
|
|
+ if (!global_dict)
|
|
+ goto bad;
|
|
+ empty_dict = PyDict_New();
|
|
+ if (!empty_dict)
|
|
+ goto bad;
|
|
+ {
|
|
+ #if PY_MAJOR_VERSION >= 3
|
|
+ if (level == -1) {
|
|
+ if ((1) && (strchr(__Pyx_MODULE_NAME, '.'))) {
|
|
+ module = PyImport_ImportModuleLevelObject(
|
|
+ name, global_dict, empty_dict, list, 1);
|
|
+ if (!module) {
|
|
+ if (!PyErr_ExceptionMatches(PyExc_ImportError))
|
|
+ goto bad;
|
|
+ PyErr_Clear();
|
|
+ }
|
|
+ }
|
|
+ level = 0;
|
|
+ }
|
|
+ #endif
|
|
+ if (!module) {
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ PyObject *py_level = PyInt_FromLong(level);
|
|
+ if (!py_level)
|
|
+ goto bad;
|
|
+ module = PyObject_CallFunctionObjArgs(py_import,
|
|
+ name, global_dict, empty_dict, list, py_level, (PyObject *)NULL);
|
|
+ Py_DECREF(py_level);
|
|
+ #else
|
|
+ module = PyImport_ImportModuleLevelObject(
|
|
+ name, global_dict, empty_dict, list, level);
|
|
+ #endif
|
|
+ }
|
|
+ }
|
|
+bad:
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ Py_XDECREF(py_import);
|
|
+ #endif
|
|
+ Py_XDECREF(empty_list);
|
|
+ Py_XDECREF(empty_dict);
|
|
+ return module;
|
|
+}
|
|
+
|
|
+/* PyFunctionFastCall */
|
|
+#if CYTHON_FAST_PYCALL
|
|
+static PyObject* __Pyx_PyFunction_FastCallNoKw(PyCodeObject *co, PyObject **args, Py_ssize_t na,
|
|
+ PyObject *globals) {
|
|
+ PyFrameObject *f;
|
|
+ PyThreadState *tstate = __Pyx_PyThreadState_Current;
|
|
+ PyObject **fastlocals;
|
|
+ Py_ssize_t i;
|
|
+ PyObject *result;
|
|
+ assert(globals != NULL);
|
|
+ /* XXX Perhaps we should create a specialized
|
|
+ PyFrame_New() that doesn't take locals, but does
|
|
+ take builtins without sanity checking them.
|
|
+ */
|
|
+ assert(tstate != NULL);
|
|
+ f = PyFrame_New(tstate, co, globals, NULL);
|
|
+ if (f == NULL) {
|
|
+ return NULL;
|
|
+ }
|
|
+ fastlocals = __Pyx_PyFrame_GetLocalsplus(f);
|
|
+ for (i = 0; i < na; i++) {
|
|
+ Py_INCREF(*args);
|
|
+ fastlocals[i] = *args++;
|
|
+ }
|
|
+ result = PyEval_EvalFrameEx(f,0);
|
|
+ ++tstate->recursion_depth;
|
|
+ Py_DECREF(f);
|
|
+ --tstate->recursion_depth;
|
|
+ return result;
|
|
+}
|
|
+#if 1 || PY_VERSION_HEX < 0x030600B1
|
|
+static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, Py_ssize_t nargs, PyObject *kwargs) {
|
|
+ PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func);
|
|
+ PyObject *globals = PyFunction_GET_GLOBALS(func);
|
|
+ PyObject *argdefs = PyFunction_GET_DEFAULTS(func);
|
|
+ PyObject *closure;
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ PyObject *kwdefs;
|
|
+#endif
|
|
+ PyObject *kwtuple, **k;
|
|
+ PyObject **d;
|
|
+ Py_ssize_t nd;
|
|
+ Py_ssize_t nk;
|
|
+ PyObject *result;
|
|
+ assert(kwargs == NULL || PyDict_Check(kwargs));
|
|
+ nk = kwargs ? PyDict_Size(kwargs) : 0;
|
|
+ if (Py_EnterRecursiveCall((char*)" while calling a Python object")) {
|
|
+ return NULL;
|
|
+ }
|
|
+ if (
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ co->co_kwonlyargcount == 0 &&
|
|
+#endif
|
|
+ likely(kwargs == NULL || nk == 0) &&
|
|
+ co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) {
|
|
+ if (argdefs == NULL && co->co_argcount == nargs) {
|
|
+ result = __Pyx_PyFunction_FastCallNoKw(co, args, nargs, globals);
|
|
+ goto done;
|
|
+ }
|
|
+ else if (nargs == 0 && argdefs != NULL
|
|
+ && co->co_argcount == Py_SIZE(argdefs)) {
|
|
+ /* function called with no arguments, but all parameters have
|
|
+ a default value: use default values as arguments .*/
|
|
+ args = &PyTuple_GET_ITEM(argdefs, 0);
|
|
+ result =__Pyx_PyFunction_FastCallNoKw(co, args, Py_SIZE(argdefs), globals);
|
|
+ goto done;
|
|
+ }
|
|
+ }
|
|
+ if (kwargs != NULL) {
|
|
+ Py_ssize_t pos, i;
|
|
+ kwtuple = PyTuple_New(2 * nk);
|
|
+ if (kwtuple == NULL) {
|
|
+ result = NULL;
|
|
+ goto done;
|
|
+ }
|
|
+ k = &PyTuple_GET_ITEM(kwtuple, 0);
|
|
+ pos = i = 0;
|
|
+ while (PyDict_Next(kwargs, &pos, &k[i], &k[i+1])) {
|
|
+ Py_INCREF(k[i]);
|
|
+ Py_INCREF(k[i+1]);
|
|
+ i += 2;
|
|
+ }
|
|
+ nk = i / 2;
|
|
+ }
|
|
+ else {
|
|
+ kwtuple = NULL;
|
|
+ k = NULL;
|
|
+ }
|
|
+ closure = PyFunction_GET_CLOSURE(func);
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ kwdefs = PyFunction_GET_KW_DEFAULTS(func);
|
|
+#endif
|
|
+ if (argdefs != NULL) {
|
|
+ d = &PyTuple_GET_ITEM(argdefs, 0);
|
|
+ nd = Py_SIZE(argdefs);
|
|
+ }
|
|
+ else {
|
|
+ d = NULL;
|
|
+ nd = 0;
|
|
+ }
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ result = PyEval_EvalCodeEx((PyObject*)co, globals, (PyObject *)NULL,
|
|
+ args, (int)nargs,
|
|
+ k, (int)nk,
|
|
+ d, (int)nd, kwdefs, closure);
|
|
+#else
|
|
+ result = PyEval_EvalCodeEx(co, globals, (PyObject *)NULL,
|
|
+ args, (int)nargs,
|
|
+ k, (int)nk,
|
|
+ d, (int)nd, closure);
|
|
+#endif
|
|
+ Py_XDECREF(kwtuple);
|
|
+done:
|
|
+ Py_LeaveRecursiveCall();
|
|
+ return result;
|
|
+}
|
|
+#endif
|
|
+#endif
|
|
+
|
|
+/* PyObjectCall */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) {
|
|
+ PyObject *result;
|
|
+ ternaryfunc call = Py_TYPE(func)->tp_call;
|
|
+ if (unlikely(!call))
|
|
+ return PyObject_Call(func, arg, kw);
|
|
+ if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
|
|
+ return NULL;
|
|
+ result = (*call)(func, arg, kw);
|
|
+ Py_LeaveRecursiveCall();
|
|
+ if (unlikely(!result) && unlikely(!PyErr_Occurred())) {
|
|
+ PyErr_SetString(
|
|
+ PyExc_SystemError,
|
|
+ "NULL result without error in PyObject_Call");
|
|
+ }
|
|
+ return result;
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* PyObjectCallMethO */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg) {
|
|
+ PyObject *self, *result;
|
|
+ PyCFunction cfunc;
|
|
+ cfunc = PyCFunction_GET_FUNCTION(func);
|
|
+ self = PyCFunction_GET_SELF(func);
|
|
+ if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
|
|
+ return NULL;
|
|
+ result = cfunc(self, arg);
|
|
+ Py_LeaveRecursiveCall();
|
|
+ if (unlikely(!result) && unlikely(!PyErr_Occurred())) {
|
|
+ PyErr_SetString(
|
|
+ PyExc_SystemError,
|
|
+ "NULL result without error in PyObject_Call");
|
|
+ }
|
|
+ return result;
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* PyObjectCallNoArg */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) {
|
|
+#if CYTHON_FAST_PYCALL
|
|
+ if (PyFunction_Check(func)) {
|
|
+ return __Pyx_PyFunction_FastCall(func, NULL, 0);
|
|
+ }
|
|
+#endif
|
|
+#ifdef __Pyx_CyFunction_USED
|
|
+ if (likely(PyCFunction_Check(func) || __Pyx_CyFunction_Check(func)))
|
|
+#else
|
|
+ if (likely(PyCFunction_Check(func)))
|
|
+#endif
|
|
+ {
|
|
+ if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) {
|
|
+ return __Pyx_PyObject_CallMethO(func, NULL);
|
|
+ }
|
|
+ }
|
|
+ return __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL);
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* PyCFunctionFastCall */
|
|
+#if CYTHON_FAST_PYCCALL
|
|
+static CYTHON_INLINE PyObject * __Pyx_PyCFunction_FastCall(PyObject *func_obj, PyObject **args, Py_ssize_t nargs) {
|
|
+ PyCFunctionObject *func = (PyCFunctionObject*)func_obj;
|
|
+ PyCFunction meth = PyCFunction_GET_FUNCTION(func);
|
|
+ PyObject *self = PyCFunction_GET_SELF(func);
|
|
+ int flags = PyCFunction_GET_FLAGS(func);
|
|
+ assert(PyCFunction_Check(func));
|
|
+ assert(METH_FASTCALL == (flags & ~(METH_CLASS | METH_STATIC | METH_COEXIST | METH_KEYWORDS | METH_STACKLESS)));
|
|
+ assert(nargs >= 0);
|
|
+ assert(nargs == 0 || args != NULL);
|
|
+ /* _PyCFunction_FastCallDict() must not be called with an exception set,
|
|
+ because it may clear it (directly or indirectly) and so the
|
|
+ caller loses its exception */
|
|
+ assert(!PyErr_Occurred());
|
|
+ if ((PY_VERSION_HEX < 0x030700A0) || unlikely(flags & METH_KEYWORDS)) {
|
|
+ return (*((__Pyx_PyCFunctionFastWithKeywords)(void*)meth)) (self, args, nargs, NULL);
|
|
+ } else {
|
|
+ return (*((__Pyx_PyCFunctionFast)(void*)meth)) (self, args, nargs);
|
|
+ }
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* PyObjectCallOneArg */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static PyObject* __Pyx__PyObject_CallOneArg(PyObject *func, PyObject *arg) {
|
|
+ PyObject *result;
|
|
+ PyObject *args = PyTuple_New(1);
|
|
+ if (unlikely(!args)) return NULL;
|
|
+ Py_INCREF(arg);
|
|
+ PyTuple_SET_ITEM(args, 0, arg);
|
|
+ result = __Pyx_PyObject_Call(func, args, NULL);
|
|
+ Py_DECREF(args);
|
|
+ return result;
|
|
+}
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) {
|
|
+#if CYTHON_FAST_PYCALL
|
|
+ if (PyFunction_Check(func)) {
|
|
+ return __Pyx_PyFunction_FastCall(func, &arg, 1);
|
|
+ }
|
|
+#endif
|
|
+ if (likely(PyCFunction_Check(func))) {
|
|
+ if (likely(PyCFunction_GET_FLAGS(func) & METH_O)) {
|
|
+ return __Pyx_PyObject_CallMethO(func, arg);
|
|
+#if CYTHON_FAST_PYCCALL
|
|
+ } else if (__Pyx_PyFastCFunction_Check(func)) {
|
|
+ return __Pyx_PyCFunction_FastCall(func, &arg, 1);
|
|
+#endif
|
|
+ }
|
|
+ }
|
|
+ return __Pyx__PyObject_CallOneArg(func, arg);
|
|
+}
|
|
+#else
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) {
|
|
+ PyObject *result;
|
|
+ PyObject *args = PyTuple_Pack(1, arg);
|
|
+ if (unlikely(!args)) return NULL;
|
|
+ result = __Pyx_PyObject_Call(func, args, NULL);
|
|
+ Py_DECREF(args);
|
|
+ return result;
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* PyDictVersioning */
|
|
+#if CYTHON_USE_DICT_VERSIONS && CYTHON_USE_TYPE_SLOTS
|
|
+static CYTHON_INLINE PY_UINT64_T __Pyx_get_tp_dict_version(PyObject *obj) {
|
|
+ PyObject *dict = Py_TYPE(obj)->tp_dict;
|
|
+ return likely(dict) ? __PYX_GET_DICT_VERSION(dict) : 0;
|
|
+}
|
|
+static CYTHON_INLINE PY_UINT64_T __Pyx_get_object_dict_version(PyObject *obj) {
|
|
+ PyObject **dictptr = NULL;
|
|
+ Py_ssize_t offset = Py_TYPE(obj)->tp_dictoffset;
|
|
+ if (offset) {
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+ dictptr = (likely(offset > 0)) ? (PyObject **) ((char *)obj + offset) : _PyObject_GetDictPtr(obj);
|
|
+#else
|
|
+ dictptr = _PyObject_GetDictPtr(obj);
|
|
+#endif
|
|
+ }
|
|
+ return (dictptr && *dictptr) ? __PYX_GET_DICT_VERSION(*dictptr) : 0;
|
|
+}
|
|
+static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UINT64_T tp_dict_version, PY_UINT64_T obj_dict_version) {
|
|
+ PyObject *dict = Py_TYPE(obj)->tp_dict;
|
|
+ if (unlikely(!dict) || unlikely(tp_dict_version != __PYX_GET_DICT_VERSION(dict)))
|
|
+ return 0;
|
|
+ return obj_dict_version == __Pyx_get_object_dict_version(obj);
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* GetModuleGlobalName */
|
|
+#if CYTHON_USE_DICT_VERSIONS
|
|
+static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value)
|
|
+#else
|
|
+static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name)
|
|
+#endif
|
|
+{
|
|
+ PyObject *result;
|
|
+#if !CYTHON_AVOID_BORROWED_REFS
|
|
+#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030500A1
|
|
+ result = _PyDict_GetItem_KnownHash(__pyx_d, name, ((PyASCIIObject *) name)->hash);
|
|
+ __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version)
|
|
+ if (likely(result)) {
|
|
+ return __Pyx_NewRef(result);
|
|
+ } else if (unlikely(PyErr_Occurred())) {
|
|
+ return NULL;
|
|
+ }
|
|
+#else
|
|
+ result = PyDict_GetItem(__pyx_d, name);
|
|
+ __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version)
|
|
+ if (likely(result)) {
|
|
+ return __Pyx_NewRef(result);
|
|
+ }
|
|
+#endif
|
|
+#else
|
|
+ result = PyObject_GetItem(__pyx_d, name);
|
|
+ __PYX_UPDATE_DICT_CACHE(__pyx_d, result, *dict_cached_value, *dict_version)
|
|
+ if (likely(result)) {
|
|
+ return __Pyx_NewRef(result);
|
|
+ }
|
|
+ PyErr_Clear();
|
|
+#endif
|
|
+ return __Pyx_GetBuiltinName(name);
|
|
+}
|
|
+
|
|
+/* PyIntCompare */
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyInt_EqObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED long inplace) {
|
|
+ if (op1 == op2) {
|
|
+ Py_RETURN_TRUE;
|
|
+ }
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ if (likely(PyInt_CheckExact(op1))) {
|
|
+ const long b = intval;
|
|
+ long a = PyInt_AS_LONG(op1);
|
|
+ if (a == b) Py_RETURN_TRUE; else Py_RETURN_FALSE;
|
|
+ }
|
|
+ #endif
|
|
+ #if CYTHON_USE_PYLONG_INTERNALS
|
|
+ if (likely(PyLong_CheckExact(op1))) {
|
|
+ int unequal;
|
|
+ unsigned long uintval;
|
|
+ Py_ssize_t size = Py_SIZE(op1);
|
|
+ const digit* digits = ((PyLongObject*)op1)->ob_digit;
|
|
+ if (intval == 0) {
|
|
+ if (size == 0) Py_RETURN_TRUE; else Py_RETURN_FALSE;
|
|
+ } else if (intval < 0) {
|
|
+ if (size >= 0)
|
|
+ Py_RETURN_FALSE;
|
|
+ intval = -intval;
|
|
+ size = -size;
|
|
+ } else {
|
|
+ if (size <= 0)
|
|
+ Py_RETURN_FALSE;
|
|
+ }
|
|
+ uintval = (unsigned long) intval;
|
|
+#if PyLong_SHIFT * 4 < SIZEOF_LONG*8
|
|
+ if (uintval >> (PyLong_SHIFT * 4)) {
|
|
+ unequal = (size != 5) || (digits[0] != (uintval & (unsigned long) PyLong_MASK))
|
|
+ | (digits[1] != ((uintval >> (1 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK)) | (digits[2] != ((uintval >> (2 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK)) | (digits[3] != ((uintval >> (3 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK)) | (digits[4] != ((uintval >> (4 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK));
|
|
+ } else
|
|
+#endif
|
|
+#if PyLong_SHIFT * 3 < SIZEOF_LONG*8
|
|
+ if (uintval >> (PyLong_SHIFT * 3)) {
|
|
+ unequal = (size != 4) || (digits[0] != (uintval & (unsigned long) PyLong_MASK))
|
|
+ | (digits[1] != ((uintval >> (1 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK)) | (digits[2] != ((uintval >> (2 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK)) | (digits[3] != ((uintval >> (3 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK));
|
|
+ } else
|
|
+#endif
|
|
+#if PyLong_SHIFT * 2 < SIZEOF_LONG*8
|
|
+ if (uintval >> (PyLong_SHIFT * 2)) {
|
|
+ unequal = (size != 3) || (digits[0] != (uintval & (unsigned long) PyLong_MASK))
|
|
+ | (digits[1] != ((uintval >> (1 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK)) | (digits[2] != ((uintval >> (2 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK));
|
|
+ } else
|
|
+#endif
|
|
+#if PyLong_SHIFT * 1 < SIZEOF_LONG*8
|
|
+ if (uintval >> (PyLong_SHIFT * 1)) {
|
|
+ unequal = (size != 2) || (digits[0] != (uintval & (unsigned long) PyLong_MASK))
|
|
+ | (digits[1] != ((uintval >> (1 * PyLong_SHIFT)) & (unsigned long) PyLong_MASK));
|
|
+ } else
|
|
+#endif
|
|
+ unequal = (size != 1) || (((unsigned long) digits[0]) != (uintval & (unsigned long) PyLong_MASK));
|
|
+ if (unequal == 0) Py_RETURN_TRUE; else Py_RETURN_FALSE;
|
|
+ }
|
|
+ #endif
|
|
+ if (PyFloat_CheckExact(op1)) {
|
|
+ const long b = intval;
|
|
+ double a = PyFloat_AS_DOUBLE(op1);
|
|
+ if ((double)a == (double)b) Py_RETURN_TRUE; else Py_RETURN_FALSE;
|
|
+ }
|
|
+ return (
|
|
+ PyObject_RichCompare(op1, op2, Py_EQ));
|
|
+}
|
|
+
|
|
+/* PyObjectCall2Args */
|
|
+static CYTHON_UNUSED PyObject* __Pyx_PyObject_Call2Args(PyObject* function, PyObject* arg1, PyObject* arg2) {
|
|
+ PyObject *args, *result = NULL;
|
|
+ #if CYTHON_FAST_PYCALL
|
|
+ if (PyFunction_Check(function)) {
|
|
+ PyObject *args[2] = {arg1, arg2};
|
|
+ return __Pyx_PyFunction_FastCall(function, args, 2);
|
|
+ }
|
|
+ #endif
|
|
+ #if CYTHON_FAST_PYCCALL
|
|
+ if (__Pyx_PyFastCFunction_Check(function)) {
|
|
+ PyObject *args[2] = {arg1, arg2};
|
|
+ return __Pyx_PyCFunction_FastCall(function, args, 2);
|
|
+ }
|
|
+ #endif
|
|
+ args = PyTuple_New(2);
|
|
+ if (unlikely(!args)) goto done;
|
|
+ Py_INCREF(arg1);
|
|
+ PyTuple_SET_ITEM(args, 0, arg1);
|
|
+ Py_INCREF(arg2);
|
|
+ PyTuple_SET_ITEM(args, 1, arg2);
|
|
+ Py_INCREF(function);
|
|
+ result = __Pyx_PyObject_Call(function, args, NULL);
|
|
+ Py_DECREF(args);
|
|
+ Py_DECREF(function);
|
|
+done:
|
|
+ return result;
|
|
+}
|
|
|
|
+/* GetItemInt */
|
|
+static PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
|
|
+ PyObject *r;
|
|
+ if (!j) return NULL;
|
|
+ r = PyObject_GetItem(o, j);
|
|
+ Py_DECREF(j);
|
|
+ return r;
|
|
+}
|
|
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i,
|
|
+ CYTHON_NCP_UNUSED int wraparound,
|
|
+ CYTHON_NCP_UNUSED int boundscheck) {
|
|
+#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
|
|
+ Py_ssize_t wrapped_i = i;
|
|
+ if (wraparound & unlikely(i < 0)) {
|
|
+ wrapped_i += PyList_GET_SIZE(o);
|
|
+ }
|
|
+ if ((!boundscheck) || likely(__Pyx_is_valid_index(wrapped_i, PyList_GET_SIZE(o)))) {
|
|
+ PyObject *r = PyList_GET_ITEM(o, wrapped_i);
|
|
+ Py_INCREF(r);
|
|
+ return r;
|
|
+ }
|
|
+ return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
|
|
+#else
|
|
+ return PySequence_GetItem(o, i);
|
|
+#endif
|
|
+}
|
|
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i,
|
|
+ CYTHON_NCP_UNUSED int wraparound,
|
|
+ CYTHON_NCP_UNUSED int boundscheck) {
|
|
+#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
|
|
+ Py_ssize_t wrapped_i = i;
|
|
+ if (wraparound & unlikely(i < 0)) {
|
|
+ wrapped_i += PyTuple_GET_SIZE(o);
|
|
+ }
|
|
+ if ((!boundscheck) || likely(__Pyx_is_valid_index(wrapped_i, PyTuple_GET_SIZE(o)))) {
|
|
+ PyObject *r = PyTuple_GET_ITEM(o, wrapped_i);
|
|
+ Py_INCREF(r);
|
|
+ return r;
|
|
+ }
|
|
+ return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
|
|
+#else
|
|
+ return PySequence_GetItem(o, i);
|
|
+#endif
|
|
+}
|
|
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int is_list,
|
|
+ CYTHON_NCP_UNUSED int wraparound,
|
|
+ CYTHON_NCP_UNUSED int boundscheck) {
|
|
+#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS && CYTHON_USE_TYPE_SLOTS
|
|
+ if (is_list || PyList_CheckExact(o)) {
|
|
+ Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyList_GET_SIZE(o);
|
|
+ if ((!boundscheck) || (likely(__Pyx_is_valid_index(n, PyList_GET_SIZE(o))))) {
|
|
+ PyObject *r = PyList_GET_ITEM(o, n);
|
|
+ Py_INCREF(r);
|
|
+ return r;
|
|
+ }
|
|
+ }
|
|
+ else if (PyTuple_CheckExact(o)) {
|
|
+ Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyTuple_GET_SIZE(o);
|
|
+ if ((!boundscheck) || likely(__Pyx_is_valid_index(n, PyTuple_GET_SIZE(o)))) {
|
|
+ PyObject *r = PyTuple_GET_ITEM(o, n);
|
|
+ Py_INCREF(r);
|
|
+ return r;
|
|
+ }
|
|
+ } else {
|
|
+ PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence;
|
|
+ if (likely(m && m->sq_item)) {
|
|
+ if (wraparound && unlikely(i < 0) && likely(m->sq_length)) {
|
|
+ Py_ssize_t l = m->sq_length(o);
|
|
+ if (likely(l >= 0)) {
|
|
+ i += l;
|
|
+ } else {
|
|
+ if (!PyErr_ExceptionMatches(PyExc_OverflowError))
|
|
+ return NULL;
|
|
+ PyErr_Clear();
|
|
+ }
|
|
+ }
|
|
+ return m->sq_item(o, i);
|
|
+ }
|
|
+ }
|
|
+#else
|
|
+ if (is_list || PySequence_Check(o)) {
|
|
+ return PySequence_GetItem(o, i);
|
|
+ }
|
|
+#endif
|
|
+ return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));
|
|
+}
|
|
+
|
|
+/* PyIntBinop */
|
|
+#if !CYTHON_COMPILING_IN_PYPY
|
|
+static PyObject* __Pyx_PyInt_AddObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, int inplace, int zerodivision_check) {
|
|
+ (void)inplace;
|
|
+ (void)zerodivision_check;
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ if (likely(PyInt_CheckExact(op1))) {
|
|
+ const long b = intval;
|
|
+ long x;
|
|
+ long a = PyInt_AS_LONG(op1);
|
|
+ x = (long)((unsigned long)a + b);
|
|
+ if (likely((x^a) >= 0 || (x^b) >= 0))
|
|
+ return PyInt_FromLong(x);
|
|
+ return PyLong_Type.tp_as_number->nb_add(op1, op2);
|
|
+ }
|
|
+ #endif
|
|
+ #if CYTHON_USE_PYLONG_INTERNALS
|
|
+ if (likely(PyLong_CheckExact(op1))) {
|
|
+ const long b = intval;
|
|
+ long a, x;
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ const PY_LONG_LONG llb = intval;
|
|
+ PY_LONG_LONG lla, llx;
|
|
+#endif
|
|
+ const digit* digits = ((PyLongObject*)op1)->ob_digit;
|
|
+ const Py_ssize_t size = Py_SIZE(op1);
|
|
+ if (likely(__Pyx_sst_abs(size) <= 1)) {
|
|
+ a = likely(size) ? digits[0] : 0;
|
|
+ if (size == -1) a = -a;
|
|
+ } else {
|
|
+ switch (size) {
|
|
+ case -2:
|
|
+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {
|
|
+ a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
|
|
+ break;
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {
|
|
+ lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
|
|
+ goto long_long;
|
|
+#endif
|
|
+ }
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case 2:
|
|
+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {
|
|
+ a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
|
|
+ break;
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {
|
|
+ lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
|
|
+ goto long_long;
|
|
+#endif
|
|
+ }
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case -3:
|
|
+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {
|
|
+ a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
|
|
+ break;
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {
|
|
+ lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
|
|
+ goto long_long;
|
|
+#endif
|
|
+ }
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case 3:
|
|
+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {
|
|
+ a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
|
|
+ break;
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {
|
|
+ lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
|
|
+ goto long_long;
|
|
+#endif
|
|
+ }
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case -4:
|
|
+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {
|
|
+ a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
|
|
+ break;
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {
|
|
+ lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
|
|
+ goto long_long;
|
|
+#endif
|
|
+ }
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ case 4:
|
|
+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {
|
|
+ a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));
|
|
+ break;
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {
|
|
+ lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));
|
|
+ goto long_long;
|
|
+#endif
|
|
+ }
|
|
+ CYTHON_FALLTHROUGH;
|
|
+ default: return PyLong_Type.tp_as_number->nb_add(op1, op2);
|
|
+ }
|
|
+ }
|
|
+ x = a + b;
|
|
+ return PyLong_FromLong(x);
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ long_long:
|
|
+ llx = lla + llb;
|
|
+ return PyLong_FromLongLong(llx);
|
|
+#endif
|
|
+
|
|
+
|
|
+ }
|
|
+ #endif
|
|
+ if (PyFloat_CheckExact(op1)) {
|
|
+ const long b = intval;
|
|
+ double a = PyFloat_AS_DOUBLE(op1);
|
|
+ double result;
|
|
+ PyFPE_START_PROTECT("add", return NULL)
|
|
+ result = ((double)a) + (double)b;
|
|
+ PyFPE_END_PROTECT(result)
|
|
+ return PyFloat_FromDouble(result);
|
|
+ }
|
|
+ return (inplace ? PyNumber_InPlaceAdd : PyNumber_Add)(op1, op2);
|
|
+}
|
|
+#endif
|
|
+
|
|
+/* PyObjectFormatAndDecref */
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_FormatSimpleAndDecref(PyObject* s, PyObject* f) {
|
|
+ if (unlikely(!s)) return NULL;
|
|
+ if (likely(PyUnicode_CheckExact(s))) return s;
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ if (likely(PyString_CheckExact(s))) {
|
|
+ PyObject *result = PyUnicode_FromEncodedObject(s, NULL, "strict");
|
|
+ Py_DECREF(s);
|
|
+ return result;
|
|
+ }
|
|
+ #endif
|
|
+ return __Pyx_PyObject_FormatAndDecref(s, f);
|
|
+}
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyObject_FormatAndDecref(PyObject* s, PyObject* f) {
|
|
+ PyObject *result = PyObject_Format(s, f);
|
|
+ Py_DECREF(s);
|
|
+ return result;
|
|
+}
|
|
+
|
|
+/* JoinPyUnicode */
|
|
+static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_count, Py_ssize_t result_ulength,
|
|
+ CYTHON_UNUSED Py_UCS4 max_char) {
|
|
+#if CYTHON_USE_UNICODE_INTERNALS && CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
|
|
+ PyObject *result_uval;
|
|
+ int result_ukind;
|
|
+ Py_ssize_t i, char_pos;
|
|
+ void *result_udata;
|
|
+#if CYTHON_PEP393_ENABLED
|
|
+ result_uval = PyUnicode_New(result_ulength, max_char);
|
|
+ if (unlikely(!result_uval)) return NULL;
|
|
+ result_ukind = (max_char <= 255) ? PyUnicode_1BYTE_KIND : (max_char <= 65535) ? PyUnicode_2BYTE_KIND : PyUnicode_4BYTE_KIND;
|
|
+ result_udata = PyUnicode_DATA(result_uval);
|
|
+#else
|
|
+ result_uval = PyUnicode_FromUnicode(NULL, result_ulength);
|
|
+ if (unlikely(!result_uval)) return NULL;
|
|
+ result_ukind = sizeof(Py_UNICODE);
|
|
+ result_udata = PyUnicode_AS_UNICODE(result_uval);
|
|
+#endif
|
|
+ char_pos = 0;
|
|
+ for (i=0; i < value_count; i++) {
|
|
+ int ukind;
|
|
+ Py_ssize_t ulength;
|
|
+ void *udata;
|
|
+ PyObject *uval = PyTuple_GET_ITEM(value_tuple, i);
|
|
+ if (unlikely(__Pyx_PyUnicode_READY(uval)))
|
|
+ goto bad;
|
|
+ ulength = __Pyx_PyUnicode_GET_LENGTH(uval);
|
|
+ if (unlikely(!ulength))
|
|
+ continue;
|
|
+ if (unlikely(char_pos + ulength < 0))
|
|
+ goto overflow;
|
|
+ ukind = __Pyx_PyUnicode_KIND(uval);
|
|
+ udata = __Pyx_PyUnicode_DATA(uval);
|
|
+ if (!CYTHON_PEP393_ENABLED || ukind == result_ukind) {
|
|
+ memcpy((char *)result_udata + char_pos * result_ukind, udata, (size_t) (ulength * result_ukind));
|
|
+ } else {
|
|
+ #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030300F0 || defined(_PyUnicode_FastCopyCharacters)
|
|
+ _PyUnicode_FastCopyCharacters(result_uval, char_pos, uval, 0, ulength);
|
|
+ #else
|
|
+ Py_ssize_t j;
|
|
+ for (j=0; j < ulength; j++) {
|
|
+ Py_UCS4 uchar = __Pyx_PyUnicode_READ(ukind, udata, j);
|
|
+ __Pyx_PyUnicode_WRITE(result_ukind, result_udata, char_pos+j, uchar);
|
|
+ }
|
|
+ #endif
|
|
+ }
|
|
+ char_pos += ulength;
|
|
+ }
|
|
+ return result_uval;
|
|
+overflow:
|
|
+ PyErr_SetString(PyExc_OverflowError, "join() result is too long for a Python string");
|
|
+bad:
|
|
+ Py_DECREF(result_uval);
|
|
+ return NULL;
|
|
+#else
|
|
+ result_ulength++;
|
|
+ value_count++;
|
|
+ return PyUnicode_Join(__pyx_empty_unicode, value_tuple);
|
|
+#endif
|
|
+}
|
|
+
|
|
+/* ExtTypeTest */
|
|
static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
|
|
if (unlikely(!type)) {
|
|
- PyErr_Format(PyExc_SystemError, "Missing type object");
|
|
+ PyErr_SetString(PyExc_SystemError, "Missing type object");
|
|
return 0;
|
|
}
|
|
- if (likely(PyObject_TypeCheck(obj, type)))
|
|
+ if (likely(__Pyx_TypeCheck(obj, type)))
|
|
return 1;
|
|
PyErr_Format(PyExc_TypeError, "Cannot convert %.200s to %.200s",
|
|
Py_TYPE(obj)->tp_name, type->tp_name);
|
|
return 0;
|
|
}
|
|
|
|
-static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
|
|
+/* PyErrFetchRestore */
|
|
+#if CYTHON_FAST_THREAD_STATE
|
|
+static CYTHON_INLINE void __Pyx_ErrRestoreInState(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {
|
|
PyObject *tmp_type, *tmp_value, *tmp_tb;
|
|
- PyThreadState *tstate = PyThreadState_GET();
|
|
-
|
|
tmp_type = tstate->curexc_type;
|
|
tmp_value = tstate->curexc_value;
|
|
tmp_tb = tstate->curexc_traceback;
|
|
@@ -1641,76 +3730,60 @@
|
|
Py_XDECREF(tmp_value);
|
|
Py_XDECREF(tmp_tb);
|
|
}
|
|
-
|
|
-static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
|
|
- PyThreadState *tstate = PyThreadState_GET();
|
|
+static CYTHON_INLINE void __Pyx_ErrFetchInState(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {
|
|
*type = tstate->curexc_type;
|
|
*value = tstate->curexc_value;
|
|
*tb = tstate->curexc_traceback;
|
|
-
|
|
tstate->curexc_type = 0;
|
|
tstate->curexc_value = 0;
|
|
tstate->curexc_traceback = 0;
|
|
}
|
|
+#endif
|
|
|
|
-
|
|
+/* RaiseException */
|
|
#if PY_MAJOR_VERSION < 3
|
|
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
|
|
+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb,
|
|
+ CYTHON_UNUSED PyObject *cause) {
|
|
+ __Pyx_PyThreadState_declare
|
|
Py_XINCREF(type);
|
|
- Py_XINCREF(value);
|
|
- Py_XINCREF(tb);
|
|
- /* First, check the traceback argument, replacing None with NULL. */
|
|
- if (tb == Py_None) {
|
|
- Py_DECREF(tb);
|
|
- tb = 0;
|
|
- }
|
|
- else if (tb != NULL && !PyTraceBack_Check(tb)) {
|
|
- PyErr_SetString(PyExc_TypeError,
|
|
- "raise: arg 3 must be a traceback or None");
|
|
- goto raise_error;
|
|
- }
|
|
- /* Next, replace a missing value with None */
|
|
- if (value == NULL) {
|
|
- value = Py_None;
|
|
+ if (!value || value == Py_None)
|
|
+ value = NULL;
|
|
+ else
|
|
Py_INCREF(value);
|
|
+ if (!tb || tb == Py_None)
|
|
+ tb = NULL;
|
|
+ else {
|
|
+ Py_INCREF(tb);
|
|
+ if (!PyTraceBack_Check(tb)) {
|
|
+ PyErr_SetString(PyExc_TypeError,
|
|
+ "raise: arg 3 must be a traceback or None");
|
|
+ goto raise_error;
|
|
+ }
|
|
}
|
|
- #if PY_VERSION_HEX < 0x02050000
|
|
- if (!PyClass_Check(type))
|
|
- #else
|
|
- if (!PyType_Check(type))
|
|
- #endif
|
|
- {
|
|
- /* Raising an instance. The value should be a dummy. */
|
|
- if (value != Py_None) {
|
|
+ if (PyType_Check(type)) {
|
|
+#if CYTHON_COMPILING_IN_PYPY
|
|
+ if (!value) {
|
|
+ Py_INCREF(Py_None);
|
|
+ value = Py_None;
|
|
+ }
|
|
+#endif
|
|
+ PyErr_NormalizeException(&type, &value, &tb);
|
|
+ } else {
|
|
+ if (value) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"instance exception may not have a separate value");
|
|
goto raise_error;
|
|
}
|
|
- /* Normalize to raise <class>, <instance> */
|
|
- Py_DECREF(value);
|
|
value = type;
|
|
- #if PY_VERSION_HEX < 0x02050000
|
|
- if (PyInstance_Check(type)) {
|
|
- type = (PyObject*) ((PyInstanceObject*)type)->in_class;
|
|
- Py_INCREF(type);
|
|
- }
|
|
- else {
|
|
- type = 0;
|
|
- PyErr_SetString(PyExc_TypeError,
|
|
- "raise: exception must be an old-style class or instance");
|
|
- goto raise_error;
|
|
- }
|
|
- #else
|
|
- type = (PyObject*) Py_TYPE(type);
|
|
- Py_INCREF(type);
|
|
- if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {
|
|
- PyErr_SetString(PyExc_TypeError,
|
|
- "raise: exception class must be a subclass of BaseException");
|
|
- goto raise_error;
|
|
- }
|
|
- #endif
|
|
+ type = (PyObject*) Py_TYPE(type);
|
|
+ Py_INCREF(type);
|
|
+ if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {
|
|
+ PyErr_SetString(PyExc_TypeError,
|
|
+ "raise: exception class must be a subclass of BaseException");
|
|
+ goto raise_error;
|
|
+ }
|
|
}
|
|
-
|
|
+ __Pyx_PyThreadState_assign
|
|
__Pyx_ErrRestore(type, value, tb);
|
|
return;
|
|
raise_error:
|
|
@@ -1719,10 +3792,9 @@
|
|
Py_XDECREF(tb);
|
|
return;
|
|
}
|
|
-
|
|
-#else /* Python 3+ */
|
|
-
|
|
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
|
|
+#else
|
|
+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause) {
|
|
+ PyObject* owned_instance = NULL;
|
|
if (tb == Py_None) {
|
|
tb = 0;
|
|
} else if (tb && !PyTraceBack_Check(tb)) {
|
|
@@ -1732,7 +3804,6 @@
|
|
}
|
|
if (value == Py_None)
|
|
value = 0;
|
|
-
|
|
if (PyExceptionInstance_Check(type)) {
|
|
if (value) {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
@@ -1741,611 +3812,974 @@
|
|
}
|
|
value = type;
|
|
type = (PyObject*) Py_TYPE(value);
|
|
- } else if (!PyExceptionClass_Check(type)) {
|
|
+ } else if (PyExceptionClass_Check(type)) {
|
|
+ PyObject *instance_class = NULL;
|
|
+ if (value && PyExceptionInstance_Check(value)) {
|
|
+ instance_class = (PyObject*) Py_TYPE(value);
|
|
+ if (instance_class != type) {
|
|
+ int is_subclass = PyObject_IsSubclass(instance_class, type);
|
|
+ if (!is_subclass) {
|
|
+ instance_class = NULL;
|
|
+ } else if (unlikely(is_subclass == -1)) {
|
|
+ goto bad;
|
|
+ } else {
|
|
+ type = instance_class;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ if (!instance_class) {
|
|
+ PyObject *args;
|
|
+ if (!value)
|
|
+ args = PyTuple_New(0);
|
|
+ else if (PyTuple_Check(value)) {
|
|
+ Py_INCREF(value);
|
|
+ args = value;
|
|
+ } else
|
|
+ args = PyTuple_Pack(1, value);
|
|
+ if (!args)
|
|
+ goto bad;
|
|
+ owned_instance = PyObject_Call(type, args, NULL);
|
|
+ Py_DECREF(args);
|
|
+ if (!owned_instance)
|
|
+ goto bad;
|
|
+ value = owned_instance;
|
|
+ if (!PyExceptionInstance_Check(value)) {
|
|
+ PyErr_Format(PyExc_TypeError,
|
|
+ "calling %R should have returned an instance of "
|
|
+ "BaseException, not %R",
|
|
+ type, Py_TYPE(value));
|
|
+ goto bad;
|
|
+ }
|
|
+ }
|
|
+ } else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"raise: exception class must be a subclass of BaseException");
|
|
goto bad;
|
|
}
|
|
-
|
|
+ if (cause) {
|
|
+ PyObject *fixed_cause;
|
|
+ if (cause == Py_None) {
|
|
+ fixed_cause = NULL;
|
|
+ } else if (PyExceptionClass_Check(cause)) {
|
|
+ fixed_cause = PyObject_CallObject(cause, NULL);
|
|
+ if (fixed_cause == NULL)
|
|
+ goto bad;
|
|
+ } else if (PyExceptionInstance_Check(cause)) {
|
|
+ fixed_cause = cause;
|
|
+ Py_INCREF(fixed_cause);
|
|
+ } else {
|
|
+ PyErr_SetString(PyExc_TypeError,
|
|
+ "exception causes must derive from "
|
|
+ "BaseException");
|
|
+ goto bad;
|
|
+ }
|
|
+ PyException_SetCause(value, fixed_cause);
|
|
+ }
|
|
PyErr_SetObject(type, value);
|
|
-
|
|
if (tb) {
|
|
- PyThreadState *tstate = PyThreadState_GET();
|
|
+#if CYTHON_COMPILING_IN_PYPY
|
|
+ PyObject *tmp_type, *tmp_value, *tmp_tb;
|
|
+ PyErr_Fetch(&tmp_type, &tmp_value, &tmp_tb);
|
|
+ Py_INCREF(tb);
|
|
+ PyErr_Restore(tmp_type, tmp_value, tb);
|
|
+ Py_XDECREF(tmp_tb);
|
|
+#else
|
|
+ PyThreadState *tstate = __Pyx_PyThreadState_Current;
|
|
PyObject* tmp_tb = tstate->curexc_traceback;
|
|
if (tb != tmp_tb) {
|
|
Py_INCREF(tb);
|
|
tstate->curexc_traceback = tb;
|
|
Py_XDECREF(tmp_tb);
|
|
}
|
|
+#endif
|
|
}
|
|
-
|
|
bad:
|
|
+ Py_XDECREF(owned_instance);
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
|
|
- PyObject *py_import = 0;
|
|
- PyObject *empty_list = 0;
|
|
- PyObject *module = 0;
|
|
- PyObject *global_dict = 0;
|
|
- PyObject *empty_dict = 0;
|
|
- PyObject *list;
|
|
- py_import = __Pyx_GetAttrString(__pyx_b, "__import__");
|
|
- if (!py_import)
|
|
+/* TypeImport */
|
|
+#ifndef __PYX_HAVE_RT_ImportType
|
|
+#define __PYX_HAVE_RT_ImportType
|
|
+static PyTypeObject *__Pyx_ImportType(PyObject *module, const char *module_name, const char *class_name,
|
|
+ size_t size, enum __Pyx_ImportType_CheckSize check_size)
|
|
+{
|
|
+ PyObject *result = 0;
|
|
+ char warning[200];
|
|
+ Py_ssize_t basicsize;
|
|
+#ifdef Py_LIMITED_API
|
|
+ PyObject *py_basicsize;
|
|
+#endif
|
|
+ result = PyObject_GetAttrString(module, class_name);
|
|
+ if (!result)
|
|
+ goto bad;
|
|
+ if (!PyType_Check(result)) {
|
|
+ PyErr_Format(PyExc_TypeError,
|
|
+ "%.200s.%.200s is not a type object",
|
|
+ module_name, class_name);
|
|
goto bad;
|
|
- if (from_list)
|
|
- list = from_list;
|
|
- else {
|
|
- empty_list = PyList_New(0);
|
|
- if (!empty_list)
|
|
- goto bad;
|
|
- list = empty_list;
|
|
}
|
|
- global_dict = PyModule_GetDict(__pyx_m);
|
|
- if (!global_dict)
|
|
+#ifndef Py_LIMITED_API
|
|
+ basicsize = ((PyTypeObject *)result)->tp_basicsize;
|
|
+#else
|
|
+ py_basicsize = PyObject_GetAttrString(result, "__basicsize__");
|
|
+ if (!py_basicsize)
|
|
goto bad;
|
|
- empty_dict = PyDict_New();
|
|
- if (!empty_dict)
|
|
+ basicsize = PyLong_AsSsize_t(py_basicsize);
|
|
+ Py_DECREF(py_basicsize);
|
|
+ py_basicsize = 0;
|
|
+ if (basicsize == (Py_ssize_t)-1 && PyErr_Occurred())
|
|
goto bad;
|
|
- module = PyObject_CallFunctionObjArgs(py_import,
|
|
- name, global_dict, empty_dict, list, NULL);
|
|
+#endif
|
|
+ if ((size_t)basicsize < size) {
|
|
+ PyErr_Format(PyExc_ValueError,
|
|
+ "%.200s.%.200s size changed, may indicate binary incompatibility. "
|
|
+ "Expected %zd from C header, got %zd from PyObject",
|
|
+ module_name, class_name, size, basicsize);
|
|
+ goto bad;
|
|
+ }
|
|
+ if (check_size == __Pyx_ImportType_CheckSize_Error && (size_t)basicsize != size) {
|
|
+ PyErr_Format(PyExc_ValueError,
|
|
+ "%.200s.%.200s size changed, may indicate binary incompatibility. "
|
|
+ "Expected %zd from C header, got %zd from PyObject",
|
|
+ module_name, class_name, size, basicsize);
|
|
+ goto bad;
|
|
+ }
|
|
+ else if (check_size == __Pyx_ImportType_CheckSize_Warn && (size_t)basicsize > size) {
|
|
+ PyOS_snprintf(warning, sizeof(warning),
|
|
+ "%s.%s size changed, may indicate binary incompatibility. "
|
|
+ "Expected %zd from C header, got %zd from PyObject",
|
|
+ module_name, class_name, size, basicsize);
|
|
+ if (PyErr_WarnEx(NULL, warning, 0) < 0) goto bad;
|
|
+ }
|
|
+ return (PyTypeObject *)result;
|
|
bad:
|
|
- Py_XDECREF(empty_list);
|
|
- Py_XDECREF(py_import);
|
|
- Py_XDECREF(empty_dict);
|
|
- return module;
|
|
+ Py_XDECREF(result);
|
|
+ return NULL;
|
|
}
|
|
+#endif
|
|
|
|
-static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
|
|
- const unsigned char neg_one = (unsigned char)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(unsigned char) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(unsigned char)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to unsigned char" :
|
|
- "value too large to convert to unsigned char");
|
|
- }
|
|
- return (unsigned char)-1;
|
|
- }
|
|
- return (unsigned char)val;
|
|
+/* CLineInTraceback */
|
|
+#ifndef CYTHON_CLINE_IN_TRACEBACK
|
|
+static int __Pyx_CLineForTraceback(CYTHON_NCP_UNUSED PyThreadState *tstate, int c_line) {
|
|
+ PyObject *use_cline;
|
|
+ PyObject *ptype, *pvalue, *ptraceback;
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+ PyObject **cython_runtime_dict;
|
|
+#endif
|
|
+ if (unlikely(!__pyx_cython_runtime)) {
|
|
+ return c_line;
|
|
+ }
|
|
+ __Pyx_ErrFetchInState(tstate, &ptype, &pvalue, &ptraceback);
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+ cython_runtime_dict = _PyObject_GetDictPtr(__pyx_cython_runtime);
|
|
+ if (likely(cython_runtime_dict)) {
|
|
+ __PYX_PY_DICT_LOOKUP_IF_MODIFIED(
|
|
+ use_cline, *cython_runtime_dict,
|
|
+ __Pyx_PyDict_GetItemStr(*cython_runtime_dict, __pyx_n_s_cline_in_traceback))
|
|
+ } else
|
|
+#endif
|
|
+ {
|
|
+ PyObject *use_cline_obj = __Pyx_PyObject_GetAttrStr(__pyx_cython_runtime, __pyx_n_s_cline_in_traceback);
|
|
+ if (use_cline_obj) {
|
|
+ use_cline = PyObject_Not(use_cline_obj) ? Py_False : Py_True;
|
|
+ Py_DECREF(use_cline_obj);
|
|
+ } else {
|
|
+ PyErr_Clear();
|
|
+ use_cline = NULL;
|
|
+ }
|
|
}
|
|
- return (unsigned char)__Pyx_PyInt_AsUnsignedLong(x);
|
|
+ if (!use_cline) {
|
|
+ c_line = 0;
|
|
+ (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;
|
|
+ }
|
|
+ __Pyx_ErrRestoreInState(tstate, ptype, pvalue, ptraceback);
|
|
+ return c_line;
|
|
}
|
|
+#endif
|
|
|
|
-static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
|
|
- const unsigned short neg_one = (unsigned short)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(unsigned short) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(unsigned short)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to unsigned short" :
|
|
- "value too large to convert to unsigned short");
|
|
- }
|
|
- return (unsigned short)-1;
|
|
+/* CodeObjectCache */
|
|
+static int __pyx_bisect_code_objects(__Pyx_CodeObjectCacheEntry* entries, int count, int code_line) {
|
|
+ int start = 0, mid = 0, end = count - 1;
|
|
+ if (end >= 0 && code_line > entries[end].code_line) {
|
|
+ return count;
|
|
+ }
|
|
+ while (start < end) {
|
|
+ mid = start + (end - start) / 2;
|
|
+ if (code_line < entries[mid].code_line) {
|
|
+ end = mid;
|
|
+ } else if (code_line > entries[mid].code_line) {
|
|
+ start = mid + 1;
|
|
+ } else {
|
|
+ return mid;
|
|
}
|
|
- return (unsigned short)val;
|
|
}
|
|
- return (unsigned short)__Pyx_PyInt_AsUnsignedLong(x);
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
|
|
- const unsigned int neg_one = (unsigned int)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(unsigned int) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(unsigned int)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to unsigned int" :
|
|
- "value too large to convert to unsigned int");
|
|
- }
|
|
- return (unsigned int)-1;
|
|
- }
|
|
- return (unsigned int)val;
|
|
+ if (code_line <= entries[mid].code_line) {
|
|
+ return mid;
|
|
+ } else {
|
|
+ return mid + 1;
|
|
}
|
|
- return (unsigned int)__Pyx_PyInt_AsUnsignedLong(x);
|
|
}
|
|
-
|
|
-static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
|
|
- const char neg_one = (char)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(char) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(char)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to char" :
|
|
- "value too large to convert to char");
|
|
- }
|
|
- return (char)-1;
|
|
+static PyCodeObject *__pyx_find_code_object(int code_line) {
|
|
+ PyCodeObject* code_object;
|
|
+ int pos;
|
|
+ if (unlikely(!code_line) || unlikely(!__pyx_code_cache.entries)) {
|
|
+ return NULL;
|
|
+ }
|
|
+ pos = __pyx_bisect_code_objects(__pyx_code_cache.entries, __pyx_code_cache.count, code_line);
|
|
+ if (unlikely(pos >= __pyx_code_cache.count) || unlikely(__pyx_code_cache.entries[pos].code_line != code_line)) {
|
|
+ return NULL;
|
|
+ }
|
|
+ code_object = __pyx_code_cache.entries[pos].code_object;
|
|
+ Py_INCREF(code_object);
|
|
+ return code_object;
|
|
+}
|
|
+static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) {
|
|
+ int pos, i;
|
|
+ __Pyx_CodeObjectCacheEntry* entries = __pyx_code_cache.entries;
|
|
+ if (unlikely(!code_line)) {
|
|
+ return;
|
|
+ }
|
|
+ if (unlikely(!entries)) {
|
|
+ entries = (__Pyx_CodeObjectCacheEntry*)PyMem_Malloc(64*sizeof(__Pyx_CodeObjectCacheEntry));
|
|
+ if (likely(entries)) {
|
|
+ __pyx_code_cache.entries = entries;
|
|
+ __pyx_code_cache.max_count = 64;
|
|
+ __pyx_code_cache.count = 1;
|
|
+ entries[0].code_line = code_line;
|
|
+ entries[0].code_object = code_object;
|
|
+ Py_INCREF(code_object);
|
|
}
|
|
- return (char)val;
|
|
+ return;
|
|
}
|
|
- return (char)__Pyx_PyInt_AsLong(x);
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
|
|
- const short neg_one = (short)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(short) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(short)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to short" :
|
|
- "value too large to convert to short");
|
|
- }
|
|
- return (short)-1;
|
|
- }
|
|
- return (short)val;
|
|
+ pos = __pyx_bisect_code_objects(__pyx_code_cache.entries, __pyx_code_cache.count, code_line);
|
|
+ if ((pos < __pyx_code_cache.count) && unlikely(__pyx_code_cache.entries[pos].code_line == code_line)) {
|
|
+ PyCodeObject* tmp = entries[pos].code_object;
|
|
+ entries[pos].code_object = code_object;
|
|
+ Py_DECREF(tmp);
|
|
+ return;
|
|
}
|
|
- return (short)__Pyx_PyInt_AsLong(x);
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
|
|
- const int neg_one = (int)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(int) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(int)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to int" :
|
|
- "value too large to convert to int");
|
|
- }
|
|
- return (int)-1;
|
|
+ if (__pyx_code_cache.count == __pyx_code_cache.max_count) {
|
|
+ int new_max = __pyx_code_cache.max_count + 64;
|
|
+ entries = (__Pyx_CodeObjectCacheEntry*)PyMem_Realloc(
|
|
+ __pyx_code_cache.entries, ((size_t)new_max) * sizeof(__Pyx_CodeObjectCacheEntry));
|
|
+ if (unlikely(!entries)) {
|
|
+ return;
|
|
}
|
|
- return (int)val;
|
|
+ __pyx_code_cache.entries = entries;
|
|
+ __pyx_code_cache.max_count = new_max;
|
|
}
|
|
- return (int)__Pyx_PyInt_AsLong(x);
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
|
|
- const signed char neg_one = (signed char)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(signed char) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(signed char)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to signed char" :
|
|
- "value too large to convert to signed char");
|
|
- }
|
|
- return (signed char)-1;
|
|
- }
|
|
- return (signed char)val;
|
|
+ for (i=__pyx_code_cache.count; i>pos; i--) {
|
|
+ entries[i] = entries[i-1];
|
|
}
|
|
- return (signed char)__Pyx_PyInt_AsSignedLong(x);
|
|
+ entries[pos].code_line = code_line;
|
|
+ entries[pos].code_object = code_object;
|
|
+ __pyx_code_cache.count++;
|
|
+ Py_INCREF(code_object);
|
|
}
|
|
|
|
-static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
|
|
- const signed short neg_one = (signed short)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(signed short) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(signed short)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to signed short" :
|
|
- "value too large to convert to signed short");
|
|
- }
|
|
- return (signed short)-1;
|
|
- }
|
|
- return (signed short)val;
|
|
+/* AddTraceback */
|
|
+#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 = NULL;
|
|
+ PyObject *py_funcname = NULL;
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ PyObject *py_srcfile = NULL;
|
|
+ py_srcfile = PyString_FromString(filename);
|
|
+ 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
|
|
}
|
|
- return (signed short)__Pyx_PyInt_AsSignedLong(x);
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
|
|
- const signed int neg_one = (signed int)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(signed int) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(signed int)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to signed int" :
|
|
- "value too large to convert to signed int");
|
|
- }
|
|
- return (signed int)-1;
|
|
- }
|
|
- return (signed int)val;
|
|
+ else {
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ py_funcname = PyString_FromString(funcname);
|
|
+ if (!py_funcname) goto bad;
|
|
+ #endif
|
|
}
|
|
- return (signed int)__Pyx_PyInt_AsSignedLong(x);
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ py_code = __Pyx_PyCode_New(
|
|
+ 0,
|
|
+ 0,
|
|
+ 0,
|
|
+ 0,
|
|
+ 0,
|
|
+ __pyx_empty_bytes, /*PyObject *code,*/
|
|
+ __pyx_empty_tuple, /*PyObject *consts,*/
|
|
+ __pyx_empty_tuple, /*PyObject *names,*/
|
|
+ __pyx_empty_tuple, /*PyObject *varnames,*/
|
|
+ __pyx_empty_tuple, /*PyObject *freevars,*/
|
|
+ __pyx_empty_tuple, /*PyObject *cellvars,*/
|
|
+ py_srcfile, /*PyObject *filename,*/
|
|
+ py_funcname, /*PyObject *name,*/
|
|
+ py_line,
|
|
+ __pyx_empty_bytes /*PyObject *lnotab*/
|
|
+ );
|
|
+ Py_DECREF(py_srcfile);
|
|
+ #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_funcname);
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ Py_XDECREF(py_srcfile);
|
|
+ #endif
|
|
+ return NULL;
|
|
}
|
|
-
|
|
-static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject* x) {
|
|
- const int neg_one = (int)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
- if (sizeof(int) < sizeof(long)) {
|
|
- long val = __Pyx_PyInt_AsLong(x);
|
|
- if (unlikely(val != (long)(int)val)) {
|
|
- if (!unlikely(val == -1 && PyErr_Occurred())) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- (is_unsigned && unlikely(val < 0)) ?
|
|
- "can't convert negative value to int" :
|
|
- "value too large to convert to int");
|
|
- }
|
|
- return (int)-1;
|
|
+static void __Pyx_AddTraceback(const char *funcname, int c_line,
|
|
+ int py_line, const char *filename) {
|
|
+ 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) {
|
|
+ /* 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;
|
|
}
|
|
- return (int)val;
|
|
+ __Pyx_ErrRestoreInState(tstate, ptype, pvalue, ptraceback);
|
|
+ __pyx_insert_code_object(c_line ? -c_line : py_line, py_code);
|
|
}
|
|
- return (int)__Pyx_PyInt_AsLong(x);
|
|
+ py_frame = PyFrame_New(
|
|
+ tstate, /*PyThreadState *tstate,*/
|
|
+ py_code, /*PyCodeObject *code,*/
|
|
+ __pyx_d, /*PyObject *globals,*/
|
|
+ 0 /*PyObject *locals*/
|
|
+ );
|
|
+ if (!py_frame) goto bad;
|
|
+ __Pyx_PyFrame_SetLineNumber(py_frame, py_line);
|
|
+ PyTraceBack_Here(py_frame);
|
|
+bad:
|
|
+ Py_XDECREF(py_code);
|
|
+ Py_XDECREF(py_frame);
|
|
}
|
|
|
|
-static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
|
|
- const unsigned long neg_one = (unsigned long)-1, const_zero = 0;
|
|
+/* CIntToPy */
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {
|
|
+#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wconversion"
|
|
+#endif
|
|
+ const long neg_one = (long) -1, const_zero = (long) 0;
|
|
+#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
|
|
+#pragma GCC diagnostic pop
|
|
+#endif
|
|
const int is_unsigned = neg_one > const_zero;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
- if (likely(PyInt_Check(x))) {
|
|
- long val = PyInt_AS_LONG(x);
|
|
- if (is_unsigned && unlikely(val < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to unsigned long");
|
|
- return (unsigned long)-1;
|
|
- }
|
|
- return (unsigned long)val;
|
|
- } else
|
|
+ if (is_unsigned) {
|
|
+ if (sizeof(long) < sizeof(long)) {
|
|
+ return PyInt_FromLong((long) value);
|
|
+ } else if (sizeof(long) <= sizeof(unsigned long)) {
|
|
+ return PyLong_FromUnsignedLong((unsigned long) value);
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (sizeof(long) <= sizeof(unsigned PY_LONG_LONG)) {
|
|
+ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value);
|
|
#endif
|
|
- if (likely(PyLong_Check(x))) {
|
|
- if (is_unsigned) {
|
|
- if (unlikely(Py_SIZE(x) < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to unsigned long");
|
|
- return (unsigned long)-1;
|
|
- }
|
|
- return PyLong_AsUnsignedLong(x);
|
|
- } else {
|
|
- return PyLong_AsLong(x);
|
|
}
|
|
} else {
|
|
- unsigned long val;
|
|
- PyObject *tmp = __Pyx_PyNumber_Int(x);
|
|
- if (!tmp) return (unsigned long)-1;
|
|
- val = __Pyx_PyInt_AsUnsignedLong(tmp);
|
|
- Py_DECREF(tmp);
|
|
- return val;
|
|
- }
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
|
|
- const unsigned PY_LONG_LONG neg_one = (unsigned PY_LONG_LONG)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
- if (likely(PyInt_Check(x))) {
|
|
- long val = PyInt_AS_LONG(x);
|
|
- if (is_unsigned && unlikely(val < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to unsigned PY_LONG_LONG");
|
|
- return (unsigned PY_LONG_LONG)-1;
|
|
- }
|
|
- return (unsigned PY_LONG_LONG)val;
|
|
- } else
|
|
+ if (sizeof(long) <= sizeof(long)) {
|
|
+ return PyInt_FromLong((long) value);
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (sizeof(long) <= sizeof(PY_LONG_LONG)) {
|
|
+ return PyLong_FromLongLong((PY_LONG_LONG) value);
|
|
#endif
|
|
- if (likely(PyLong_Check(x))) {
|
|
- if (is_unsigned) {
|
|
- if (unlikely(Py_SIZE(x) < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to unsigned PY_LONG_LONG");
|
|
- return (unsigned PY_LONG_LONG)-1;
|
|
- }
|
|
- return PyLong_AsUnsignedLongLong(x);
|
|
- } else {
|
|
- return PyLong_AsLongLong(x);
|
|
}
|
|
- } else {
|
|
- unsigned PY_LONG_LONG val;
|
|
- PyObject *tmp = __Pyx_PyNumber_Int(x);
|
|
- if (!tmp) return (unsigned PY_LONG_LONG)-1;
|
|
- val = __Pyx_PyInt_AsUnsignedLongLong(tmp);
|
|
- Py_DECREF(tmp);
|
|
- return val;
|
|
+ }
|
|
+ {
|
|
+ int one = 1; int little = (int)*(unsigned char *)&one;
|
|
+ unsigned char *bytes = (unsigned char *)&value;
|
|
+ return _PyLong_FromByteArray(bytes, sizeof(long),
|
|
+ little, !is_unsigned);
|
|
}
|
|
}
|
|
|
|
-static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
|
|
- const long neg_one = (long)-1, const_zero = 0;
|
|
+/* CIntFromPyVerify */
|
|
+#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value)\
|
|
+ __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 0)
|
|
+#define __PYX_VERIFY_RETURN_INT_EXC(target_type, func_type, func_value)\
|
|
+ __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 1)
|
|
+#define __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, exc)\
|
|
+ {\
|
|
+ func_type value = func_value;\
|
|
+ if (sizeof(target_type) < sizeof(func_type)) {\
|
|
+ if (unlikely(value != (func_type) (target_type) value)) {\
|
|
+ func_type zero = 0;\
|
|
+ if (exc && unlikely(value == (func_type)-1 && PyErr_Occurred()))\
|
|
+ return (target_type) -1;\
|
|
+ if (is_unsigned && unlikely(value < zero))\
|
|
+ goto raise_neg_overflow;\
|
|
+ else\
|
|
+ goto raise_overflow;\
|
|
+ }\
|
|
+ }\
|
|
+ return (target_type) value;\
|
|
+ }
|
|
+
|
|
+/* CIntFromPy */
|
|
+static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) {
|
|
+#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wconversion"
|
|
+#endif
|
|
+ const long neg_one = (long) -1, const_zero = (long) 0;
|
|
+#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
|
|
+#pragma GCC diagnostic pop
|
|
+#endif
|
|
const int is_unsigned = neg_one > const_zero;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
+#if PY_MAJOR_VERSION < 3
|
|
if (likely(PyInt_Check(x))) {
|
|
- long val = PyInt_AS_LONG(x);
|
|
- if (is_unsigned && unlikely(val < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to long");
|
|
- return (long)-1;
|
|
+ if (sizeof(long) < sizeof(long)) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, long, PyInt_AS_LONG(x))
|
|
+ } else {
|
|
+ long val = PyInt_AS_LONG(x);
|
|
+ if (is_unsigned && unlikely(val < 0)) {
|
|
+ goto raise_neg_overflow;
|
|
+ }
|
|
+ return (long) val;
|
|
}
|
|
- return (long)val;
|
|
} else
|
|
#endif
|
|
if (likely(PyLong_Check(x))) {
|
|
if (is_unsigned) {
|
|
+#if CYTHON_USE_PYLONG_INTERNALS
|
|
+ const digit* digits = ((PyLongObject*)x)->ob_digit;
|
|
+ switch (Py_SIZE(x)) {
|
|
+ case 0: return (long) 0;
|
|
+ case 1: __PYX_VERIFY_RETURN_INT(long, digit, digits[0])
|
|
+ case 2:
|
|
+ if (8 * sizeof(long) > 1 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) >= 2 * PyLong_SHIFT) {
|
|
+ return (long) (((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 3:
|
|
+ if (8 * sizeof(long) > 2 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) >= 3 * PyLong_SHIFT) {
|
|
+ return (long) (((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 4:
|
|
+ if (8 * sizeof(long) > 3 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) >= 4 * PyLong_SHIFT) {
|
|
+ return (long) (((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0]));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+#endif
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
if (unlikely(Py_SIZE(x) < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to long");
|
|
- return (long)-1;
|
|
+ goto raise_neg_overflow;
|
|
+ }
|
|
+#else
|
|
+ {
|
|
+ int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
|
|
+ if (unlikely(result < 0))
|
|
+ return (long) -1;
|
|
+ if (unlikely(result == 1))
|
|
+ goto raise_neg_overflow;
|
|
+ }
|
|
+#endif
|
|
+ if (sizeof(long) <= sizeof(unsigned long)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(long, unsigned long, PyLong_AsUnsignedLong(x))
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (sizeof(long) <= sizeof(unsigned PY_LONG_LONG)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(long, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
|
|
+#endif
|
|
}
|
|
- return PyLong_AsUnsignedLong(x);
|
|
} else {
|
|
- return PyLong_AsLong(x);
|
|
+#if CYTHON_USE_PYLONG_INTERNALS
|
|
+ const digit* digits = ((PyLongObject*)x)->ob_digit;
|
|
+ switch (Py_SIZE(x)) {
|
|
+ case 0: return (long) 0;
|
|
+ case -1: __PYX_VERIFY_RETURN_INT(long, sdigit, (sdigit) (-(sdigit)digits[0]))
|
|
+ case 1: __PYX_VERIFY_RETURN_INT(long, digit, +digits[0])
|
|
+ case -2:
|
|
+ if (8 * sizeof(long) - 1 > 1 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {
|
|
+ return (long) (((long)-1)*(((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 2:
|
|
+ if (8 * sizeof(long) > 1 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {
|
|
+ return (long) ((((((long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case -3:
|
|
+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {
|
|
+ return (long) (((long)-1)*(((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 3:
|
|
+ if (8 * sizeof(long) > 2 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {
|
|
+ return (long) ((((((((long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case -4:
|
|
+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {
|
|
+ return (long) (((long)-1)*(((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 4:
|
|
+ if (8 * sizeof(long) > 3 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(long, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {
|
|
+ return (long) ((((((((((long)digits[3]) << PyLong_SHIFT) | (long)digits[2]) << PyLong_SHIFT) | (long)digits[1]) << PyLong_SHIFT) | (long)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+#endif
|
|
+ if (sizeof(long) <= sizeof(long)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(long, long, PyLong_AsLong(x))
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (sizeof(long) <= sizeof(PY_LONG_LONG)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(long, PY_LONG_LONG, PyLong_AsLongLong(x))
|
|
+#endif
|
|
+ }
|
|
+ }
|
|
+ {
|
|
+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
|
|
+ PyErr_SetString(PyExc_RuntimeError,
|
|
+ "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers");
|
|
+#else
|
|
+ long val;
|
|
+ PyObject *v = __Pyx_PyNumber_IntOrLong(x);
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ if (likely(v) && !PyLong_Check(v)) {
|
|
+ PyObject *tmp = v;
|
|
+ v = PyNumber_Long(tmp);
|
|
+ Py_DECREF(tmp);
|
|
+ }
|
|
+ #endif
|
|
+ if (likely(v)) {
|
|
+ int one = 1; int is_little = (int)*(unsigned char *)&one;
|
|
+ unsigned char *bytes = (unsigned char *)&val;
|
|
+ int ret = _PyLong_AsByteArray((PyLongObject *)v,
|
|
+ bytes, sizeof(val),
|
|
+ is_little, !is_unsigned);
|
|
+ Py_DECREF(v);
|
|
+ if (likely(!ret))
|
|
+ return val;
|
|
+ }
|
|
+#endif
|
|
+ return (long) -1;
|
|
}
|
|
} else {
|
|
long val;
|
|
- PyObject *tmp = __Pyx_PyNumber_Int(x);
|
|
- if (!tmp) return (long)-1;
|
|
- val = __Pyx_PyInt_AsLong(tmp);
|
|
+ PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
|
|
+ if (!tmp) return (long) -1;
|
|
+ val = __Pyx_PyInt_As_long(tmp);
|
|
Py_DECREF(tmp);
|
|
return val;
|
|
}
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
|
|
- const PY_LONG_LONG neg_one = (PY_LONG_LONG)-1, const_zero = 0;
|
|
+raise_overflow:
|
|
+ PyErr_SetString(PyExc_OverflowError,
|
|
+ "value too large to convert to long");
|
|
+ return (long) -1;
|
|
+raise_neg_overflow:
|
|
+ PyErr_SetString(PyExc_OverflowError,
|
|
+ "can't convert negative value to long");
|
|
+ return (long) -1;
|
|
+}
|
|
+
|
|
+/* CIntFromPy */
|
|
+static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
|
|
+#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
|
|
+#pragma GCC diagnostic push
|
|
+#pragma GCC diagnostic ignored "-Wconversion"
|
|
+#endif
|
|
+ const int neg_one = (int) -1, const_zero = (int) 0;
|
|
+#ifdef __Pyx_HAS_GCC_DIAGNOSTIC
|
|
+#pragma GCC diagnostic pop
|
|
+#endif
|
|
const int is_unsigned = neg_one > const_zero;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
+#if PY_MAJOR_VERSION < 3
|
|
if (likely(PyInt_Check(x))) {
|
|
- long val = PyInt_AS_LONG(x);
|
|
- if (is_unsigned && unlikely(val < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to PY_LONG_LONG");
|
|
- return (PY_LONG_LONG)-1;
|
|
+ if (sizeof(int) < sizeof(long)) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, long, PyInt_AS_LONG(x))
|
|
+ } else {
|
|
+ long val = PyInt_AS_LONG(x);
|
|
+ if (is_unsigned && unlikely(val < 0)) {
|
|
+ goto raise_neg_overflow;
|
|
+ }
|
|
+ return (int) val;
|
|
}
|
|
- return (PY_LONG_LONG)val;
|
|
} else
|
|
#endif
|
|
if (likely(PyLong_Check(x))) {
|
|
if (is_unsigned) {
|
|
- if (unlikely(Py_SIZE(x) < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to PY_LONG_LONG");
|
|
- return (PY_LONG_LONG)-1;
|
|
+#if CYTHON_USE_PYLONG_INTERNALS
|
|
+ const digit* digits = ((PyLongObject*)x)->ob_digit;
|
|
+ switch (Py_SIZE(x)) {
|
|
+ case 0: return (int) 0;
|
|
+ case 1: __PYX_VERIFY_RETURN_INT(int, digit, digits[0])
|
|
+ case 2:
|
|
+ if (8 * sizeof(int) > 1 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) >= 2 * PyLong_SHIFT) {
|
|
+ return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 3:
|
|
+ if (8 * sizeof(int) > 2 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) >= 3 * PyLong_SHIFT) {
|
|
+ return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 4:
|
|
+ if (8 * sizeof(int) > 3 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) >= 4 * PyLong_SHIFT) {
|
|
+ return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
}
|
|
- return PyLong_AsUnsignedLongLong(x);
|
|
- } else {
|
|
- return PyLong_AsLongLong(x);
|
|
- }
|
|
- } else {
|
|
- PY_LONG_LONG val;
|
|
- PyObject *tmp = __Pyx_PyNumber_Int(x);
|
|
- if (!tmp) return (PY_LONG_LONG)-1;
|
|
- val = __Pyx_PyInt_AsLongLong(tmp);
|
|
- Py_DECREF(tmp);
|
|
- return val;
|
|
- }
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
|
|
- const signed long neg_one = (signed long)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
- if (likely(PyInt_Check(x))) {
|
|
- long val = PyInt_AS_LONG(x);
|
|
- if (is_unsigned && unlikely(val < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to signed long");
|
|
- return (signed long)-1;
|
|
- }
|
|
- return (signed long)val;
|
|
- } else
|
|
#endif
|
|
- if (likely(PyLong_Check(x))) {
|
|
- if (is_unsigned) {
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
if (unlikely(Py_SIZE(x) < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to signed long");
|
|
- return (signed long)-1;
|
|
+ goto raise_neg_overflow;
|
|
+ }
|
|
+#else
|
|
+ {
|
|
+ int result = PyObject_RichCompareBool(x, Py_False, Py_LT);
|
|
+ if (unlikely(result < 0))
|
|
+ return (int) -1;
|
|
+ if (unlikely(result == 1))
|
|
+ goto raise_neg_overflow;
|
|
+ }
|
|
+#endif
|
|
+ if (sizeof(int) <= sizeof(unsigned long)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x))
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))
|
|
+#endif
|
|
}
|
|
- return PyLong_AsUnsignedLong(x);
|
|
} else {
|
|
- return PyLong_AsLong(x);
|
|
+#if CYTHON_USE_PYLONG_INTERNALS
|
|
+ const digit* digits = ((PyLongObject*)x)->ob_digit;
|
|
+ switch (Py_SIZE(x)) {
|
|
+ case 0: return (int) 0;
|
|
+ case -1: __PYX_VERIFY_RETURN_INT(int, sdigit, (sdigit) (-(sdigit)digits[0]))
|
|
+ case 1: __PYX_VERIFY_RETURN_INT(int, digit, +digits[0])
|
|
+ case -2:
|
|
+ if (8 * sizeof(int) - 1 > 1 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
|
|
+ return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 2:
|
|
+ if (8 * sizeof(int) > 1 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
|
|
+ return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case -3:
|
|
+ if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
|
|
+ return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 3:
|
|
+ if (8 * sizeof(int) > 2 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
|
|
+ return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case -4:
|
|
+ if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {
|
|
+ return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ case 4:
|
|
+ if (8 * sizeof(int) > 3 * PyLong_SHIFT) {
|
|
+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {
|
|
+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))
|
|
+ } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {
|
|
+ return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));
|
|
+ }
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+#endif
|
|
+ if (sizeof(int) <= sizeof(long)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))
|
|
+#ifdef HAVE_LONG_LONG
|
|
+ } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) {
|
|
+ __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x))
|
|
+#endif
|
|
+ }
|
|
+ }
|
|
+ {
|
|
+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
|
|
+ PyErr_SetString(PyExc_RuntimeError,
|
|
+ "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers");
|
|
+#else
|
|
+ int val;
|
|
+ PyObject *v = __Pyx_PyNumber_IntOrLong(x);
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ if (likely(v) && !PyLong_Check(v)) {
|
|
+ PyObject *tmp = v;
|
|
+ v = PyNumber_Long(tmp);
|
|
+ Py_DECREF(tmp);
|
|
+ }
|
|
+ #endif
|
|
+ if (likely(v)) {
|
|
+ int one = 1; int is_little = (int)*(unsigned char *)&one;
|
|
+ unsigned char *bytes = (unsigned char *)&val;
|
|
+ int ret = _PyLong_AsByteArray((PyLongObject *)v,
|
|
+ bytes, sizeof(val),
|
|
+ is_little, !is_unsigned);
|
|
+ Py_DECREF(v);
|
|
+ if (likely(!ret))
|
|
+ return val;
|
|
+ }
|
|
+#endif
|
|
+ return (int) -1;
|
|
}
|
|
} else {
|
|
- signed long val;
|
|
- PyObject *tmp = __Pyx_PyNumber_Int(x);
|
|
- if (!tmp) return (signed long)-1;
|
|
- val = __Pyx_PyInt_AsSignedLong(tmp);
|
|
+ int val;
|
|
+ PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);
|
|
+ if (!tmp) return (int) -1;
|
|
+ val = __Pyx_PyInt_As_int(tmp);
|
|
Py_DECREF(tmp);
|
|
return val;
|
|
}
|
|
-}
|
|
-
|
|
-static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
|
|
- const signed PY_LONG_LONG neg_one = (signed PY_LONG_LONG)-1, const_zero = 0;
|
|
- const int is_unsigned = neg_one > const_zero;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
- if (likely(PyInt_Check(x))) {
|
|
- long val = PyInt_AS_LONG(x);
|
|
- if (is_unsigned && unlikely(val < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to signed PY_LONG_LONG");
|
|
- return (signed PY_LONG_LONG)-1;
|
|
+raise_overflow:
|
|
+ PyErr_SetString(PyExc_OverflowError,
|
|
+ "value too large to convert to int");
|
|
+ return (int) -1;
|
|
+raise_neg_overflow:
|
|
+ PyErr_SetString(PyExc_OverflowError,
|
|
+ "can't convert negative value to int");
|
|
+ return (int) -1;
|
|
+}
|
|
+
|
|
+/* FastTypeChecks */
|
|
+#if CYTHON_COMPILING_IN_CPYTHON
|
|
+static int __Pyx_InBases(PyTypeObject *a, PyTypeObject *b) {
|
|
+ while (a) {
|
|
+ a = a->tp_base;
|
|
+ if (a == b)
|
|
+ return 1;
|
|
+ }
|
|
+ return b == &PyBaseObject_Type;
|
|
+}
|
|
+static CYTHON_INLINE int __Pyx_IsSubtype(PyTypeObject *a, PyTypeObject *b) {
|
|
+ PyObject *mro;
|
|
+ if (a == b) return 1;
|
|
+ mro = a->tp_mro;
|
|
+ if (likely(mro)) {
|
|
+ Py_ssize_t i, n;
|
|
+ n = PyTuple_GET_SIZE(mro);
|
|
+ for (i = 0; i < n; i++) {
|
|
+ if (PyTuple_GET_ITEM(mro, i) == (PyObject *)b)
|
|
+ return 1;
|
|
}
|
|
- return (signed PY_LONG_LONG)val;
|
|
- } else
|
|
-#endif
|
|
- if (likely(PyLong_Check(x))) {
|
|
- if (is_unsigned) {
|
|
- if (unlikely(Py_SIZE(x) < 0)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "can't convert negative value to signed PY_LONG_LONG");
|
|
- return (signed PY_LONG_LONG)-1;
|
|
- }
|
|
- return PyLong_AsUnsignedLongLong(x);
|
|
- } else {
|
|
- return PyLong_AsLongLong(x);
|
|
+ return 0;
|
|
+ }
|
|
+ return __Pyx_InBases(a, b);
|
|
+}
|
|
+#if PY_MAJOR_VERSION == 2
|
|
+static int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject* exc_type2) {
|
|
+ PyObject *exception, *value, *tb;
|
|
+ int res;
|
|
+ __Pyx_PyThreadState_declare
|
|
+ __Pyx_PyThreadState_assign
|
|
+ __Pyx_ErrFetch(&exception, &value, &tb);
|
|
+ res = exc_type1 ? PyObject_IsSubclass(err, exc_type1) : 0;
|
|
+ if (unlikely(res == -1)) {
|
|
+ PyErr_WriteUnraisable(err);
|
|
+ res = 0;
|
|
+ }
|
|
+ if (!res) {
|
|
+ res = PyObject_IsSubclass(err, exc_type2);
|
|
+ if (unlikely(res == -1)) {
|
|
+ PyErr_WriteUnraisable(err);
|
|
+ res = 0;
|
|
}
|
|
- } else {
|
|
- signed PY_LONG_LONG val;
|
|
- PyObject *tmp = __Pyx_PyNumber_Int(x);
|
|
- if (!tmp) return (signed PY_LONG_LONG)-1;
|
|
- val = __Pyx_PyInt_AsSignedLongLong(tmp);
|
|
- Py_DECREF(tmp);
|
|
- return val;
|
|
}
|
|
+ __Pyx_ErrRestore(exception, value, tb);
|
|
+ return res;
|
|
}
|
|
-
|
|
-#ifndef __PYX_HAVE_RT_ImportType
|
|
-#define __PYX_HAVE_RT_ImportType
|
|
-static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name,
|
|
- long size, int strict)
|
|
-{
|
|
- PyObject *py_module = 0;
|
|
- PyObject *result = 0;
|
|
- PyObject *py_name = 0;
|
|
- char warning[200];
|
|
-
|
|
- py_module = __Pyx_ImportModule(module_name);
|
|
- if (!py_module)
|
|
- goto bad;
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- py_name = PyString_FromString(class_name);
|
|
- #else
|
|
- py_name = PyUnicode_FromString(class_name);
|
|
- #endif
|
|
- if (!py_name)
|
|
- goto bad;
|
|
- result = PyObject_GetAttr(py_module, py_name);
|
|
- Py_DECREF(py_name);
|
|
- py_name = 0;
|
|
- Py_DECREF(py_module);
|
|
- py_module = 0;
|
|
- if (!result)
|
|
- goto bad;
|
|
- if (!PyType_Check(result)) {
|
|
- PyErr_Format(PyExc_TypeError,
|
|
- "%s.%s is not a type object",
|
|
- module_name, class_name);
|
|
- goto bad;
|
|
+#else
|
|
+static CYTHON_INLINE int __Pyx_inner_PyErr_GivenExceptionMatches2(PyObject *err, PyObject* exc_type1, PyObject *exc_type2) {
|
|
+ int res = exc_type1 ? __Pyx_IsSubtype((PyTypeObject*)err, (PyTypeObject*)exc_type1) : 0;
|
|
+ if (!res) {
|
|
+ res = __Pyx_IsSubtype((PyTypeObject*)err, (PyTypeObject*)exc_type2);
|
|
+ }
|
|
+ return res;
|
|
+}
|
|
+#endif
|
|
+static int __Pyx_PyErr_GivenExceptionMatchesTuple(PyObject *exc_type, PyObject *tuple) {
|
|
+ Py_ssize_t i, n;
|
|
+ assert(PyExceptionClass_Check(exc_type));
|
|
+ n = PyTuple_GET_SIZE(tuple);
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ for (i=0; i<n; i++) {
|
|
+ if (exc_type == PyTuple_GET_ITEM(tuple, i)) return 1;
|
|
}
|
|
- if (!strict && ((PyTypeObject *)result)->tp_basicsize > size) {
|
|
- PyOS_snprintf(warning, sizeof(warning),
|
|
- "%s.%s size changed, may indicate binary incompatibility",
|
|
- module_name, class_name);
|
|
- #if PY_VERSION_HEX < 0x02050000
|
|
- PyErr_Warn(NULL, warning);
|
|
- #else
|
|
- PyErr_WarnEx(NULL, warning, 0);
|
|
+#endif
|
|
+ for (i=0; i<n; i++) {
|
|
+ PyObject *t = PyTuple_GET_ITEM(tuple, i);
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
+ if (likely(exc_type == t)) return 1;
|
|
#endif
|
|
+ if (likely(PyExceptionClass_Check(t))) {
|
|
+ if (__Pyx_inner_PyErr_GivenExceptionMatches2(exc_type, NULL, t)) return 1;
|
|
+ } else {
|
|
+ }
|
|
}
|
|
- else if (((PyTypeObject *)result)->tp_basicsize != size) {
|
|
- PyErr_Format(PyExc_ValueError,
|
|
- "%s.%s has the wrong size, try recompiling",
|
|
- module_name, class_name);
|
|
- goto bad;
|
|
- }
|
|
- return (PyTypeObject *)result;
|
|
-bad:
|
|
- Py_XDECREF(py_module);
|
|
- Py_XDECREF(result);
|
|
return 0;
|
|
}
|
|
-#endif
|
|
-
|
|
-#ifndef __PYX_HAVE_RT_ImportModule
|
|
-#define __PYX_HAVE_RT_ImportModule
|
|
-static PyObject *__Pyx_ImportModule(const char *name) {
|
|
- PyObject *py_name = 0;
|
|
- PyObject *py_module = 0;
|
|
-
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- py_name = PyString_FromString(name);
|
|
- #else
|
|
- py_name = PyUnicode_FromString(name);
|
|
- #endif
|
|
- if (!py_name)
|
|
- goto bad;
|
|
- py_module = PyImport_Import(py_name);
|
|
- Py_DECREF(py_name);
|
|
- return py_module;
|
|
-bad:
|
|
- Py_XDECREF(py_name);
|
|
- return 0;
|
|
+static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches(PyObject *err, PyObject* exc_type) {
|
|
+ if (likely(err == exc_type)) return 1;
|
|
+ if (likely(PyExceptionClass_Check(err))) {
|
|
+ if (likely(PyExceptionClass_Check(exc_type))) {
|
|
+ return __Pyx_inner_PyErr_GivenExceptionMatches2(err, NULL, exc_type);
|
|
+ } else if (likely(PyTuple_Check(exc_type))) {
|
|
+ return __Pyx_PyErr_GivenExceptionMatchesTuple(err, exc_type);
|
|
+ } else {
|
|
+ }
|
|
+ }
|
|
+ return PyErr_GivenExceptionMatches(err, exc_type);
|
|
+}
|
|
+static CYTHON_INLINE int __Pyx_PyErr_GivenExceptionMatches2(PyObject *err, PyObject *exc_type1, PyObject *exc_type2) {
|
|
+ assert(PyExceptionClass_Check(exc_type1));
|
|
+ assert(PyExceptionClass_Check(exc_type2));
|
|
+ if (likely(err == exc_type1 || err == exc_type2)) return 1;
|
|
+ if (likely(PyExceptionClass_Check(err))) {
|
|
+ return __Pyx_inner_PyErr_GivenExceptionMatches2(err, exc_type1, exc_type2);
|
|
+ }
|
|
+ return (PyErr_GivenExceptionMatches(err, exc_type1) || PyErr_GivenExceptionMatches(err, exc_type2));
|
|
}
|
|
#endif
|
|
|
|
-#include "compile.h"
|
|
-#include "frameobject.h"
|
|
-#include "traceback.h"
|
|
-
|
|
-static void __Pyx_AddTraceback(const char *funcname) {
|
|
- PyObject *py_srcfile = 0;
|
|
- PyObject *py_funcname = 0;
|
|
- PyObject *py_globals = 0;
|
|
- PyCodeObject *py_code = 0;
|
|
- PyFrameObject *py_frame = 0;
|
|
-
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- py_srcfile = PyString_FromString(__pyx_filename);
|
|
- #else
|
|
- py_srcfile = PyUnicode_FromString(__pyx_filename);
|
|
- #endif
|
|
- if (!py_srcfile) goto bad;
|
|
- if (__pyx_clineno) {
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- py_funcname = PyString_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, __pyx_clineno);
|
|
- #else
|
|
- py_funcname = PyUnicode_FromFormat( "%s (%s:%d)", funcname, __pyx_cfilenm, __pyx_clineno);
|
|
- #endif
|
|
+/* CheckBinaryVersion */
|
|
+static int __Pyx_check_binary_version(void) {
|
|
+ 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;
|
|
+ }
|
|
}
|
|
- else {
|
|
- #if PY_MAJOR_VERSION < 3
|
|
- py_funcname = PyString_FromString(funcname);
|
|
- #else
|
|
- py_funcname = PyUnicode_FromString(funcname);
|
|
- #endif
|
|
+ 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",
|
|
+ ctversion, __Pyx_MODULE_NAME, rtversion);
|
|
+ return PyErr_WarnEx(NULL, message, 1);
|
|
}
|
|
- if (!py_funcname) goto bad;
|
|
- py_globals = PyModule_GetDict(__pyx_m);
|
|
- if (!py_globals) goto bad;
|
|
- py_code = PyCode_New(
|
|
- 0, /*int argcount,*/
|
|
- #if PY_MAJOR_VERSION >= 3
|
|
- 0, /*int kwonlyargcount,*/
|
|
- #endif
|
|
- 0, /*int nlocals,*/
|
|
- 0, /*int stacksize,*/
|
|
- 0, /*int flags,*/
|
|
- __pyx_empty_bytes, /*PyObject *code,*/
|
|
- __pyx_empty_tuple, /*PyObject *consts,*/
|
|
- __pyx_empty_tuple, /*PyObject *names,*/
|
|
- __pyx_empty_tuple, /*PyObject *varnames,*/
|
|
- __pyx_empty_tuple, /*PyObject *freevars,*/
|
|
- __pyx_empty_tuple, /*PyObject *cellvars,*/
|
|
- py_srcfile, /*PyObject *filename,*/
|
|
- py_funcname, /*PyObject *name,*/
|
|
- __pyx_lineno, /*int firstlineno,*/
|
|
- __pyx_empty_bytes /*PyObject *lnotab*/
|
|
- );
|
|
- if (!py_code) goto bad;
|
|
- py_frame = PyFrame_New(
|
|
- PyThreadState_GET(), /*PyThreadState *tstate,*/
|
|
- py_code, /*PyCodeObject *code,*/
|
|
- py_globals, /*PyObject *globals,*/
|
|
- 0 /*PyObject *locals*/
|
|
- );
|
|
- if (!py_frame) goto bad;
|
|
- py_frame->f_lineno = __pyx_lineno;
|
|
- PyTraceBack_Here(py_frame);
|
|
-bad:
|
|
- Py_XDECREF(py_srcfile);
|
|
- Py_XDECREF(py_funcname);
|
|
- Py_XDECREF(py_code);
|
|
- Py_XDECREF(py_frame);
|
|
+ return 0;
|
|
}
|
|
|
|
+/* InitStrings */
|
|
static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {
|
|
while (t->p) {
|
|
#if PY_MAJOR_VERSION < 3
|
|
@@ -2356,7 +4790,7 @@
|
|
} else {
|
|
*t->p = PyString_FromStringAndSize(t->s, t->n - 1);
|
|
}
|
|
- #else /* Python 3+ has unicode identifiers */
|
|
+ #else
|
|
if (t->is_unicode | t->is_str) {
|
|
if (t->intern) {
|
|
*t->p = PyUnicode_InternFromString(t->s);
|
|
@@ -2371,56 +4805,158 @@
|
|
#endif
|
|
if (!*t->p)
|
|
return -1;
|
|
+ if (PyObject_Hash(*t->p) == -1)
|
|
+ return -1;
|
|
++t;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
-/* Type Conversion Functions */
|
|
-
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char* c_str) {
|
|
+ return __Pyx_PyUnicode_FromStringAndSize(c_str, (Py_ssize_t)strlen(c_str));
|
|
+}
|
|
+static CYTHON_INLINE const char* __Pyx_PyObject_AsString(PyObject* o) {
|
|
+ Py_ssize_t ignore;
|
|
+ return __Pyx_PyObject_AsStringAndSize(o, &ignore);
|
|
+}
|
|
+#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT
|
|
+#if !CYTHON_PEP393_ENABLED
|
|
+static const char* __Pyx_PyUnicode_AsStringAndSize(PyObject* o, Py_ssize_t *length) {
|
|
+ char* defenc_c;
|
|
+ PyObject* defenc = _PyUnicode_AsDefaultEncodedString(o, NULL);
|
|
+ if (!defenc) return NULL;
|
|
+ defenc_c = PyBytes_AS_STRING(defenc);
|
|
+#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
|
|
+ {
|
|
+ char* end = defenc_c + PyBytes_GET_SIZE(defenc);
|
|
+ char* c;
|
|
+ for (c = defenc_c; c < end; c++) {
|
|
+ if ((unsigned char) (*c) >= 128) {
|
|
+ PyUnicode_AsASCIIString(o);
|
|
+ return NULL;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+ *length = PyBytes_GET_SIZE(defenc);
|
|
+ return defenc_c;
|
|
+}
|
|
+#else
|
|
+static CYTHON_INLINE const char* __Pyx_PyUnicode_AsStringAndSize(PyObject* o, Py_ssize_t *length) {
|
|
+ if (unlikely(__Pyx_PyUnicode_READY(o) == -1)) return NULL;
|
|
+#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
|
|
+ if (likely(PyUnicode_IS_ASCII(o))) {
|
|
+ *length = PyUnicode_GET_LENGTH(o);
|
|
+ return PyUnicode_AsUTF8(o);
|
|
+ } else {
|
|
+ PyUnicode_AsASCIIString(o);
|
|
+ return NULL;
|
|
+ }
|
|
+#else
|
|
+ return PyUnicode_AsUTF8AndSize(o, length);
|
|
+#endif
|
|
+}
|
|
+#endif
|
|
+#endif
|
|
+static CYTHON_INLINE const char* __Pyx_PyObject_AsStringAndSize(PyObject* o, Py_ssize_t *length) {
|
|
+#if __PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT
|
|
+ if (
|
|
+#if PY_MAJOR_VERSION < 3 && __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
|
|
+ __Pyx_sys_getdefaultencoding_not_ascii &&
|
|
+#endif
|
|
+ PyUnicode_Check(o)) {
|
|
+ return __Pyx_PyUnicode_AsStringAndSize(o, length);
|
|
+ } else
|
|
+#endif
|
|
+#if (!CYTHON_COMPILING_IN_PYPY) || (defined(PyByteArray_AS_STRING) && defined(PyByteArray_GET_SIZE))
|
|
+ if (PyByteArray_Check(o)) {
|
|
+ *length = PyByteArray_GET_SIZE(o);
|
|
+ return PyByteArray_AS_STRING(o);
|
|
+ } else
|
|
+#endif
|
|
+ {
|
|
+ char* result;
|
|
+ int r = PyBytes_AsStringAndSize(o, &result, length);
|
|
+ if (unlikely(r < 0)) {
|
|
+ return NULL;
|
|
+ } else {
|
|
+ return result;
|
|
+ }
|
|
+ }
|
|
+}
|
|
static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
|
|
int is_true = x == Py_True;
|
|
if (is_true | (x == Py_False) | (x == Py_None)) return is_true;
|
|
else return PyObject_IsTrue(x);
|
|
}
|
|
-
|
|
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
|
|
+static CYTHON_INLINE int __Pyx_PyObject_IsTrueAndDecref(PyObject* x) {
|
|
+ int retval;
|
|
+ if (unlikely(!x)) return -1;
|
|
+ retval = __Pyx_PyObject_IsTrue(x);
|
|
+ Py_DECREF(x);
|
|
+ return retval;
|
|
+}
|
|
+static PyObject* __Pyx_PyNumber_IntOrLongWrongResultType(PyObject* result, const char* type_name) {
|
|
+#if PY_MAJOR_VERSION >= 3
|
|
+ if (PyLong_Check(result)) {
|
|
+ if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
|
|
+ "__int__ returned non-int (type %.200s). "
|
|
+ "The ability to return an instance of a strict subclass of int "
|
|
+ "is deprecated, and may be removed in a future version of Python.",
|
|
+ Py_TYPE(result)->tp_name)) {
|
|
+ Py_DECREF(result);
|
|
+ return NULL;
|
|
+ }
|
|
+ return result;
|
|
+ }
|
|
+#endif
|
|
+ PyErr_Format(PyExc_TypeError,
|
|
+ "__%.4s__ returned non-%.4s (type %.200s)",
|
|
+ type_name, type_name, Py_TYPE(result)->tp_name);
|
|
+ Py_DECREF(result);
|
|
+ return NULL;
|
|
+}
|
|
+static CYTHON_INLINE PyObject* __Pyx_PyNumber_IntOrLong(PyObject* x) {
|
|
+#if CYTHON_USE_TYPE_SLOTS
|
|
PyNumberMethods *m;
|
|
+#endif
|
|
const char *name = NULL;
|
|
PyObject *res = NULL;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
- if (PyInt_Check(x) || PyLong_Check(x))
|
|
+#if PY_MAJOR_VERSION < 3
|
|
+ if (likely(PyInt_Check(x) || PyLong_Check(x)))
|
|
#else
|
|
- if (PyLong_Check(x))
|
|
+ if (likely(PyLong_Check(x)))
|
|
#endif
|
|
- return Py_INCREF(x), x;
|
|
+ return __Pyx_NewRef(x);
|
|
+#if CYTHON_USE_TYPE_SLOTS
|
|
m = Py_TYPE(x)->tp_as_number;
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
+ #if PY_MAJOR_VERSION < 3
|
|
if (m && m->nb_int) {
|
|
name = "int";
|
|
- res = PyNumber_Int(x);
|
|
+ res = m->nb_int(x);
|
|
}
|
|
else if (m && m->nb_long) {
|
|
name = "long";
|
|
- res = PyNumber_Long(x);
|
|
+ res = m->nb_long(x);
|
|
}
|
|
-#else
|
|
- if (m && m->nb_int) {
|
|
+ #else
|
|
+ if (likely(m && m->nb_int)) {
|
|
name = "int";
|
|
- res = PyNumber_Long(x);
|
|
+ res = m->nb_int(x);
|
|
+ }
|
|
+ #endif
|
|
+#else
|
|
+ if (!PyBytes_CheckExact(x) && !PyUnicode_CheckExact(x)) {
|
|
+ res = PyNumber_Int(x);
|
|
}
|
|
#endif
|
|
- if (res) {
|
|
-#if PY_VERSION_HEX < 0x03000000
|
|
- if (!PyInt_Check(res) && !PyLong_Check(res)) {
|
|
+ if (likely(res)) {
|
|
+#if PY_MAJOR_VERSION < 3
|
|
+ if (unlikely(!PyInt_Check(res) && !PyLong_Check(res))) {
|
|
#else
|
|
- if (!PyLong_Check(res)) {
|
|
+ if (unlikely(!PyLong_CheckExact(res))) {
|
|
#endif
|
|
- PyErr_Format(PyExc_TypeError,
|
|
- "__%s__ returned non-%s (type %.200s)",
|
|
- name, name, Py_TYPE(res)->tp_name);
|
|
- Py_DECREF(res);
|
|
- return NULL;
|
|
+ return __Pyx_PyNumber_IntOrLongWrongResultType(res, name);
|
|
}
|
|
}
|
|
else if (!PyErr_Occurred()) {
|
|
@@ -2429,40 +4965,90 @@
|
|
}
|
|
return res;
|
|
}
|
|
-
|
|
static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
|
|
Py_ssize_t ival;
|
|
- PyObject* x = PyNumber_Index(b);
|
|
+ PyObject *x;
|
|
+#if PY_MAJOR_VERSION < 3
|
|
+ if (likely(PyInt_CheckExact(b))) {
|
|
+ if (sizeof(Py_ssize_t) >= sizeof(long))
|
|
+ return PyInt_AS_LONG(b);
|
|
+ else
|
|
+ return PyInt_AsSsize_t(b);
|
|
+ }
|
|
+#endif
|
|
+ if (likely(PyLong_CheckExact(b))) {
|
|
+ #if CYTHON_USE_PYLONG_INTERNALS
|
|
+ const digit* digits = ((PyLongObject*)b)->ob_digit;
|
|
+ const Py_ssize_t size = Py_SIZE(b);
|
|
+ if (likely(__Pyx_sst_abs(size) <= 1)) {
|
|
+ ival = likely(size) ? digits[0] : 0;
|
|
+ if (size == -1) ival = -ival;
|
|
+ return ival;
|
|
+ } else {
|
|
+ switch (size) {
|
|
+ case 2:
|
|
+ if (8 * sizeof(Py_ssize_t) > 2 * PyLong_SHIFT) {
|
|
+ return (Py_ssize_t) (((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
|
|
+ }
|
|
+ break;
|
|
+ case -2:
|
|
+ if (8 * sizeof(Py_ssize_t) > 2 * PyLong_SHIFT) {
|
|
+ return -(Py_ssize_t) (((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
|
|
+ }
|
|
+ break;
|
|
+ case 3:
|
|
+ if (8 * sizeof(Py_ssize_t) > 3 * PyLong_SHIFT) {
|
|
+ return (Py_ssize_t) (((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
|
|
+ }
|
|
+ break;
|
|
+ case -3:
|
|
+ if (8 * sizeof(Py_ssize_t) > 3 * PyLong_SHIFT) {
|
|
+ return -(Py_ssize_t) (((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
|
|
+ }
|
|
+ break;
|
|
+ case 4:
|
|
+ if (8 * sizeof(Py_ssize_t) > 4 * PyLong_SHIFT) {
|
|
+ return (Py_ssize_t) (((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
|
|
+ }
|
|
+ break;
|
|
+ case -4:
|
|
+ if (8 * sizeof(Py_ssize_t) > 4 * PyLong_SHIFT) {
|
|
+ return -(Py_ssize_t) (((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ #endif
|
|
+ return PyLong_AsSsize_t(b);
|
|
+ }
|
|
+ x = PyNumber_Index(b);
|
|
if (!x) return -1;
|
|
ival = PyInt_AsSsize_t(x);
|
|
Py_DECREF(x);
|
|
return ival;
|
|
}
|
|
-
|
|
-static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
|
|
-#if PY_VERSION_HEX < 0x02050000
|
|
- if (ival <= LONG_MAX)
|
|
- return PyInt_FromLong((long)ival);
|
|
- else {
|
|
- unsigned char *bytes = (unsigned char *) &ival;
|
|
- int one = 1; int little = (int)*(unsigned char*)&one;
|
|
- return _PyLong_FromByteArray(bytes, sizeof(size_t), little, 0);
|
|
- }
|
|
-#else
|
|
- return PyInt_FromSize_t(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 size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
|
|
- unsigned PY_LONG_LONG val = __Pyx_PyInt_AsUnsignedLongLong(x);
|
|
- if (unlikely(val == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())) {
|
|
- return (size_t)-1;
|
|
- } else if (unlikely(val != (unsigned PY_LONG_LONG)(size_t)val)) {
|
|
- PyErr_SetString(PyExc_OverflowError,
|
|
- "value too large to convert to size_t");
|
|
- return (size_t)-1;
|
|
- }
|
|
- return (size_t)val;
|
|
+static CYTHON_INLINE PyObject * __Pyx_PyBool_FromLong(long b) {
|
|
+ return b ? __Pyx_NewRef(Py_True) : __Pyx_NewRef(Py_False);
|
|
+}
|
|
+static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
|
|
+ return PyInt_FromSize_t(ival);
|
|
}
|
|
|
|
|
|
diff -urNP mayavi-4.8.1.current/tvtk/src/array_ext.pyx mayavi-4.8.1/tvtk/src/array_ext.pyx
|
|
--- mayavi-4.8.1.current/tvtk/src/array_ext.pyx 2020-04-30 05:28:22.000000000 +1000
|
|
+++ mayavi-4.8.1/tvtk/src/array_ext.pyx 2023-03-21 14:33:44.618631380 +1100
|
|
@@ -1,5 +1,7 @@
|
|
+#cython: language_level=3
|
|
+
|
|
"""
|
|
-A Pyrex extension module for numpy. Currently this extension module
|
|
+A Cython extension module for numpy. Currently this extension module
|
|
allows us to massage a 2D scipy array into a form usable as a
|
|
`vtkIdTypeArray`. This is then used to set the cells of a
|
|
`vtkCellArray` instance.
|
|
@@ -59,8 +61,8 @@
|
|
dim0 = id_array.dimensions[0]
|
|
id_data = <int*> id_array.data
|
|
out_data = <int*> out_array.data
|
|
- stride0 = id_array.strides[0]/sizeof(int)
|
|
- stride1 = id_array.strides[1]/sizeof(int)
|
|
+ stride0 = id_array.strides[0]//sizeof(int)
|
|
+ stride1 = id_array.strides[1]//sizeof(int)
|
|
|
|
cdef int i, j, in_idx, out_idx
|
|
for i from 0 <= i < dim0:
|
|
@@ -88,8 +90,8 @@
|
|
dim0 = id_array.dimensions[0]
|
|
id_data = <Py_ssize_t*> id_array.data
|
|
out_data = <Py_ssize_t*> out_array.data
|
|
- stride0 = id_array.strides[0]/sizeof(Py_ssize_t)
|
|
- stride1 = id_array.strides[1]/sizeof(Py_ssize_t)
|
|
+ stride0 = id_array.strides[0]//sizeof(Py_ssize_t)
|
|
+ stride1 = id_array.strides[1]//sizeof(Py_ssize_t)
|
|
|
|
cdef int i, j, in_idx, out_idx
|
|
for i from 0 <= i < dim0:
|
|
@@ -139,4 +141,3 @@
|
|
else:
|
|
raise ValueError('Unsupported VTK_ID_TYPE_SIZE=%d'\
|
|
%VTK_ID_TYPE_SIZE)
|
|
-
|
|
diff -urNP mayavi-4.8.1.current/tvtk/vtk_parser.py mayavi-4.8.1/tvtk/vtk_parser.py
|
|
--- mayavi-4.8.1.current/tvtk/vtk_parser.py 2022-10-12 06:09:54.000000000 +1100
|
|
+++ mayavi-4.8.1/tvtk/vtk_parser.py 2023-03-21 14:33:53.270817317 +1100
|
|
@@ -702,6 +702,8 @@
|
|
key == 'AttributesToInterpolate') or
|
|
(klass_name == 'vtkPlotBar' and
|
|
key == 'LookupTable') or
|
|
+ (klass_name == 'vtkLagrangianParticleTracker' and
|
|
+ key == 'IntegrationModel') or
|
|
False): # just to simplify indentation/updates
|
|
default = None
|
|
else:
|