[Yt-svn] yt-commit r1407 - trunk/yt/lagos
jwise at wrangler.dreamhost.com
jwise at wrangler.dreamhost.com
Mon Aug 24 18:01:19 PDT 2009
Author: jwise
Date: Mon Aug 24 18:01:19 2009
New Revision: 1407
URL: http://yt.spacepope.org/changeset/1407
Log:
Pre-calculate 1/dx to speed up interpolators (maybe 10-20%)
Modified:
trunk/yt/lagos/Interpolators.c
trunk/yt/lagos/Interpolators.pyx
Modified: trunk/yt/lagos/Interpolators.c
==============================================================================
--- trunk/yt/lagos/Interpolators.c (original)
+++ trunk/yt/lagos/Interpolators.c Mon Aug 24 18:01:19 2009
@@ -1,8 +1,11 @@
-/* Generated by Cython 0.9.8.1.1 on Tue Sep 23 12:23:37 2008 */
+/* Generated by Cython 0.11.2 on Mon Aug 24 19:36:36 2009 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "structmember.h"
+#ifndef Py_PYTHON_H
+ #error Python headers needed to compile C extensions, please install development version of Python.
+#endif
#ifndef PY_LONG_LONG
#define PY_LONG_LONG LONG_LONG
#endif
@@ -11,11 +14,13 @@
#endif
#if PY_VERSION_HEX < 0x02040000
#define METH_COEXIST 0
+ #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
#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)
@@ -31,20 +36,20 @@
typedef struct {
void *buf;
+ PyObject *obj;
Py_ssize_t len;
+ Py_ssize_t itemsize;
int readonly;
- const char *format;
int ndim;
+ char *format;
Py_ssize_t *shape;
Py_ssize_t *strides;
Py_ssize_t *suboffsets;
- Py_ssize_t itemsize;
void *internal;
} Py_buffer;
#define PyBUF_SIMPLE 0
#define PyBUF_WRITABLE 0x0001
- #define PyBUF_LOCK 0x0002
#define PyBUF_FORMAT 0x0004
#define PyBUF_ND 0x0008
#define PyBUF_STRIDES (0x0010 | PyBUF_ND)
@@ -63,9 +68,13 @@
#define Py_TPFLAGS_CHECKTYPES 0
#define Py_TPFLAGS_HAVE_INDEX 0
#endif
+#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
+ #define Py_TPFLAGS_HAVE_NEWBUFFER 0
+#endif
#if PY_MAJOR_VERSION >= 3
#define PyBaseString_Type PyUnicode_Type
#define PyString_Type PyBytes_Type
+ #define PyString_CheckExact PyBytes_CheckExact
#define PyInt_Type PyLong_Type
#define PyInt_Check(op) PyLong_Check(op)
#define PyInt_CheckExact(op) PyLong_CheckExact(op)
@@ -94,9 +103,28 @@
#ifndef __cdecl
#define __cdecl
#endif
+ #ifndef __fastcall
+ #define __fastcall
+ #endif
#else
#define _USE_MATH_DEFINES
#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)))
+#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))
+#endif
+#if PY_VERSION_HEX < 0x02050000
+ #define __Pyx_NAMESTR(n) ((char *)(n))
+ #define __Pyx_DOCSTR(n) ((char *)(n))
+#else
+ #define __Pyx_NAMESTR(n) (n)
+ #define __Pyx_DOCSTR(n) (n)
+#endif
#ifdef __cplusplus
#define __PYX_EXTERN_C extern "C"
#else
@@ -104,7 +132,9 @@
#endif
#include <math.h>
#define __PYX_HAVE_API__yt__lagos__Interpolators
+#include "stdlib.h"
#include "numpy/arrayobject.h"
+#define __PYX_USE_C99_COMPLEX defined(_Complex_I)
#ifdef __GNUC__
@@ -125,33 +155,54 @@
/* Type Conversion Predeclarations */
#if PY_MAJOR_VERSION < 3
-#define __Pyx_PyBytes_FromString PyString_FromString
-#define __Pyx_PyBytes_AsString PyString_AsString
+#define __Pyx_PyBytes_FromString PyString_FromString
+#define __Pyx_PyBytes_FromStringAndSize PyString_FromStringAndSize
+#define __Pyx_PyBytes_AsString PyString_AsString
#else
-#define __Pyx_PyBytes_FromString PyBytes_FromString
-#define __Pyx_PyBytes_AsString PyBytes_AsString
+#define __Pyx_PyBytes_FromString PyBytes_FromString
+#define __Pyx_PyBytes_FromStringAndSize PyBytes_FromStringAndSize
+#define __Pyx_PyBytes_AsString PyBytes_AsString
#endif
#define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
-static INLINE int __Pyx_PyObject_IsTrue(PyObject* x);
-static INLINE PY_LONG_LONG __pyx_PyInt_AsLongLong(PyObject* x);
-static INLINE unsigned PY_LONG_LONG __pyx_PyInt_AsUnsignedLongLong(PyObject* x);
-static INLINE Py_ssize_t __pyx_PyIndex_AsSsize_t(PyObject* b);
+static INLINE int __Pyx_PyObject_IsTrue(PyObject*);
+static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
+
+#if !defined(T_PYSSIZET)
+#if PY_VERSION_HEX < 0x02050000
+#define T_PYSSIZET T_INT
+#elif !defined(T_LONGLONG)
+#define T_PYSSIZET \
+ ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \
+ ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : -1))
+#else
+#define T_PYSSIZET \
+ ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \
+ ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : \
+ ((sizeof(Py_ssize_t) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))
+#endif
+#endif
+
+#if !defined(T_SIZET)
+#if !defined(T_ULONGLONG)
+#define T_SIZET \
+ ((sizeof(size_t) == sizeof(unsigned int)) ? T_UINT : \
+ ((sizeof(size_t) == sizeof(unsigned long)) ? T_ULONG : -1))
+#else
+#define T_SIZET \
+ ((sizeof(size_t) == sizeof(unsigned int)) ? T_UINT : \
+ ((sizeof(size_t) == sizeof(unsigned long)) ? T_ULONG : \
+ ((sizeof(size_t) == sizeof(unsigned PY_LONG_LONG)) ? T_ULONGLONG : -1)))
+#endif
+#endif
+
+static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
+static INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
+static INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
-#define __pyx_PyInt_AsLong(x) (PyInt_CheckExact(x) ? PyInt_AS_LONG(x) : PyInt_AsLong(x))
#define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
-static INLINE unsigned char __pyx_PyInt_unsigned_char(PyObject* x);
-static INLINE unsigned short __pyx_PyInt_unsigned_short(PyObject* x);
-static INLINE char __pyx_PyInt_char(PyObject* x);
-static INLINE short __pyx_PyInt_short(PyObject* x);
-static INLINE int __pyx_PyInt_int(PyObject* x);
-static INLINE long __pyx_PyInt_long(PyObject* x);
-static INLINE signed char __pyx_PyInt_signed_char(PyObject* x);
-static INLINE signed short __pyx_PyInt_signed_short(PyObject* x);
-static INLINE signed int __pyx_PyInt_signed_int(PyObject* x);
-static INLINE signed long __pyx_PyInt_signed_long(PyObject* x);
-static INLINE long double __pyx_PyInt_long_double(PyObject* x);
+
#ifdef __GNUC__
/* Test for GCC > 2.95 */
#if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95))
@@ -176,33 +227,161 @@
static const char **__pyx_f;
static char __pyx_mdoc[] = "\nSimple interpolators\n\nAuthor: Matthew Turk <matthewturk at gmail.com>\nAffiliation: KIPAC/SLAC/Stanford\nHomepage: http://yt.enzotools.org/\nLicense:\n Copyright (C) 2008 Matthew Turk. All Rights Reserved.\n\n This file is part of yt.\n\n yt is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program. If not, see <http://www.gnu.org/licenses/>.\n";
-static INLINE void __Pyx_SafeReleaseBuffer(PyObject* obj, Py_buffer* info);
-static INLINE void __Pyx_ZeroBuffer(Py_buffer* buf); /*proto*/
-static INLINE const char* __Pyx_ConsumeWhitespace(const char* ts); /*proto*/
-static INLINE const char* __Pyx_BufferTypestringCheckEndian(const char* ts); /*proto*/
-static void __Pyx_BufferNdimError(Py_buffer* buffer, int expected_ndim); /*proto*/
-static const char* __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_float64_t(const char* ts); /*proto*/
-
-static int __Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t(PyObject* obj, Py_buffer* buf, int flags, int nd); /*proto*/
-static const char* __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_int32_t(const char* ts); /*proto*/
-
-static int __Pyx_GetBuffer_nn___pyx_t_5numpy_int32_t(PyObject* obj, Py_buffer* buf, int flags, int nd); /*proto*/
-#define __Pyx_BufPtrStrided1d(buf, i0, s0) ((char*)buf + i0 * s0)
-#define __Pyx_BufPtrStrided2d(buf, i0, s0, i1, s1) ((char*)buf + i0 * s0 + i1 * s1)
-static const char* __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_int_t(const char* ts); /*proto*/
-static int __Pyx_GetBuffer_nn___pyx_t_5numpy_int_t(PyObject* obj, Py_buffer* buf, int flags, int nd); /*proto*/
-#define __Pyx_BufPtrStrided3d(buf, i0, s0, i1, s1, i2, s2) ((char*)buf + i0 * s0 + i1 * s1 + i2 * s2)
-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name, int exact); /*proto*/
+#ifdef CYTHON_REFNANNY
+typedef struct {
+ void (*INCREF)(void*, PyObject*, int);
+ void (*DECREF)(void*, PyObject*, int);
+ void (*GOTREF)(void*, PyObject*, int);
+ void (*GIVEREF)(void*, PyObject*, int);
+ void* (*NewContext)(const char*, int, const char*);
+ void (*FinishContext)(void**);
+} __Pyx_RefnannyAPIStruct;
+static __Pyx_RefnannyAPIStruct *__Pyx_Refnanny = NULL;
+#define __Pyx_ImportRefcountAPI(name) (__Pyx_RefnannyAPIStruct *) PyCObject_Import((char *)name, (char *)"RefnannyAPI")
+#define __Pyx_INCREF(r) __Pyx_Refnanny->INCREF(__pyx_refchk, (PyObject *)(r), __LINE__)
+#define __Pyx_DECREF(r) __Pyx_Refnanny->DECREF(__pyx_refchk, (PyObject *)(r), __LINE__)
+#define __Pyx_GOTREF(r) __Pyx_Refnanny->GOTREF(__pyx_refchk, (PyObject *)(r), __LINE__)
+#define __Pyx_GIVEREF(r) __Pyx_Refnanny->GIVEREF(__pyx_refchk, (PyObject *)(r), __LINE__)
+#define __Pyx_XDECREF(r) if((r) == NULL) ; else __Pyx_DECREF(r)
+#define __Pyx_SetupRefcountContext(name) void* __pyx_refchk = __Pyx_Refnanny->NewContext((name), __LINE__, __FILE__)
+#define __Pyx_FinishRefcountContext() __Pyx_Refnanny->FinishContext(&__pyx_refchk)
+#else
+#define __Pyx_INCREF(r) Py_INCREF(r)
+#define __Pyx_DECREF(r) Py_DECREF(r)
+#define __Pyx_GOTREF(r)
+#define __Pyx_GIVEREF(r)
+#define __Pyx_XDECREF(r) Py_XDECREF(r)
+#define __Pyx_SetupRefcountContext(name)
+#define __Pyx_FinishRefcountContext()
+#endif /* CYTHON_REFNANNY */
+#define __Pyx_XGIVEREF(r) if((r) == NULL) ; else __Pyx_GIVEREF(r)
+#define __Pyx_XGOTREF(r) if((r) == NULL) ; else __Pyx_GOTREF(r)
+
+static void __Pyx_RaiseDoubleKeywordsError(
+ const char* func_name, PyObject* kw_name); /*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 int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[], PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args, const char* function_name); /*proto*/
+
+/* Run-time type information about structs used with buffers */
+struct __Pyx_StructField_;
+
+typedef struct {
+ const char* name; /* for error messages only */
+ struct __Pyx_StructField_* fields;
+ size_t size; /* sizeof(type) */
+ char typegroup; /* _R_eal, _C_omplex, Signed _I_nt, _U_nsigned int, _S_truct, _P_ointer, _O_bject */
+} __Pyx_TypeInfo;
+
+typedef struct __Pyx_StructField_ {
+ __Pyx_TypeInfo* type;
+ const char* name;
+ size_t offset;
+} __Pyx_StructField;
+
+typedef struct {
+ __Pyx_StructField* field;
+ size_t parent_offset;
+} __Pyx_BufFmt_StackElem;
+
+
+static INLINE void __Pyx_SafeReleaseBuffer(Py_buffer* info);
+static int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack);
+#define __Pyx_BufPtrStrided1d(type, buf, i0, s0) (type)((char*)buf + i0 * s0)
+
+static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+#define __Pyx_BufPtrStrided2d(type, buf, i0, s0, i1, s1) (type)((char*)buf + i0 * s0 + i1 * s1)
+#define __Pyx_BufPtrStrided3d(type, buf, i0, s0, i1, s1, i2, s2) (type)((char*)buf + i0 * s0 + i1 * s1 + i2 * s2)
+
+
+static 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;
+}
+
+
+#define __Pyx_GetItemInt_List(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \
+ __Pyx_GetItemInt_List_Fast(o, i, size <= sizeof(long)) : \
+ __Pyx_GetItemInt_Generic(o, to_py_func(i)))
+
+static INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+ 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, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));
+}
+
+#define __Pyx_GetItemInt_Tuple(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \
+ __Pyx_GetItemInt_Tuple_Fast(o, i, size <= sizeof(long)) : \
+ __Pyx_GetItemInt_Generic(o, to_py_func(i)))
+
+static INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+ 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, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));
+}
+
+
+#define __Pyx_GetItemInt(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \
+ __Pyx_GetItemInt_Fast(o, i, size <= sizeof(long)) : \
+ __Pyx_GetItemInt_Generic(o, to_py_func(i)))
+
+static INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+ 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, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));
+ }
+ return r;
+}
+
+static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
-static INLINE void __Pyx_RaiseArgtupleTooLong(Py_ssize_t num_expected, Py_ssize_t num_found); /*proto*/
-#if (PY_MAJOR_VERSION < 3) && !(Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_NEWBUFFER)
+static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,
+ const char *name, int exact); /*proto*/
+#if PY_MAJOR_VERSION < 3
static int __Pyx_GetBuffer(PyObject *obj, Py_buffer *view, int flags);
-static void __Pyx_ReleaseBuffer(PyObject *obj, Py_buffer *view);
+static void __Pyx_ReleaseBuffer(Py_buffer *view);
#else
#define __Pyx_GetBuffer PyObject_GetBuffer
-#define __Pyx_ReleaseBuffer PyObject_ReleaseBuffer
+#define __Pyx_ReleaseBuffer PyBuffer_Release
#endif
Py_ssize_t __Pyx_zeros[] = {0, 0, 0};
@@ -212,11 +391,257 @@
static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
+#if __PYX_USE_C99_COMPLEX
+ #define __Pyx_REAL_PART(z) __real__(z)
+ #define __Pyx_IMAG_PART(z) __imag__(z)
+#else
+ #define __Pyx_REAL_PART(z) ((z).real)
+ #define __Pyx_IMAG_PART(z) ((z).imag)
+#endif
+
+#define __pyx_PyObject_from_complex(z) PyComplex_FromDoubles((double)__Pyx_REAL_PART(z), (double)__Pyx_IMAG_PART(z))
+
+#if __PYX_USE_C99_COMPLEX
+
+ typedef float _Complex __pyx_t_float_complex;
+ static INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(float x, float y) {
+ return x + y*(__pyx_t_float_complex)_Complex_I;
+ }
+
+ #define __pyx_t_float_complex_is_zero(a) ((a) == 0)
+ #define __pyx_t_float_complex_eq(a, b) ((a) == (b))
+ #define __pyx_t_float_complex_add(a, b) ((a)+(b))
+ #define __pyx_t_float_complex_sub(a, b) ((a)-(b))
+ #define __pyx_t_float_complex_mul(a, b) ((a)*(b))
+ #define __pyx_t_float_complex_div(a, b) ((a)/(b))
+ #define __pyx_t_float_complex_neg(a) (-(a))
+
+#else
+
+ typedef struct { float real, imag; } __pyx_t_float_complex;
+ static INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(float x, float y) {
+ __pyx_t_float_complex c; c.real = x; c.imag = y; return c;
+ }
+
+ static INLINE int __pyx_t_float_complex_is_zero(__pyx_t_float_complex a) {
+ return (a.real == 0) & (a.imag == 0);
+ }
+
+ static INLINE int __pyx_t_float_complex_eq(__pyx_t_float_complex a, __pyx_t_float_complex b) {
+ return (a.real == b.real) & (a.imag == b.imag);
+ }
+
+ static INLINE __pyx_t_float_complex __pyx_t_float_complex_add(__pyx_t_float_complex a, __pyx_t_float_complex b) {
+ __pyx_t_float_complex z;
+ z.real = a.real + b.real;
+ z.imag = a.imag + b.imag;
+ return z;
+ }
+
+ static INLINE __pyx_t_float_complex __pyx_t_float_complex_sub(__pyx_t_float_complex a, __pyx_t_float_complex b) {
+ __pyx_t_float_complex z;
+ z.real = a.real - b.real;
+ z.imag = a.imag - b.imag;
+ return z;
+ }
+
+ static INLINE __pyx_t_float_complex __pyx_t_float_complex_mul(__pyx_t_float_complex a, __pyx_t_float_complex b) {
+ __pyx_t_float_complex z;
+ z.real = a.real * b.real - a.imag * b.imag;
+ z.imag = a.real * b.imag + a.imag * b.real;
+ return z;
+ }
+
+ static INLINE __pyx_t_float_complex __pyx_t_float_complex_div(__pyx_t_float_complex a, __pyx_t_float_complex b) {
+ __pyx_t_float_complex z;
+ float denom = b.real*b.real + b.imag*b.imag;
+ z.real = (a.real * b.real + a.imag * b.imag) / denom;
+ z.imag = (a.imag * b.real - a.real * b.imag) / denom;
+ return z;
+ }
+
+ static INLINE __pyx_t_float_complex __pyx_t_float_complex_neg(__pyx_t_float_complex a) {
+ __pyx_t_float_complex z;
+ z.real = -a.real;
+ z.imag = -a.imag;
+ return z;
+ }
+
+#endif
+
+#if __PYX_USE_C99_COMPLEX
+
+ typedef double _Complex __pyx_t_double_complex;
+ static INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(double x, double y) {
+ return x + y*(__pyx_t_double_complex)_Complex_I;
+ }
+
+ #define __pyx_t_double_complex_is_zero(a) ((a) == 0)
+ #define __pyx_t_double_complex_eq(a, b) ((a) == (b))
+ #define __pyx_t_double_complex_add(a, b) ((a)+(b))
+ #define __pyx_t_double_complex_sub(a, b) ((a)-(b))
+ #define __pyx_t_double_complex_mul(a, b) ((a)*(b))
+ #define __pyx_t_double_complex_div(a, b) ((a)/(b))
+ #define __pyx_t_double_complex_neg(a) (-(a))
+
+#else
+
+ typedef struct { double real, imag; } __pyx_t_double_complex;
+ static INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(double x, double y) {
+ __pyx_t_double_complex c; c.real = x; c.imag = y; return c;
+ }
+
+ static INLINE int __pyx_t_double_complex_is_zero(__pyx_t_double_complex a) {
+ return (a.real == 0) & (a.imag == 0);
+ }
+
+ static INLINE int __pyx_t_double_complex_eq(__pyx_t_double_complex a, __pyx_t_double_complex b) {
+ return (a.real == b.real) & (a.imag == b.imag);
+ }
+
+ static INLINE __pyx_t_double_complex __pyx_t_double_complex_add(__pyx_t_double_complex a, __pyx_t_double_complex b) {
+ __pyx_t_double_complex z;
+ z.real = a.real + b.real;
+ z.imag = a.imag + b.imag;
+ return z;
+ }
+
+ static INLINE __pyx_t_double_complex __pyx_t_double_complex_sub(__pyx_t_double_complex a, __pyx_t_double_complex b) {
+ __pyx_t_double_complex z;
+ z.real = a.real - b.real;
+ z.imag = a.imag - b.imag;
+ return z;
+ }
+
+ static INLINE __pyx_t_double_complex __pyx_t_double_complex_mul(__pyx_t_double_complex a, __pyx_t_double_complex b) {
+ __pyx_t_double_complex z;
+ z.real = a.real * b.real - a.imag * b.imag;
+ z.imag = a.real * b.imag + a.imag * b.real;
+ return z;
+ }
+
+ static INLINE __pyx_t_double_complex __pyx_t_double_complex_div(__pyx_t_double_complex a, __pyx_t_double_complex b) {
+ __pyx_t_double_complex z;
+ double denom = b.real*b.real + b.imag*b.imag;
+ z.real = (a.real * b.real + a.imag * b.imag) / denom;
+ z.imag = (a.imag * b.real - a.real * b.imag) / denom;
+ return z;
+ }
+
+ static INLINE __pyx_t_double_complex __pyx_t_double_complex_neg(__pyx_t_double_complex a) {
+ __pyx_t_double_complex z;
+ z.real = -a.real;
+ z.imag = -a.imag;
+ return z;
+ }
+
+#endif
+
+#if __PYX_USE_C99_COMPLEX
+
+ typedef long double _Complex __pyx_t_long__double_complex;
+ static INLINE __pyx_t_long__double_complex __pyx_t_long__double_complex_from_parts(long double x, long double y) {
+ return x + y*(__pyx_t_long__double_complex)_Complex_I;
+ }
+
+ #define __pyx_t_long__double_complex_is_zero(a) ((a) == 0)
+ #define __pyx_t_long__double_complex_eq(a, b) ((a) == (b))
+ #define __pyx_t_long__double_complex_add(a, b) ((a)+(b))
+ #define __pyx_t_long__double_complex_sub(a, b) ((a)-(b))
+ #define __pyx_t_long__double_complex_mul(a, b) ((a)*(b))
+ #define __pyx_t_long__double_complex_div(a, b) ((a)/(b))
+ #define __pyx_t_long__double_complex_neg(a) (-(a))
+
+#else
+
+ typedef struct { long double real, imag; } __pyx_t_long__double_complex;
+ static INLINE __pyx_t_long__double_complex __pyx_t_long__double_complex_from_parts(long double x, long double y) {
+ __pyx_t_long__double_complex c; c.real = x; c.imag = y; return c;
+ }
+
+ static INLINE int __pyx_t_long__double_complex_is_zero(__pyx_t_long__double_complex a) {
+ return (a.real == 0) & (a.imag == 0);
+ }
+
+ static INLINE int __pyx_t_long__double_complex_eq(__pyx_t_long__double_complex a, __pyx_t_long__double_complex b) {
+ return (a.real == b.real) & (a.imag == b.imag);
+ }
+
+ static INLINE __pyx_t_long__double_complex __pyx_t_long__double_complex_add(__pyx_t_long__double_complex a, __pyx_t_long__double_complex b) {
+ __pyx_t_long__double_complex z;
+ z.real = a.real + b.real;
+ z.imag = a.imag + b.imag;
+ return z;
+ }
+
+ static INLINE __pyx_t_long__double_complex __pyx_t_long__double_complex_sub(__pyx_t_long__double_complex a, __pyx_t_long__double_complex b) {
+ __pyx_t_long__double_complex z;
+ z.real = a.real - b.real;
+ z.imag = a.imag - b.imag;
+ return z;
+ }
+
+ static INLINE __pyx_t_long__double_complex __pyx_t_long__double_complex_mul(__pyx_t_long__double_complex a, __pyx_t_long__double_complex b) {
+ __pyx_t_long__double_complex z;
+ z.real = a.real * b.real - a.imag * b.imag;
+ z.imag = a.real * b.imag + a.imag * b.real;
+ return z;
+ }
+
+ static INLINE __pyx_t_long__double_complex __pyx_t_long__double_complex_div(__pyx_t_long__double_complex a, __pyx_t_long__double_complex b) {
+ __pyx_t_long__double_complex z;
+ long double denom = b.real*b.real + b.imag*b.imag;
+ z.real = (a.real * b.real + a.imag * b.imag) / denom;
+ z.imag = (a.imag * b.real - a.real * b.imag) / denom;
+ return z;
+ }
+
+ static INLINE __pyx_t_long__double_complex __pyx_t_long__double_complex_neg(__pyx_t_long__double_complex a) {
+ __pyx_t_long__double_complex z;
+ z.real = -a.real;
+ z.imag = -a.imag;
+ return z;
+ }
+
+#endif
+
static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size); /*proto*/
+static INLINE int __Pyx_StrEq(const char *, const char *); /*proto*/
+
+static INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
+
+static INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
+
+static INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
+
+static INLINE char __Pyx_PyInt_AsChar(PyObject *);
+
+static INLINE short __Pyx_PyInt_AsShort(PyObject *);
+
+static INLINE int __Pyx_PyInt_AsInt(PyObject *);
+
+static INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
+
+static INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
+
+static INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
-static PyObject *__Pyx_ImportModule(char *name); /*proto*/
+static INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
+
+static INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
+
+static INLINE long __Pyx_PyInt_AsLong(PyObject *);
+
+static INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
+
+static INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
+
+static INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
+
+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size); /*proto*/
+
+static PyObject *__Pyx_ImportModule(const char *name); /*proto*/
static void __Pyx_AddTraceback(const char *funcname); /*proto*/
@@ -244,6 +669,10 @@
typedef npy_float64 __pyx_t_5numpy_float64_t;
+typedef npy_complex64 __pyx_t_5numpy_complex64_t;
+
+typedef npy_complex128 __pyx_t_5numpy_complex128_t;
+
typedef npy_long __pyx_t_5numpy_int_t;
typedef npy_longlong __pyx_t_5numpy_long_t;
@@ -257,50 +686,124 @@
typedef npy_double __pyx_t_5numpy_double_t;
typedef npy_longdouble __pyx_t_5numpy_longdouble_t;
+
+typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
+
+typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
+
+typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t;
+
+typedef npy_cdouble __pyx_t_5numpy_complex_t;
+/* Module declarations from python_buffer */
+
+/* Module declarations from stdlib */
+
/* Module declarations from numpy */
/* Module declarations from numpy */
+static PyTypeObject *__pyx_ptype_5numpy_dtype = 0;
static PyTypeObject *__pyx_ptype_5numpy_ndarray = 0;
+static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *, char *, char *, int *); /*proto*/
/* Module declarations from cython */
/* Module declarations from yt.lagos.Interpolators */
-
+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t = { "numpy.float64_t", NULL, sizeof(__pyx_t_5numpy_float64_t), 'R' };
+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_int32_t = { "numpy.int32_t", NULL, sizeof(__pyx_t_5numpy_int32_t), 'I' };
+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_int_t = { "numpy.int_t", NULL, sizeof(__pyx_t_5numpy_int_t), 'I' };
+#define __Pyx_MODULE_NAME "yt.lagos.Interpolators"
+int __pyx_module_is_main_yt__lagos__Interpolators = 0;
/* Implementation of yt.lagos.Interpolators */
+static char __pyx_k___main__[] = "__main__";
+static PyObject *__pyx_kp___main__;
+static char __pyx_k_table[] = "table";
+static PyObject *__pyx_kp_table;
+static char __pyx_k_x_vals[] = "x_vals";
+static PyObject *__pyx_kp_x_vals;
+static char __pyx_k_x_bins[] = "x_bins";
+static PyObject *__pyx_kp_x_bins;
+static char __pyx_k_x_is[] = "x_is";
+static PyObject *__pyx_kp_x_is;
+static char __pyx_k_output[] = "output";
+static PyObject *__pyx_kp_output;
+static char __pyx_k_y_vals[] = "y_vals";
+static PyObject *__pyx_kp_y_vals;
+static char __pyx_k_y_bins[] = "y_bins";
+static PyObject *__pyx_kp_y_bins;
+static char __pyx_k_y_is[] = "y_is";
+static PyObject *__pyx_kp_y_is;
+static char __pyx_k_z_vals[] = "z_vals";
+static PyObject *__pyx_kp_z_vals;
+static char __pyx_k_z_bins[] = "z_bins";
+static PyObject *__pyx_kp_z_bins;
+static char __pyx_k_z_is[] = "z_is";
+static PyObject *__pyx_kp_z_is;
static char __pyx_k_numpy[] = "numpy";
static PyObject *__pyx_kp_numpy;
static char __pyx_k_np[] = "np";
static PyObject *__pyx_kp_np;
+static char __pyx_k_range[] = "range";
+static PyObject *__pyx_kp_range;
+static PyObject *__pyx_builtin_range;
+static PyObject *__pyx_int_15;
static char __pyx_k___getbuffer__[] = "__getbuffer__";
static PyObject *__pyx_kp___getbuffer__;
-static char __pyx_k_RuntimeError[] = "RuntimeError";
-static PyObject *__pyx_kp_RuntimeError;
+static char __pyx_k___releasebuffer__[] = "__releasebuffer__";
+static PyObject *__pyx_kp___releasebuffer__;
+static char __pyx_k_info[] = "info";
+static PyObject *__pyx_kp_info;
+static char __pyx_k_flags[] = "flags";
+static PyObject *__pyx_kp_flags;
static char __pyx_k_ValueError[] = "ValueError";
static PyObject *__pyx_kp_ValueError;
+static char __pyx_k_itervalues[] = "itervalues";
+static PyObject *__pyx_kp_itervalues;
+static char __pyx_k_RuntimeError[] = "RuntimeError";
+static PyObject *__pyx_kp_RuntimeError;
static PyObject *__pyx_kp_1;
-static PyObject *__pyx_kp_16;
-static PyObject *__pyx_builtin_RuntimeError;
+static PyObject *__pyx_kp_2;
+static PyObject *__pyx_kp_5;
+static PyObject *__pyx_kp_23;
static PyObject *__pyx_builtin_ValueError;
-static char __pyx_k_1[] = "Py_intptr_t and Py_ssize_t differs in size, numpy.pxd does not support this";
-static char __pyx_k_2[] = "b";
-static char __pyx_k_3[] = "B";
-static char __pyx_k_4[] = "h";
-static char __pyx_k_5[] = "H";
-static char __pyx_k_6[] = "i";
-static char __pyx_k_7[] = "I";
-static char __pyx_k_8[] = "l";
-static char __pyx_k_9[] = "L";
-static char __pyx_k_10[] = "q";
-static char __pyx_k_11[] = "Q";
-static char __pyx_k_12[] = "f";
-static char __pyx_k_13[] = "d";
-static char __pyx_k_14[] = "g";
-static char __pyx_k_15[] = "O";
-static char __pyx_k_16[] = "only objects, int and float dtypes supported for ndarray buffer access so far (dtype is %d)";
+static PyObject *__pyx_builtin_RuntimeError;
+static char __pyx_k_1[] = "ndarray is not C contiguous";
+static char __pyx_k_2[] = "ndarray is not Fortran contiguous";
+static char __pyx_k_3[] = ">";
+static char __pyx_k_4[] = "<";
+static char __pyx_k_5[] = "Non-native byte order not supported";
+static char __pyx_k_6[] = "b";
+static char __pyx_k_7[] = "B";
+static char __pyx_k_8[] = "h";
+static char __pyx_k_9[] = "H";
+static char __pyx_k_10[] = "i";
+static char __pyx_k_11[] = "I";
+static char __pyx_k_12[] = "l";
+static char __pyx_k_13[] = "L";
+static char __pyx_k_14[] = "q";
+static char __pyx_k_15[] = "Q";
+static char __pyx_k_16[] = "f";
+static char __pyx_k_17[] = "d";
+static char __pyx_k_18[] = "g";
+static char __pyx_k_19[] = "Zf";
+static char __pyx_k_20[] = "Zd";
+static char __pyx_k_21[] = "Zg";
+static char __pyx_k_22[] = "O";
+static char __pyx_k_23[] = "unknown dtype code in numpy.pxd (%d)";
+static char __pyx_k_24[] = "^";
+static PyObject *__pyx_kp_25;
+static PyObject *__pyx_kp_28;
+static PyObject *__pyx_kp_29;
+static PyObject *__pyx_kp_30;
+static char __pyx_k_25[] = "Format string allocated too short, see comment in numpy.pxd";
+static char __pyx_k_26[] = ">";
+static char __pyx_k_27[] = "<";
+static char __pyx_k_28[] = "Non-native byte order not supported";
+static char __pyx_k_29[] = "Format string allocated too short.";
+static char __pyx_k_30[] = "unknown dtype code in numpy.pxd (%d)";
-/* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":31
+/* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":31
*
* @cython.boundscheck(False)
* def UnilinearlyInterpolate(np.ndarray[np.float64_t, ndim=1] table, # <<<<<<<<<<<<<<
@@ -320,6 +823,7 @@
double __pyx_v_xm;
int __pyx_v_i;
int __pyx_v_x_i;
+ PyObject *__pyx_v_dx_inv;
Py_buffer __pyx_bstruct_x_is;
Py_ssize_t __pyx_bstride_0_x_is = 0;
Py_ssize_t __pyx_bshape_0_x_is = 0;
@@ -335,190 +839,278 @@
Py_buffer __pyx_bstruct_x_bins;
Py_ssize_t __pyx_bstride_0_x_bins = 0;
Py_ssize_t __pyx_bshape_0_x_bins = 0;
- PyObject *__pyx_r;
- npy_intp __pyx_1;
- __pyx_t_5numpy_int32_t __pyx_2;
- __pyx_t_5numpy_float64_t __pyx_3;
- __pyx_t_5numpy_float64_t __pyx_4;
- __pyx_t_5numpy_float64_t __pyx_5;
+ PyObject *__pyx_r = NULL;
int __pyx_t_1;
int __pyx_t_2;
int __pyx_t_3;
long __pyx_t_4;
int __pyx_t_5;
- long __pyx_t_6;
- long __pyx_t_7;
- int __pyx_t_8;
- int __pyx_t_9;
+ PyObject *__pyx_t_6 = NULL;
+ int __pyx_t_7;
+ PyObject *__pyx_t_8 = NULL;
+ double __pyx_t_9;
long __pyx_t_10;
int __pyx_t_11;
- static char *__pyx_argnames[] = {"table","x_vals","x_bins","x_is","output",0};
+ long __pyx_t_12;
+ int __pyx_t_13;
+ static PyObject **__pyx_pyargnames[] = {&__pyx_kp_table,&__pyx_kp_x_vals,&__pyx_kp_x_bins,&__pyx_kp_x_is,&__pyx_kp_output,0};
+ __Pyx_SetupRefcountContext("UnilinearlyInterpolate");
__pyx_self = __pyx_self;
- if (likely(!__pyx_kwds) && likely(PyTuple_GET_SIZE(__pyx_args) == 5)) {
+ if (unlikely(__pyx_kwds)) {
+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+ PyObject* values[5] = {0,0,0,0,0};
+ switch (PyTuple_GET_SIZE(__pyx_args)) {
+ case 5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
+ case 4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
+ case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
+ 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_kp_table);
+ if (likely(values[0])) kw_args--;
+ else goto __pyx_L5_argtuple_error;
+ case 1:
+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_vals);
+ if (likely(values[1])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("UnilinearlyInterpolate", 1, 5, 5, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 2:
+ values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_bins);
+ if (likely(values[2])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("UnilinearlyInterpolate", 1, 5, 5, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 3:
+ values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_is);
+ if (likely(values[3])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("UnilinearlyInterpolate", 1, 5, 5, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 4:
+ values[4] = PyDict_GetItem(__pyx_kwds, __pyx_kp_output);
+ if (likely(values[4])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("UnilinearlyInterpolate", 1, 5, 5, 4); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ }
+ if (unlikely(kw_args > 0)) {
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "UnilinearlyInterpolate") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ __pyx_v_table = ((PyArrayObject *)values[0]);
+ __pyx_v_x_vals = ((PyArrayObject *)values[1]);
+ __pyx_v_x_bins = ((PyArrayObject *)values[2]);
+ __pyx_v_x_is = ((PyArrayObject *)values[3]);
+ __pyx_v_output = ((PyArrayObject *)values[4]);
+ } else if (PyTuple_GET_SIZE(__pyx_args) != 5) {
+ goto __pyx_L5_argtuple_error;
+ } else {
__pyx_v_table = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
__pyx_v_x_vals = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
__pyx_v_x_bins = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2));
__pyx_v_x_is = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 3));
__pyx_v_output = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 4));
}
- else {
- if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOOOO", __pyx_argnames, &__pyx_v_table, &__pyx_v_x_vals, &__pyx_v_x_bins, &__pyx_v_x_is, &__pyx_v_output))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
- }
- goto __pyx_L4;
+ goto __pyx_L4_argument_unpacking_done;
+ __pyx_L5_argtuple_error:;
+ __Pyx_RaiseArgtupleInvalid("UnilinearlyInterpolate", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
__pyx_L3_error:;
__Pyx_AddTraceback("yt.lagos.Interpolators.UnilinearlyInterpolate");
return NULL;
- __pyx_L4:;
+ __pyx_L4_argument_unpacking_done:;
+ __pyx_v_dx_inv = Py_None; __Pyx_INCREF(Py_None);
+ __pyx_bstruct_table.buf = NULL;
+ __pyx_bstruct_x_vals.buf = NULL;
+ __pyx_bstruct_x_bins.buf = NULL;
+ __pyx_bstruct_x_is.buf = NULL;
+ __pyx_bstruct_output.buf = NULL;
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_table), __pyx_ptype_5numpy_ndarray, 1, "table", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_vals), __pyx_ptype_5numpy_ndarray, 1, "x_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_bins), __pyx_ptype_5numpy_ndarray, 1, "x_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_is), __pyx_ptype_5numpy_ndarray, 1, "x_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_output), __pyx_ptype_5numpy_ndarray, 1, "output", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_table, &__pyx_bstruct_table, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_table, (PyObject*)__pyx_v_table, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_table = __pyx_bstruct_table.strides[0];
__pyx_bshape_0_table = __pyx_bstruct_table.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_vals, (PyObject*)__pyx_v_x_vals, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_vals = __pyx_bstruct_x_vals.strides[0];
__pyx_bshape_0_x_vals = __pyx_bstruct_x_vals.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_bins, (PyObject*)__pyx_v_x_bins, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_bins = __pyx_bstruct_x_bins.strides[0];
__pyx_bshape_0_x_bins = __pyx_bstruct_x_bins.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_int32_t((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_is, (PyObject*)__pyx_v_x_is, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_is = __pyx_bstruct_x_is.strides[0];
__pyx_bshape_0_x_is = __pyx_bstruct_x_is.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_output, &__pyx_bstruct_output, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_output, (PyObject*)__pyx_v_output, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_output = __pyx_bstruct_output.strides[0];
__pyx_bshape_0_output = __pyx_bstruct_output.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":38
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":38
* cdef double x, xp, xm
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]): # <<<<<<<<<<<<<<
* x_i = x_is[i]
* x = x_vals[i]
*/
- __pyx_1 = (__pyx_v_x_vals->dimensions[0]);
- for (__pyx_v_i = 0; __pyx_v_i < __pyx_1; __pyx_v_i+=1) {
+ for (__pyx_t_1 = 0; __pyx_t_1 < (__pyx_v_x_vals->dimensions[0]); __pyx_t_1+=1) {
+ __pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":39
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":39
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]):
* x_i = x_is[i] # <<<<<<<<<<<<<<
* x = x_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
*/
- __pyx_t_1 = __pyx_v_i;
- if (__pyx_t_1 < 0) __pyx_t_1 += __pyx_bshape_0_x_is;
- __pyx_2 = *((__pyx_t_5numpy_int32_t *)((__pyx_t_5numpy_int32_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_is.buf, __pyx_t_1, __pyx_bstride_0_x_is)));
- __pyx_v_x_i = __pyx_2;
+ __pyx_t_2 = __pyx_v_i;
+ if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_x_is;
+ __pyx_v_x_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_x_is.buf, __pyx_t_2, __pyx_bstride_0_x_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":40
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":40
* for i in range(x_vals.shape[0]):
* x_i = x_is[i]
* x = x_vals[i] # <<<<<<<<<<<<<<
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * xp = (x - x_bins[x_i]) * dx_inv
*/
- __pyx_t_2 = __pyx_v_i;
- if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_x_vals;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_vals.buf, __pyx_t_2, __pyx_bstride_0_x_vals)));
- __pyx_v_x = __pyx_3;
+ __pyx_t_3 = __pyx_v_i;
+ if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_x_vals;
+ __pyx_v_x = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_vals.buf, __pyx_t_3, __pyx_bstride_0_x_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":41
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":41
* x_i = x_is[i]
* x = x_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * output[i] = table[x_i ] * (xm) \
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv
*/
- __pyx_t_3 = __pyx_v_x_i;
- if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_x_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_3, __pyx_bstride_0_x_bins)));
__pyx_t_4 = (__pyx_v_x_i + 1);
if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_x_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_4, __pyx_bstride_0_x_bins)));
__pyx_t_5 = __pyx_v_x_i;
if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_x_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_5, __pyx_bstride_0_x_bins)));
- __pyx_v_xp = ((__pyx_v_x - __pyx_3) / (__pyx_4 - __pyx_5));
+ __pyx_t_6 = PyFloat_FromDouble((1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_4, __pyx_bstride_0_x_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_5, __pyx_bstride_0_x_bins))))); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_6);
+ __Pyx_DECREF(__pyx_v_dx_inv);
+ __pyx_v_dx_inv = __pyx_t_6;
+ __pyx_t_6 = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":42
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":42
* x = x_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * xp = (x - x_bins[x_i]) * dx_inv # <<<<<<<<<<<<<<
+ * xm = (x_bins[x_i+1] - x) * dx_inv
* output[i] = table[x_i ] * (xm) \
- * + table[x_i+1] * (xp)
*/
- __pyx_t_6 = (__pyx_v_x_i + 1);
- if (__pyx_t_6 < 0) __pyx_t_6 += __pyx_bshape_0_x_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_6, __pyx_bstride_0_x_bins)));
- __pyx_t_7 = (__pyx_v_x_i + 1);
+ __pyx_t_7 = __pyx_v_x_i;
if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_x_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_7, __pyx_bstride_0_x_bins)));
- __pyx_t_8 = __pyx_v_x_i;
- if (__pyx_t_8 < 0) __pyx_t_8 += __pyx_bshape_0_x_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_8, __pyx_bstride_0_x_bins)));
- __pyx_v_xm = ((__pyx_3 - __pyx_v_x) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":43
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
+ __pyx_t_6 = PyFloat_FromDouble((__pyx_v_x - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_7, __pyx_bstride_0_x_bins)))); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_6);
+ __pyx_t_8 = PyNumber_Multiply(__pyx_t_6, __pyx_v_dx_inv); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_8);
+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+ __pyx_t_9 = __pyx_PyFloat_AsDouble(__pyx_t_8); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+ __pyx_v_xp = __pyx_t_9;
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":43
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv # <<<<<<<<<<<<<<
+ * output[i] = table[x_i ] * (xm) \
+ * + table[x_i+1] * (xp)
+ */
+ __pyx_t_10 = (__pyx_v_x_i + 1);
+ if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_x_bins;
+ __pyx_t_8 = PyFloat_FromDouble(((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_10, __pyx_bstride_0_x_bins)) - __pyx_v_x)); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_8);
+ __pyx_t_6 = PyNumber_Multiply(__pyx_t_8, __pyx_v_dx_inv); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_6);
+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+ __pyx_t_9 = __pyx_PyFloat_AsDouble(__pyx_t_6); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+ __pyx_v_xm = __pyx_t_9;
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":44
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv
* output[i] = table[x_i ] * (xm) \ # <<<<<<<<<<<<<<
* + table[x_i+1] * (xp)
*
*/
- __pyx_t_9 = __pyx_v_x_i;
- if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_0_table;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_table.buf, __pyx_t_9, __pyx_bstride_0_table)));
+ __pyx_t_11 = __pyx_v_x_i;
+ if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":44
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":45
+ * xm = (x_bins[x_i+1] - x) * dx_inv
* output[i] = table[x_i ] * (xm) \
* + table[x_i+1] * (xp) # <<<<<<<<<<<<<<
*
* @cython.boundscheck(False)
*/
- __pyx_t_10 = (__pyx_v_x_i + 1);
- if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_table;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_table.buf, __pyx_t_10, __pyx_bstride_0_table)));
+ __pyx_t_12 = (__pyx_v_x_i + 1);
+ if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_0_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":43
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":44
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv
* output[i] = table[x_i ] * (xm) \ # <<<<<<<<<<<<<<
* + table[x_i+1] * (xp)
*
*/
- __pyx_t_11 = __pyx_v_i;
- if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_output;
- *((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_output.buf, __pyx_t_11, __pyx_bstride_0_output)) = ((__pyx_3 * __pyx_v_xm) + (__pyx_4 * __pyx_v_xp));
+ __pyx_t_13 = __pyx_v_i;
+ if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_output;
+ *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_output.buf, __pyx_t_13, __pyx_bstride_0_output) = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_11, __pyx_bstride_0_table)) * __pyx_v_xm) + ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_12, __pyx_bstride_0_table)) * __pyx_v_xp));
}
- __pyx_r = Py_None; Py_INCREF(Py_None);
+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);
goto __pyx_L0;
__pyx_L1_error:;
+ __Pyx_XDECREF(__pyx_t_6);
+ __Pyx_XDECREF(__pyx_t_8);
{ PyObject *__pyx_type, *__pyx_value, *__pyx_tb;
- PyErr_Fetch(&__pyx_type, &__pyx_value, &__pyx_tb);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_output, &__pyx_bstruct_output);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_table, &__pyx_bstruct_table);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins);
- PyErr_Restore(__pyx_type, __pyx_value, __pyx_tb);}
+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_output);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_table);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_bins);
+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}
__Pyx_AddTraceback("yt.lagos.Interpolators.UnilinearlyInterpolate");
__pyx_r = NULL;
goto __pyx_L2;
__pyx_L0:;
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_output, &__pyx_bstruct_output);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_table, &__pyx_bstruct_table);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_output);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_table);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_bins);
__pyx_L2:;
+ __Pyx_DECREF(__pyx_v_dx_inv);
+ __Pyx_XGIVEREF(__pyx_r);
+ __Pyx_FinishRefcountContext();
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":47
+/* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":48
*
* @cython.boundscheck(False)
* def BilinearlyInterpolate(np.ndarray[np.float64_t, ndim=2] table, # <<<<<<<<<<<<<<
@@ -542,6 +1134,8 @@
double __pyx_v_y;
double __pyx_v_yp;
double __pyx_v_ym;
+ double __pyx_v_dx_inv;
+ double __pyx_v_dy_inv;
int __pyx_v_i;
int __pyx_v_x_i;
int __pyx_v_y_i;
@@ -571,13 +1165,7 @@
Py_buffer __pyx_bstruct_x_bins;
Py_ssize_t __pyx_bstride_0_x_bins = 0;
Py_ssize_t __pyx_bshape_0_x_bins = 0;
- PyObject *__pyx_r;
- npy_intp __pyx_1;
- __pyx_t_5numpy_int32_t __pyx_2;
- __pyx_t_5numpy_float64_t __pyx_3;
- __pyx_t_5numpy_float64_t __pyx_4;
- __pyx_t_5numpy_float64_t __pyx_5;
- __pyx_t_5numpy_float64_t __pyx_6;
+ PyObject *__pyx_r = NULL;
int __pyx_t_1;
int __pyx_t_2;
int __pyx_t_3;
@@ -585,27 +1173,101 @@
int __pyx_t_5;
long __pyx_t_6;
int __pyx_t_7;
- int __pyx_t_8;
- long __pyx_t_9;
+ long __pyx_t_8;
+ int __pyx_t_9;
int __pyx_t_10;
- long __pyx_t_11;
+ int __pyx_t_11;
long __pyx_t_12;
- int __pyx_t_13;
- long __pyx_t_14;
- long __pyx_t_15;
- int __pyx_t_16;
+ long __pyx_t_13;
+ int __pyx_t_14;
+ int __pyx_t_15;
+ long __pyx_t_16;
int __pyx_t_17;
int __pyx_t_18;
long __pyx_t_19;
- int __pyx_t_20;
- int __pyx_t_21;
- long __pyx_t_22;
- long __pyx_t_23;
- long __pyx_t_24;
- int __pyx_t_25;
- static char *__pyx_argnames[] = {"table","x_vals","y_vals","x_bins","y_bins","x_is","y_is","output",0};
+ long __pyx_t_20;
+ long __pyx_t_21;
+ int __pyx_t_22;
+ static PyObject **__pyx_pyargnames[] = {&__pyx_kp_table,&__pyx_kp_x_vals,&__pyx_kp_y_vals,&__pyx_kp_x_bins,&__pyx_kp_y_bins,&__pyx_kp_x_is,&__pyx_kp_y_is,&__pyx_kp_output,0};
+ __Pyx_SetupRefcountContext("BilinearlyInterpolate");
__pyx_self = __pyx_self;
- if (likely(!__pyx_kwds) && likely(PyTuple_GET_SIZE(__pyx_args) == 8)) {
+ if (unlikely(__pyx_kwds)) {
+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+ PyObject* values[8] = {0,0,0,0,0,0,0,0};
+ switch (PyTuple_GET_SIZE(__pyx_args)) {
+ case 8: values[7] = PyTuple_GET_ITEM(__pyx_args, 7);
+ case 7: values[6] = PyTuple_GET_ITEM(__pyx_args, 6);
+ case 6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
+ case 5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
+ case 4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
+ case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
+ 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_kp_table);
+ if (likely(values[0])) kw_args--;
+ else goto __pyx_L5_argtuple_error;
+ case 1:
+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_vals);
+ if (likely(values[1])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 2:
+ values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_y_vals);
+ if (likely(values[2])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 3:
+ values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_bins);
+ if (likely(values[3])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 4:
+ values[4] = PyDict_GetItem(__pyx_kwds, __pyx_kp_y_bins);
+ if (likely(values[4])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, 4); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 5:
+ values[5] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_is);
+ if (likely(values[5])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, 5); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 6:
+ values[6] = PyDict_GetItem(__pyx_kwds, __pyx_kp_y_is);
+ if (likely(values[6])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, 6); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 7:
+ values[7] = PyDict_GetItem(__pyx_kwds, __pyx_kp_output);
+ if (likely(values[7])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, 7); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ }
+ if (unlikely(kw_args > 0)) {
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "BilinearlyInterpolate") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ __pyx_v_table = ((PyArrayObject *)values[0]);
+ __pyx_v_x_vals = ((PyArrayObject *)values[1]);
+ __pyx_v_y_vals = ((PyArrayObject *)values[2]);
+ __pyx_v_x_bins = ((PyArrayObject *)values[3]);
+ __pyx_v_y_bins = ((PyArrayObject *)values[4]);
+ __pyx_v_x_is = ((PyArrayObject *)values[5]);
+ __pyx_v_y_is = ((PyArrayObject *)values[6]);
+ __pyx_v_output = ((PyArrayObject *)values[7]);
+ } else if (PyTuple_GET_SIZE(__pyx_args) != 8) {
+ goto __pyx_L5_argtuple_error;
+ } else {
__pyx_v_table = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
__pyx_v_x_vals = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
__pyx_v_y_vals = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2));
@@ -615,272 +1277,295 @@
__pyx_v_y_is = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 6));
__pyx_v_output = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 7));
}
- else {
- if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOOOOOOO", __pyx_argnames, &__pyx_v_table, &__pyx_v_x_vals, &__pyx_v_y_vals, &__pyx_v_x_bins, &__pyx_v_y_bins, &__pyx_v_x_is, &__pyx_v_y_is, &__pyx_v_output))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
- }
- goto __pyx_L4;
+ goto __pyx_L4_argument_unpacking_done;
+ __pyx_L5_argtuple_error:;
+ __Pyx_RaiseArgtupleInvalid("BilinearlyInterpolate", 1, 8, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
__pyx_L3_error:;
__Pyx_AddTraceback("yt.lagos.Interpolators.BilinearlyInterpolate");
return NULL;
- __pyx_L4:;
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_table), __pyx_ptype_5numpy_ndarray, 1, "table", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_vals), __pyx_ptype_5numpy_ndarray, 1, "x_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_vals), __pyx_ptype_5numpy_ndarray, 1, "y_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_bins), __pyx_ptype_5numpy_ndarray, 1, "x_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_bins), __pyx_ptype_5numpy_ndarray, 1, "y_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_is), __pyx_ptype_5numpy_ndarray, 1, "x_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_is), __pyx_ptype_5numpy_ndarray, 1, "y_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_output), __pyx_ptype_5numpy_ndarray, 1, "output", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_table, &__pyx_bstruct_table, PyBUF_FORMAT| PyBUF_STRIDES, 2) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_L4_argument_unpacking_done:;
+ __pyx_bstruct_table.buf = NULL;
+ __pyx_bstruct_x_vals.buf = NULL;
+ __pyx_bstruct_y_vals.buf = NULL;
+ __pyx_bstruct_x_bins.buf = NULL;
+ __pyx_bstruct_y_bins.buf = NULL;
+ __pyx_bstruct_x_is.buf = NULL;
+ __pyx_bstruct_y_is.buf = NULL;
+ __pyx_bstruct_output.buf = NULL;
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_table), __pyx_ptype_5numpy_ndarray, 1, "table", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_vals), __pyx_ptype_5numpy_ndarray, 1, "x_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_vals), __pyx_ptype_5numpy_ndarray, 1, "y_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_bins), __pyx_ptype_5numpy_ndarray, 1, "x_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_bins), __pyx_ptype_5numpy_ndarray, 1, "y_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_is), __pyx_ptype_5numpy_ndarray, 1, "x_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_is), __pyx_ptype_5numpy_ndarray, 1, "y_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_output), __pyx_ptype_5numpy_ndarray, 1, "output", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_table, (PyObject*)__pyx_v_table, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_table = __pyx_bstruct_table.strides[0]; __pyx_bstride_1_table = __pyx_bstruct_table.strides[1];
__pyx_bshape_0_table = __pyx_bstruct_table.shape[0]; __pyx_bshape_1_table = __pyx_bstruct_table.shape[1];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_vals, (PyObject*)__pyx_v_x_vals, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_vals = __pyx_bstruct_x_vals.strides[0];
__pyx_bshape_0_x_vals = __pyx_bstruct_x_vals.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_y_vals, &__pyx_bstruct_y_vals, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_y_vals, (PyObject*)__pyx_v_y_vals, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_y_vals = __pyx_bstruct_y_vals.strides[0];
__pyx_bshape_0_y_vals = __pyx_bstruct_y_vals.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_bins, (PyObject*)__pyx_v_x_bins, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_bins = __pyx_bstruct_x_bins.strides[0];
__pyx_bshape_0_x_bins = __pyx_bstruct_x_bins.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_y_bins, &__pyx_bstruct_y_bins, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_y_bins, (PyObject*)__pyx_v_y_bins, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_y_bins = __pyx_bstruct_y_bins.strides[0];
__pyx_bshape_0_y_bins = __pyx_bstruct_y_bins.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_int32_t((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_is, (PyObject*)__pyx_v_x_is, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_is = __pyx_bstruct_x_is.strides[0];
__pyx_bshape_0_x_is = __pyx_bstruct_x_is.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_int32_t((PyObject*)__pyx_v_y_is, &__pyx_bstruct_y_is, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_y_is, (PyObject*)__pyx_v_y_is, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_y_is = __pyx_bstruct_y_is.strides[0];
__pyx_bshape_0_y_is = __pyx_bstruct_y_is.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_output, &__pyx_bstruct_output, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_output, (PyObject*)__pyx_v_output, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_output = __pyx_bstruct_output.strides[0];
__pyx_bshape_0_output = __pyx_bstruct_output.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":58
- * cdef double y, yp, ym
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":60
+ * cdef double dx_inv, dy_inv
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]): # <<<<<<<<<<<<<<
* x_i = x_is[i]
* y_i = y_is[i]
*/
- __pyx_1 = (__pyx_v_x_vals->dimensions[0]);
- for (__pyx_v_i = 0; __pyx_v_i < __pyx_1; __pyx_v_i+=1) {
+ for (__pyx_t_1 = 0; __pyx_t_1 < (__pyx_v_x_vals->dimensions[0]); __pyx_t_1+=1) {
+ __pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":59
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":61
* cdef int i, x_i, y_i
* for i in range(x_vals.shape[0]):
* x_i = x_is[i] # <<<<<<<<<<<<<<
* y_i = y_is[i]
* x = x_vals[i]
*/
- __pyx_t_1 = __pyx_v_i;
- if (__pyx_t_1 < 0) __pyx_t_1 += __pyx_bshape_0_x_is;
- __pyx_2 = *((__pyx_t_5numpy_int32_t *)((__pyx_t_5numpy_int32_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_is.buf, __pyx_t_1, __pyx_bstride_0_x_is)));
- __pyx_v_x_i = __pyx_2;
+ __pyx_t_2 = __pyx_v_i;
+ if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_x_is;
+ __pyx_v_x_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_x_is.buf, __pyx_t_2, __pyx_bstride_0_x_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":60
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":62
* for i in range(x_vals.shape[0]):
* x_i = x_is[i]
* y_i = y_is[i] # <<<<<<<<<<<<<<
* x = x_vals[i]
* y = y_vals[i]
*/
- __pyx_t_2 = __pyx_v_i;
- if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_y_is;
- __pyx_2 = *((__pyx_t_5numpy_int32_t *)((__pyx_t_5numpy_int32_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_is.buf, __pyx_t_2, __pyx_bstride_0_y_is)));
- __pyx_v_y_i = __pyx_2;
+ __pyx_t_3 = __pyx_v_i;
+ if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_y_is;
+ __pyx_v_y_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int32_t *, __pyx_bstruct_y_is.buf, __pyx_t_3, __pyx_bstride_0_y_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":61
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":63
* x_i = x_is[i]
* y_i = y_is[i]
* x = x_vals[i] # <<<<<<<<<<<<<<
* y = y_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
*/
- __pyx_t_3 = __pyx_v_i;
- if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_x_vals;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_vals.buf, __pyx_t_3, __pyx_bstride_0_x_vals)));
- __pyx_v_x = __pyx_3;
+ __pyx_t_4 = __pyx_v_i;
+ if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_x_vals;
+ __pyx_v_x = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_vals.buf, __pyx_t_4, __pyx_bstride_0_x_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":62
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":64
* y_i = y_is[i]
* x = x_vals[i]
* y = y_vals[i] # <<<<<<<<<<<<<<
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
*/
- __pyx_t_4 = __pyx_v_i;
- if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_y_vals;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_vals.buf, __pyx_t_4, __pyx_bstride_0_y_vals)));
- __pyx_v_y = __pyx_3;
+ __pyx_t_5 = __pyx_v_i;
+ if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_y_vals;
+ __pyx_v_y = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_vals.buf, __pyx_t_5, __pyx_bstride_0_y_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":63
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":65
* x = x_vals[i]
* y = y_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ * xp = (x - x_bins[x_i]) * dx_inv
*/
- __pyx_t_5 = __pyx_v_x_i;
- if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_x_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_5, __pyx_bstride_0_x_bins)));
__pyx_t_6 = (__pyx_v_x_i + 1);
if (__pyx_t_6 < 0) __pyx_t_6 += __pyx_bshape_0_x_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_6, __pyx_bstride_0_x_bins)));
__pyx_t_7 = __pyx_v_x_i;
if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_x_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_7, __pyx_bstride_0_x_bins)));
- __pyx_v_xp = ((__pyx_v_x - __pyx_3) / (__pyx_4 - __pyx_5));
+ __pyx_v_dx_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_6, __pyx_bstride_0_x_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_7, __pyx_bstride_0_x_bins))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":64
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":66
* y = y_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * yp = (y - y_bins[y_i]) * dy_inv
*/
- __pyx_t_8 = __pyx_v_y_i;
+ __pyx_t_8 = (__pyx_v_y_i + 1);
if (__pyx_t_8 < 0) __pyx_t_8 += __pyx_bshape_0_y_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_8, __pyx_bstride_0_y_bins)));
- __pyx_t_9 = (__pyx_v_y_i + 1);
+ __pyx_t_9 = __pyx_v_y_i;
if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_0_y_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_9, __pyx_bstride_0_y_bins)));
- __pyx_t_10 = __pyx_v_y_i;
- if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_y_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_10, __pyx_bstride_0_y_bins)));
- __pyx_v_yp = ((__pyx_v_y - __pyx_3) / (__pyx_4 - __pyx_5));
+ __pyx_v_dy_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_8, __pyx_bstride_0_y_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_9, __pyx_bstride_0_y_bins))));
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":67
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ * xp = (x - x_bins[x_i]) * dx_inv # <<<<<<<<<<<<<<
+ * yp = (y - y_bins[y_i]) * dy_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ */
+ __pyx_t_10 = __pyx_v_x_i;
+ if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_x_bins;
+ __pyx_v_xp = ((__pyx_v_x - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_10, __pyx_bstride_0_x_bins))) * __pyx_v_dx_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":68
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * yp = (y - y_bins[y_i]) * dy_inv # <<<<<<<<<<<<<<
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ * ym = (y_bins[y_i+1] - y) * dy_inv
+ */
+ __pyx_t_11 = __pyx_v_y_i;
+ if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_y_bins;
+ __pyx_v_yp = ((__pyx_v_y - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_11, __pyx_bstride_0_y_bins))) * __pyx_v_dy_inv);
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":65
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":69
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * yp = (y - y_bins[y_i]) * dy_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv # <<<<<<<<<<<<<<
+ * ym = (y_bins[y_i+1] - y) * dy_inv
* output[i] = table[x_i , y_i ] * (xm*ym) \
*/
- __pyx_t_11 = (__pyx_v_x_i + 1);
- if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_x_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_11, __pyx_bstride_0_x_bins)));
__pyx_t_12 = (__pyx_v_x_i + 1);
if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_0_x_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_12, __pyx_bstride_0_x_bins)));
- __pyx_t_13 = __pyx_v_x_i;
- if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_x_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_13, __pyx_bstride_0_x_bins)));
- __pyx_v_xm = ((__pyx_3 - __pyx_v_x) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":66
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
+ __pyx_v_xm = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_12, __pyx_bstride_0_x_bins)) - __pyx_v_x) * __pyx_v_dx_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":70
+ * yp = (y - y_bins[y_i]) * dy_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ * ym = (y_bins[y_i+1] - y) * dy_inv # <<<<<<<<<<<<<<
* output[i] = table[x_i , y_i ] * (xm*ym) \
* + table[x_i+1, y_i ] * (xp*ym) \
*/
- __pyx_t_14 = (__pyx_v_y_i + 1);
- if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_0_y_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_14, __pyx_bstride_0_y_bins)));
- __pyx_t_15 = (__pyx_v_y_i + 1);
- if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_y_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_15, __pyx_bstride_0_y_bins)));
- __pyx_t_16 = __pyx_v_y_i;
- if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_y_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_16, __pyx_bstride_0_y_bins)));
- __pyx_v_ym = ((__pyx_3 - __pyx_v_y) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":67
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
+ __pyx_t_13 = (__pyx_v_y_i + 1);
+ if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_y_bins;
+ __pyx_v_ym = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_13, __pyx_bstride_0_y_bins)) - __pyx_v_y) * __pyx_v_dy_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":71
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ * ym = (y_bins[y_i+1] - y) * dy_inv
* output[i] = table[x_i , y_i ] * (xm*ym) \ # <<<<<<<<<<<<<<
* + table[x_i+1, y_i ] * (xp*ym) \
* + table[x_i , y_i+1] * (xm*yp) \
*/
- __pyx_t_17 = __pyx_v_x_i;
- __pyx_t_18 = __pyx_v_y_i;
- if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_0_table;
- if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_1_table;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided2d(__pyx_bstruct_table.buf, __pyx_t_17, __pyx_bstride_0_table, __pyx_t_18, __pyx_bstride_1_table)));
+ __pyx_t_14 = __pyx_v_x_i;
+ __pyx_t_15 = __pyx_v_y_i;
+ if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_0_table;
+ if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_1_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":68
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":72
+ * ym = (y_bins[y_i+1] - y) * dy_inv
* output[i] = table[x_i , y_i ] * (xm*ym) \
* + table[x_i+1, y_i ] * (xp*ym) \ # <<<<<<<<<<<<<<
* + table[x_i , y_i+1] * (xm*yp) \
* + table[x_i+1, y_i+1] * (xp*yp)
*/
- __pyx_t_19 = (__pyx_v_x_i + 1);
- __pyx_t_20 = __pyx_v_y_i;
- if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_0_table;
- if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_1_table;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided2d(__pyx_bstruct_table.buf, __pyx_t_19, __pyx_bstride_0_table, __pyx_t_20, __pyx_bstride_1_table)));
+ __pyx_t_16 = (__pyx_v_x_i + 1);
+ __pyx_t_17 = __pyx_v_y_i;
+ if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_table;
+ if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_1_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":69
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":73
* output[i] = table[x_i , y_i ] * (xm*ym) \
* + table[x_i+1, y_i ] * (xp*ym) \
* + table[x_i , y_i+1] * (xm*yp) \ # <<<<<<<<<<<<<<
* + table[x_i+1, y_i+1] * (xp*yp)
*
*/
- __pyx_t_21 = __pyx_v_x_i;
- __pyx_t_22 = (__pyx_v_y_i + 1);
- if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_0_table;
- if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_1_table;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided2d(__pyx_bstruct_table.buf, __pyx_t_21, __pyx_bstride_0_table, __pyx_t_22, __pyx_bstride_1_table)));
+ __pyx_t_18 = __pyx_v_x_i;
+ __pyx_t_19 = (__pyx_v_y_i + 1);
+ if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_0_table;
+ if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_1_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":70
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":74
* + table[x_i+1, y_i ] * (xp*ym) \
* + table[x_i , y_i+1] * (xm*yp) \
* + table[x_i+1, y_i+1] * (xp*yp) # <<<<<<<<<<<<<<
*
* @cython.boundscheck(False)
*/
- __pyx_t_23 = (__pyx_v_x_i + 1);
- __pyx_t_24 = (__pyx_v_y_i + 1);
- if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_0_table;
- if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_1_table;
- __pyx_6 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided2d(__pyx_bstruct_table.buf, __pyx_t_23, __pyx_bstride_0_table, __pyx_t_24, __pyx_bstride_1_table)));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":67
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
+ __pyx_t_20 = (__pyx_v_x_i + 1);
+ __pyx_t_21 = (__pyx_v_y_i + 1);
+ if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_0_table;
+ if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_1_table;
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":71
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ * ym = (y_bins[y_i+1] - y) * dy_inv
* output[i] = table[x_i , y_i ] * (xm*ym) \ # <<<<<<<<<<<<<<
* + table[x_i+1, y_i ] * (xp*ym) \
* + table[x_i , y_i+1] * (xm*yp) \
*/
- __pyx_t_25 = __pyx_v_i;
- if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_0_output;
- *((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_output.buf, __pyx_t_25, __pyx_bstride_0_output)) = ((((__pyx_3 * (__pyx_v_xm * __pyx_v_ym)) + (__pyx_4 * (__pyx_v_xp * __pyx_v_ym))) + (__pyx_5 * (__pyx_v_xm * __pyx_v_yp))) + (__pyx_6 * (__pyx_v_xp * __pyx_v_yp)));
+ __pyx_t_22 = __pyx_v_i;
+ if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_0_output;
+ *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_output.buf, __pyx_t_22, __pyx_bstride_0_output) = (((((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_14, __pyx_bstride_0_table, __pyx_t_15, __pyx_bstride_1_table)) * (__pyx_v_xm * __pyx_v_ym)) + ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_16, __pyx_bstride_0_table, __pyx_t_17, __pyx_bstride_1_table)) * (__pyx_v_xp * __pyx_v_ym))) + ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_18, __pyx_bstride_0_table, __pyx_t_19, __pyx_bstride_1_table)) * (__pyx_v_xm * __pyx_v_yp))) + ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_20, __pyx_bstride_0_table, __pyx_t_21, __pyx_bstride_1_table)) * (__pyx_v_xp * __pyx_v_yp)));
}
- __pyx_r = Py_None; Py_INCREF(Py_None);
+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);
goto __pyx_L0;
__pyx_L1_error:;
{ PyObject *__pyx_type, *__pyx_value, *__pyx_tb;
- PyErr_Fetch(&__pyx_type, &__pyx_value, &__pyx_tb);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_vals, &__pyx_bstruct_y_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_output, &__pyx_bstruct_output);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_is, &__pyx_bstruct_y_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_bins, &__pyx_bstruct_y_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_table, &__pyx_bstruct_table);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins);
- PyErr_Restore(__pyx_type, __pyx_value, __pyx_tb);}
+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_output);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_table);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_bins);
+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}
__Pyx_AddTraceback("yt.lagos.Interpolators.BilinearlyInterpolate");
__pyx_r = NULL;
goto __pyx_L2;
__pyx_L0:;
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_vals, &__pyx_bstruct_y_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_output, &__pyx_bstruct_output);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_is, &__pyx_bstruct_y_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_bins, &__pyx_bstruct_y_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_table, &__pyx_bstruct_table);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_output);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_table);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_bins);
__pyx_L2:;
+ __Pyx_XGIVEREF(__pyx_r);
+ __Pyx_FinishRefcountContext();
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":73
+/* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":77
*
* @cython.boundscheck(False)
* def TrilinearlyInterpolate(np.ndarray[np.float64_t, ndim=3] table, # <<<<<<<<<<<<<<
@@ -910,6 +1595,9 @@
double __pyx_v_z;
double __pyx_v_zp;
double __pyx_v_zm;
+ double __pyx_v_dx_inv;
+ double __pyx_v_dy_inv;
+ double __pyx_v_dz_inv;
int __pyx_v_i;
int __pyx_v_x_i;
int __pyx_v_y_i;
@@ -951,17 +1639,7 @@
Py_buffer __pyx_bstruct_z_vals;
Py_ssize_t __pyx_bstride_0_z_vals = 0;
Py_ssize_t __pyx_bshape_0_z_vals = 0;
- PyObject *__pyx_r;
- npy_intp __pyx_1;
- __pyx_t_5numpy_int_t __pyx_2;
- __pyx_t_5numpy_float64_t __pyx_3;
- __pyx_t_5numpy_float64_t __pyx_4;
- __pyx_t_5numpy_float64_t __pyx_5;
- __pyx_t_5numpy_float64_t __pyx_6;
- __pyx_t_5numpy_float64_t __pyx_7;
- __pyx_t_5numpy_float64_t __pyx_8;
- __pyx_t_5numpy_float64_t __pyx_9;
- __pyx_t_5numpy_float64_t __pyx_10;
+ PyObject *__pyx_r = NULL;
int __pyx_t_1;
int __pyx_t_2;
int __pyx_t_3;
@@ -971,49 +1649,145 @@
int __pyx_t_7;
long __pyx_t_8;
int __pyx_t_9;
- int __pyx_t_10;
- long __pyx_t_11;
- int __pyx_t_12;
+ long __pyx_t_10;
+ int __pyx_t_11;
+ long __pyx_t_12;
int __pyx_t_13;
- long __pyx_t_14;
+ int __pyx_t_14;
int __pyx_t_15;
- long __pyx_t_16;
+ int __pyx_t_16;
long __pyx_t_17;
- int __pyx_t_18;
+ long __pyx_t_18;
long __pyx_t_19;
- long __pyx_t_20;
+ int __pyx_t_20;
int __pyx_t_21;
- long __pyx_t_22;
+ int __pyx_t_22;
long __pyx_t_23;
int __pyx_t_24;
int __pyx_t_25;
int __pyx_t_26;
- int __pyx_t_27;
- long __pyx_t_28;
+ long __pyx_t_27;
+ int __pyx_t_28;
int __pyx_t_29;
int __pyx_t_30;
- int __pyx_t_31;
+ long __pyx_t_31;
long __pyx_t_32;
int __pyx_t_33;
- int __pyx_t_34;
+ long __pyx_t_34;
int __pyx_t_35;
long __pyx_t_36;
long __pyx_t_37;
- int __pyx_t_38;
+ long __pyx_t_38;
long __pyx_t_39;
int __pyx_t_40;
long __pyx_t_41;
long __pyx_t_42;
long __pyx_t_43;
- long __pyx_t_44;
- int __pyx_t_45;
- long __pyx_t_46;
- long __pyx_t_47;
- long __pyx_t_48;
- int __pyx_t_49;
- static char *__pyx_argnames[] = {"table","x_vals","y_vals","z_vals","x_bins","y_bins","z_bins","x_is","y_is","z_is","output",0};
+ int __pyx_t_44;
+ static PyObject **__pyx_pyargnames[] = {&__pyx_kp_table,&__pyx_kp_x_vals,&__pyx_kp_y_vals,&__pyx_kp_z_vals,&__pyx_kp_x_bins,&__pyx_kp_y_bins,&__pyx_kp_z_bins,&__pyx_kp_x_is,&__pyx_kp_y_is,&__pyx_kp_z_is,&__pyx_kp_output,0};
+ __Pyx_SetupRefcountContext("TrilinearlyInterpolate");
__pyx_self = __pyx_self;
- if (likely(!__pyx_kwds) && likely(PyTuple_GET_SIZE(__pyx_args) == 11)) {
+ if (unlikely(__pyx_kwds)) {
+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+ PyObject* values[11] = {0,0,0,0,0,0,0,0,0,0,0};
+ switch (PyTuple_GET_SIZE(__pyx_args)) {
+ case 11: values[10] = PyTuple_GET_ITEM(__pyx_args, 10);
+ case 10: values[9] = PyTuple_GET_ITEM(__pyx_args, 9);
+ case 9: values[8] = PyTuple_GET_ITEM(__pyx_args, 8);
+ case 8: values[7] = PyTuple_GET_ITEM(__pyx_args, 7);
+ case 7: values[6] = PyTuple_GET_ITEM(__pyx_args, 6);
+ case 6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
+ case 5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
+ case 4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
+ case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
+ 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_kp_table);
+ if (likely(values[0])) kw_args--;
+ else goto __pyx_L5_argtuple_error;
+ case 1:
+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_vals);
+ if (likely(values[1])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 2:
+ values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_y_vals);
+ if (likely(values[2])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 3:
+ values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_z_vals);
+ if (likely(values[3])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 4:
+ values[4] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_bins);
+ if (likely(values[4])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 4); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 5:
+ values[5] = PyDict_GetItem(__pyx_kwds, __pyx_kp_y_bins);
+ if (likely(values[5])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 5); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 6:
+ values[6] = PyDict_GetItem(__pyx_kwds, __pyx_kp_z_bins);
+ if (likely(values[6])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 6); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 7:
+ values[7] = PyDict_GetItem(__pyx_kwds, __pyx_kp_x_is);
+ if (likely(values[7])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 7); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 8:
+ values[8] = PyDict_GetItem(__pyx_kwds, __pyx_kp_y_is);
+ if (likely(values[8])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 8); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 9:
+ values[9] = PyDict_GetItem(__pyx_kwds, __pyx_kp_z_is);
+ if (likely(values[9])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 9); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ case 10:
+ values[10] = PyDict_GetItem(__pyx_kwds, __pyx_kp_output);
+ if (likely(values[10])) kw_args--;
+ else {
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, 10); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ }
+ if (unlikely(kw_args > 0)) {
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "TrilinearlyInterpolate") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+ }
+ __pyx_v_table = ((PyArrayObject *)values[0]);
+ __pyx_v_x_vals = ((PyArrayObject *)values[1]);
+ __pyx_v_y_vals = ((PyArrayObject *)values[2]);
+ __pyx_v_z_vals = ((PyArrayObject *)values[3]);
+ __pyx_v_x_bins = ((PyArrayObject *)values[4]);
+ __pyx_v_y_bins = ((PyArrayObject *)values[5]);
+ __pyx_v_z_bins = ((PyArrayObject *)values[6]);
+ __pyx_v_x_is = ((PyArrayObject *)values[7]);
+ __pyx_v_y_is = ((PyArrayObject *)values[8]);
+ __pyx_v_z_is = ((PyArrayObject *)values[9]);
+ __pyx_v_output = ((PyArrayObject *)values[10]);
+ } else if (PyTuple_GET_SIZE(__pyx_args) != 11) {
+ goto __pyx_L5_argtuple_error;
+ } else {
__pyx_v_table = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
__pyx_v_x_vals = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
__pyx_v_y_vals = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2));
@@ -1026,507 +1800,732 @@
__pyx_v_z_is = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 9));
__pyx_v_output = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 10));
}
- else {
- if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OOOOOOOOOOO", __pyx_argnames, &__pyx_v_table, &__pyx_v_x_vals, &__pyx_v_y_vals, &__pyx_v_z_vals, &__pyx_v_x_bins, &__pyx_v_y_bins, &__pyx_v_z_bins, &__pyx_v_x_is, &__pyx_v_y_is, &__pyx_v_z_is, &__pyx_v_output))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
- }
- goto __pyx_L4;
+ goto __pyx_L4_argument_unpacking_done;
+ __pyx_L5_argtuple_error:;
+ __Pyx_RaiseArgtupleInvalid("TrilinearlyInterpolate", 1, 11, 11, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
__pyx_L3_error:;
__Pyx_AddTraceback("yt.lagos.Interpolators.TrilinearlyInterpolate");
return NULL;
- __pyx_L4:;
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_table), __pyx_ptype_5numpy_ndarray, 1, "table", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_vals), __pyx_ptype_5numpy_ndarray, 1, "x_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_vals), __pyx_ptype_5numpy_ndarray, 1, "y_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_z_vals), __pyx_ptype_5numpy_ndarray, 1, "z_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_bins), __pyx_ptype_5numpy_ndarray, 1, "x_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_bins), __pyx_ptype_5numpy_ndarray, 1, "y_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_z_bins), __pyx_ptype_5numpy_ndarray, 1, "z_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_is), __pyx_ptype_5numpy_ndarray, 1, "x_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_is), __pyx_ptype_5numpy_ndarray, 1, "y_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_z_is), __pyx_ptype_5numpy_ndarray, 1, "z_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_output), __pyx_ptype_5numpy_ndarray, 1, "output", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_table, &__pyx_bstruct_table, PyBUF_FORMAT| PyBUF_STRIDES, 3) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_L4_argument_unpacking_done:;
+ __pyx_bstruct_table.buf = NULL;
+ __pyx_bstruct_x_vals.buf = NULL;
+ __pyx_bstruct_y_vals.buf = NULL;
+ __pyx_bstruct_z_vals.buf = NULL;
+ __pyx_bstruct_x_bins.buf = NULL;
+ __pyx_bstruct_y_bins.buf = NULL;
+ __pyx_bstruct_z_bins.buf = NULL;
+ __pyx_bstruct_x_is.buf = NULL;
+ __pyx_bstruct_y_is.buf = NULL;
+ __pyx_bstruct_z_is.buf = NULL;
+ __pyx_bstruct_output.buf = NULL;
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_table), __pyx_ptype_5numpy_ndarray, 1, "table", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_vals), __pyx_ptype_5numpy_ndarray, 1, "x_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_vals), __pyx_ptype_5numpy_ndarray, 1, "y_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_z_vals), __pyx_ptype_5numpy_ndarray, 1, "z_vals", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_bins), __pyx_ptype_5numpy_ndarray, 1, "x_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_bins), __pyx_ptype_5numpy_ndarray, 1, "y_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_z_bins), __pyx_ptype_5numpy_ndarray, 1, "z_bins", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x_is), __pyx_ptype_5numpy_ndarray, 1, "x_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y_is), __pyx_ptype_5numpy_ndarray, 1, "y_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_z_is), __pyx_ptype_5numpy_ndarray, 1, "z_is", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_output), __pyx_ptype_5numpy_ndarray, 1, "output", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_table, (PyObject*)__pyx_v_table, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 3, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_table = __pyx_bstruct_table.strides[0]; __pyx_bstride_1_table = __pyx_bstruct_table.strides[1]; __pyx_bstride_2_table = __pyx_bstruct_table.strides[2];
__pyx_bshape_0_table = __pyx_bstruct_table.shape[0]; __pyx_bshape_1_table = __pyx_bstruct_table.shape[1]; __pyx_bshape_2_table = __pyx_bstruct_table.shape[2];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_vals, (PyObject*)__pyx_v_x_vals, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_vals = __pyx_bstruct_x_vals.strides[0];
__pyx_bshape_0_x_vals = __pyx_bstruct_x_vals.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_y_vals, &__pyx_bstruct_y_vals, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_y_vals, (PyObject*)__pyx_v_y_vals, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_y_vals = __pyx_bstruct_y_vals.strides[0];
__pyx_bshape_0_y_vals = __pyx_bstruct_y_vals.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_z_vals, &__pyx_bstruct_z_vals, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_z_vals, (PyObject*)__pyx_v_z_vals, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_z_vals = __pyx_bstruct_z_vals.strides[0];
__pyx_bshape_0_z_vals = __pyx_bstruct_z_vals.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_bins, (PyObject*)__pyx_v_x_bins, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_bins = __pyx_bstruct_x_bins.strides[0];
__pyx_bshape_0_x_bins = __pyx_bstruct_x_bins.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_y_bins, &__pyx_bstruct_y_bins, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_y_bins, (PyObject*)__pyx_v_y_bins, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_y_bins = __pyx_bstruct_y_bins.strides[0];
__pyx_bshape_0_y_bins = __pyx_bstruct_y_bins.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_z_bins, &__pyx_bstruct_z_bins, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_z_bins, (PyObject*)__pyx_v_z_bins, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_z_bins = __pyx_bstruct_z_bins.strides[0];
__pyx_bshape_0_z_bins = __pyx_bstruct_z_bins.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_int_t((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x_is, (PyObject*)__pyx_v_x_is, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_x_is = __pyx_bstruct_x_is.strides[0];
__pyx_bshape_0_x_is = __pyx_bstruct_x_is.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_int_t((PyObject*)__pyx_v_y_is, &__pyx_bstruct_y_is, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_y_is, (PyObject*)__pyx_v_y_is, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_y_is = __pyx_bstruct_y_is.strides[0];
__pyx_bshape_0_y_is = __pyx_bstruct_y_is.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_int_t((PyObject*)__pyx_v_z_is, &__pyx_bstruct_z_is, PyBUF_FORMAT| PyBUF_STRIDES, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_z_is, (PyObject*)__pyx_v_z_is, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_z_is = __pyx_bstruct_z_is.strides[0];
__pyx_bshape_0_z_is = __pyx_bstruct_z_is.shape[0];
- if (unlikely(__Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t((PyObject*)__pyx_v_output, &__pyx_bstruct_output, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ {
+ __Pyx_BufFmt_StackElem __pyx_stack[1];
+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_output, (PyObject*)__pyx_v_output, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
__pyx_bstride_0_output = __pyx_bstruct_output.strides[0];
__pyx_bshape_0_output = __pyx_bstruct_output.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":88
- * cdef double z, zp, zm
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":93
+ * cdef double dx_inv, dy_inv, dz_inv
* cdef int i, x_i, y_i, z_i
* for i in range(x_vals.shape[0]): # <<<<<<<<<<<<<<
* x_i = x_is[i]
* y_i = y_is[i]
*/
- __pyx_1 = (__pyx_v_x_vals->dimensions[0]);
- for (__pyx_v_i = 0; __pyx_v_i < __pyx_1; __pyx_v_i+=1) {
+ for (__pyx_t_1 = 0; __pyx_t_1 < (__pyx_v_x_vals->dimensions[0]); __pyx_t_1+=1) {
+ __pyx_v_i = __pyx_t_1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":89
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":94
* cdef int i, x_i, y_i, z_i
* for i in range(x_vals.shape[0]):
* x_i = x_is[i] # <<<<<<<<<<<<<<
* y_i = y_is[i]
* z_i = z_is[i]
*/
- __pyx_t_1 = __pyx_v_i;
- if (__pyx_t_1 < 0) __pyx_t_1 += __pyx_bshape_0_x_is;
- __pyx_2 = *((__pyx_t_5numpy_int_t *)((__pyx_t_5numpy_int_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_is.buf, __pyx_t_1, __pyx_bstride_0_x_is)));
- __pyx_v_x_i = __pyx_2;
+ __pyx_t_2 = __pyx_v_i;
+ if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_x_is;
+ __pyx_v_x_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_x_is.buf, __pyx_t_2, __pyx_bstride_0_x_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":90
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":95
* for i in range(x_vals.shape[0]):
* x_i = x_is[i]
* y_i = y_is[i] # <<<<<<<<<<<<<<
* z_i = z_is[i]
* x = x_vals[i]
*/
- __pyx_t_2 = __pyx_v_i;
- if (__pyx_t_2 < 0) __pyx_t_2 += __pyx_bshape_0_y_is;
- __pyx_2 = *((__pyx_t_5numpy_int_t *)((__pyx_t_5numpy_int_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_is.buf, __pyx_t_2, __pyx_bstride_0_y_is)));
- __pyx_v_y_i = __pyx_2;
+ __pyx_t_3 = __pyx_v_i;
+ if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_y_is;
+ __pyx_v_y_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_y_is.buf, __pyx_t_3, __pyx_bstride_0_y_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":91
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":96
* x_i = x_is[i]
* y_i = y_is[i]
* z_i = z_is[i] # <<<<<<<<<<<<<<
* x = x_vals[i]
* y = y_vals[i]
*/
- __pyx_t_3 = __pyx_v_i;
- if (__pyx_t_3 < 0) __pyx_t_3 += __pyx_bshape_0_z_is;
- __pyx_2 = *((__pyx_t_5numpy_int_t *)((__pyx_t_5numpy_int_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_is.buf, __pyx_t_3, __pyx_bstride_0_z_is)));
- __pyx_v_z_i = __pyx_2;
+ __pyx_t_4 = __pyx_v_i;
+ if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_z_is;
+ __pyx_v_z_i = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_z_is.buf, __pyx_t_4, __pyx_bstride_0_z_is));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":92
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":97
* y_i = y_is[i]
* z_i = z_is[i]
* x = x_vals[i] # <<<<<<<<<<<<<<
* y = y_vals[i]
* z = z_vals[i]
*/
- __pyx_t_4 = __pyx_v_i;
- if (__pyx_t_4 < 0) __pyx_t_4 += __pyx_bshape_0_x_vals;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_vals.buf, __pyx_t_4, __pyx_bstride_0_x_vals)));
- __pyx_v_x = __pyx_3;
+ __pyx_t_5 = __pyx_v_i;
+ if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_x_vals;
+ __pyx_v_x = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_vals.buf, __pyx_t_5, __pyx_bstride_0_x_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":93
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":98
* z_i = z_is[i]
* x = x_vals[i]
* y = y_vals[i] # <<<<<<<<<<<<<<
* z = z_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
*/
- __pyx_t_5 = __pyx_v_i;
- if (__pyx_t_5 < 0) __pyx_t_5 += __pyx_bshape_0_y_vals;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_vals.buf, __pyx_t_5, __pyx_bstride_0_y_vals)));
- __pyx_v_y = __pyx_3;
+ __pyx_t_6 = __pyx_v_i;
+ if (__pyx_t_6 < 0) __pyx_t_6 += __pyx_bshape_0_y_vals;
+ __pyx_v_y = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_vals.buf, __pyx_t_6, __pyx_bstride_0_y_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":94
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":99
* x = x_vals[i]
* y = y_vals[i]
* z = z_vals[i] # <<<<<<<<<<<<<<
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
*/
- __pyx_t_6 = __pyx_v_i;
- if (__pyx_t_6 < 0) __pyx_t_6 += __pyx_bshape_0_z_vals;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_vals.buf, __pyx_t_6, __pyx_bstride_0_z_vals)));
- __pyx_v_z = __pyx_3;
+ __pyx_t_7 = __pyx_v_i;
+ if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_z_vals;
+ __pyx_v_z = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_vals.buf, __pyx_t_7, __pyx_bstride_0_z_vals));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":95
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":100
* y = y_vals[i]
* z = z_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- * zp = (z - z_bins[z_i]) / (z_bins[z_i+1] - z_bins[z_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ * dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i])
*/
- __pyx_t_7 = __pyx_v_x_i;
- if (__pyx_t_7 < 0) __pyx_t_7 += __pyx_bshape_0_x_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_7, __pyx_bstride_0_x_bins)));
__pyx_t_8 = (__pyx_v_x_i + 1);
if (__pyx_t_8 < 0) __pyx_t_8 += __pyx_bshape_0_x_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_8, __pyx_bstride_0_x_bins)));
__pyx_t_9 = __pyx_v_x_i;
if (__pyx_t_9 < 0) __pyx_t_9 += __pyx_bshape_0_x_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_9, __pyx_bstride_0_x_bins)));
- __pyx_v_xp = ((__pyx_v_x - __pyx_3) / (__pyx_4 - __pyx_5));
+ __pyx_v_dx_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_8, __pyx_bstride_0_x_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_9, __pyx_bstride_0_x_bins))));
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":96
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":101
* z = z_vals[i]
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
- * zp = (z - z_bins[z_i]) / (z_bins[z_i+1] - z_bins[z_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
+ * dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i])
+ * xp = (x - x_bins[x_i]) * dx_inv
*/
- __pyx_t_10 = __pyx_v_y_i;
+ __pyx_t_10 = (__pyx_v_y_i + 1);
if (__pyx_t_10 < 0) __pyx_t_10 += __pyx_bshape_0_y_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_10, __pyx_bstride_0_y_bins)));
- __pyx_t_11 = (__pyx_v_y_i + 1);
+ __pyx_t_11 = __pyx_v_y_i;
if (__pyx_t_11 < 0) __pyx_t_11 += __pyx_bshape_0_y_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_11, __pyx_bstride_0_y_bins)));
- __pyx_t_12 = __pyx_v_y_i;
- if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_0_y_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_12, __pyx_bstride_0_y_bins)));
- __pyx_v_yp = ((__pyx_v_y - __pyx_3) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":97
- * xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- * zp = (z - z_bins[z_i]) / (z_bins[z_i+1] - z_bins[z_i]) # <<<<<<<<<<<<<<
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
+ __pyx_v_dy_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_10, __pyx_bstride_0_y_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_11, __pyx_bstride_0_y_bins))));
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":102
+ * dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ * dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i]) # <<<<<<<<<<<<<<
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * yp = (y - y_bins[y_i]) * dy_inv
*/
+ __pyx_t_12 = (__pyx_v_z_i + 1);
+ if (__pyx_t_12 < 0) __pyx_t_12 += __pyx_bshape_0_z_bins;
__pyx_t_13 = __pyx_v_z_i;
if (__pyx_t_13 < 0) __pyx_t_13 += __pyx_bshape_0_z_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_bins.buf, __pyx_t_13, __pyx_bstride_0_z_bins)));
- __pyx_t_14 = (__pyx_v_z_i + 1);
- if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_0_z_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_bins.buf, __pyx_t_14, __pyx_bstride_0_z_bins)));
- __pyx_t_15 = __pyx_v_z_i;
- if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_z_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_bins.buf, __pyx_t_15, __pyx_bstride_0_z_bins)));
- __pyx_v_zp = ((__pyx_v_z - __pyx_3) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":98
- * yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- * zp = (z - z_bins[z_i]) / (z_bins[z_i+1] - z_bins[z_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i]) # <<<<<<<<<<<<<<
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
- * zm = (z_bins[z_i+1] - z) / (z_bins[z_i+1] - z_bins[z_i])
+ __pyx_v_dz_inv = (1.0 / ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_12, __pyx_bstride_0_z_bins)) - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_13, __pyx_bstride_0_z_bins))));
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":103
+ * dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ * dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i])
+ * xp = (x - x_bins[x_i]) * dx_inv # <<<<<<<<<<<<<<
+ * yp = (y - y_bins[y_i]) * dy_inv
+ * zp = (z - z_bins[z_i]) * dz_inv
+ */
+ __pyx_t_14 = __pyx_v_x_i;
+ if (__pyx_t_14 < 0) __pyx_t_14 += __pyx_bshape_0_x_bins;
+ __pyx_v_xp = ((__pyx_v_x - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_14, __pyx_bstride_0_x_bins))) * __pyx_v_dx_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":104
+ * dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i])
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * yp = (y - y_bins[y_i]) * dy_inv # <<<<<<<<<<<<<<
+ * zp = (z - z_bins[z_i]) * dz_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ */
+ __pyx_t_15 = __pyx_v_y_i;
+ if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_y_bins;
+ __pyx_v_yp = ((__pyx_v_y - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_15, __pyx_bstride_0_y_bins))) * __pyx_v_dy_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":105
+ * xp = (x - x_bins[x_i]) * dx_inv
+ * yp = (y - y_bins[y_i]) * dy_inv
+ * zp = (z - z_bins[z_i]) * dz_inv # <<<<<<<<<<<<<<
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ * ym = (y_bins[y_i+1] - y) * dy_inv
+ */
+ __pyx_t_16 = __pyx_v_z_i;
+ if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_z_bins;
+ __pyx_v_zp = ((__pyx_v_z - (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_16, __pyx_bstride_0_z_bins))) * __pyx_v_dz_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":106
+ * yp = (y - y_bins[y_i]) * dy_inv
+ * zp = (z - z_bins[z_i]) * dz_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv # <<<<<<<<<<<<<<
+ * ym = (y_bins[y_i+1] - y) * dy_inv
+ * zm = (z_bins[z_i+1] - z) * dz_inv
*/
- __pyx_t_16 = (__pyx_v_x_i + 1);
- if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_0_x_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_16, __pyx_bstride_0_x_bins)));
__pyx_t_17 = (__pyx_v_x_i + 1);
if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_0_x_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_17, __pyx_bstride_0_x_bins)));
- __pyx_t_18 = __pyx_v_x_i;
- if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_0_x_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_x_bins.buf, __pyx_t_18, __pyx_bstride_0_x_bins)));
- __pyx_v_xm = ((__pyx_3 - __pyx_v_x) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":99
- * zp = (z - z_bins[z_i]) / (z_bins[z_i+1] - z_bins[z_i])
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i]) # <<<<<<<<<<<<<<
- * zm = (z_bins[z_i+1] - z) / (z_bins[z_i+1] - z_bins[z_i])
+ __pyx_v_xm = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_x_bins.buf, __pyx_t_17, __pyx_bstride_0_x_bins)) - __pyx_v_x) * __pyx_v_dx_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":107
+ * zp = (z - z_bins[z_i]) * dz_inv
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ * ym = (y_bins[y_i+1] - y) * dy_inv # <<<<<<<<<<<<<<
+ * zm = (z_bins[z_i+1] - z) * dz_inv
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \
*/
- __pyx_t_19 = (__pyx_v_y_i + 1);
- if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_0_y_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_19, __pyx_bstride_0_y_bins)));
- __pyx_t_20 = (__pyx_v_y_i + 1);
- if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_0_y_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_20, __pyx_bstride_0_y_bins)));
- __pyx_t_21 = __pyx_v_y_i;
- if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_0_y_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_y_bins.buf, __pyx_t_21, __pyx_bstride_0_y_bins)));
- __pyx_v_ym = ((__pyx_3 - __pyx_v_y) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":100
- * xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
- * zm = (z_bins[z_i+1] - z) / (z_bins[z_i+1] - z_bins[z_i]) # <<<<<<<<<<<<<<
+ __pyx_t_18 = (__pyx_v_y_i + 1);
+ if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_0_y_bins;
+ __pyx_v_ym = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_y_bins.buf, __pyx_t_18, __pyx_bstride_0_y_bins)) - __pyx_v_y) * __pyx_v_dy_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":108
+ * xm = (x_bins[x_i+1] - x) * dx_inv
+ * ym = (y_bins[y_i+1] - y) * dy_inv
+ * zm = (z_bins[z_i+1] - z) * dz_inv # <<<<<<<<<<<<<<
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
*/
- __pyx_t_22 = (__pyx_v_z_i + 1);
- if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_0_z_bins;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_bins.buf, __pyx_t_22, __pyx_bstride_0_z_bins)));
- __pyx_t_23 = (__pyx_v_z_i + 1);
- if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_0_z_bins;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_bins.buf, __pyx_t_23, __pyx_bstride_0_z_bins)));
- __pyx_t_24 = __pyx_v_z_i;
- if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_0_z_bins;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_z_bins.buf, __pyx_t_24, __pyx_bstride_0_z_bins)));
- __pyx_v_zm = ((__pyx_3 - __pyx_v_z) / (__pyx_4 - __pyx_5));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":101
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
- * zm = (z_bins[z_i+1] - z) / (z_bins[z_i+1] - z_bins[z_i])
+ __pyx_t_19 = (__pyx_v_z_i + 1);
+ if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_0_z_bins;
+ __pyx_v_zm = (((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_z_bins.buf, __pyx_t_19, __pyx_bstride_0_z_bins)) - __pyx_v_z) * __pyx_v_dz_inv);
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":109
+ * ym = (y_bins[y_i+1] - y) * dy_inv
+ * zm = (z_bins[z_i+1] - z) * dz_inv
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \ # <<<<<<<<<<<<<<
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
*/
- __pyx_t_25 = __pyx_v_x_i;
- __pyx_t_26 = __pyx_v_y_i;
- __pyx_t_27 = __pyx_v_z_i;
- if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_0_table;
- if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_1_table;
- if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_2_table;
- __pyx_3 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_25, __pyx_bstride_0_table, __pyx_t_26, __pyx_bstride_1_table, __pyx_t_27, __pyx_bstride_2_table)));
+ __pyx_t_20 = __pyx_v_x_i;
+ __pyx_t_21 = __pyx_v_y_i;
+ __pyx_t_22 = __pyx_v_z_i;
+ if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_0_table;
+ if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_1_table;
+ if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":102
- * zm = (z_bins[z_i+1] - z) / (z_bins[z_i+1] - z_bins[z_i])
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":110
+ * zm = (z_bins[z_i+1] - z) * dz_inv
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \ # <<<<<<<<<<<<<<
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \
*/
- __pyx_t_28 = (__pyx_v_x_i + 1);
- __pyx_t_29 = __pyx_v_y_i;
- __pyx_t_30 = __pyx_v_z_i;
- if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_0_table;
- if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_1_table;
- if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_2_table;
- __pyx_4 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_28, __pyx_bstride_0_table, __pyx_t_29, __pyx_bstride_1_table, __pyx_t_30, __pyx_bstride_2_table)));
+ __pyx_t_23 = (__pyx_v_x_i + 1);
+ __pyx_t_24 = __pyx_v_y_i;
+ __pyx_t_25 = __pyx_v_z_i;
+ if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_0_table;
+ if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_1_table;
+ if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":103
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":111
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \ # <<<<<<<<<<<<<<
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \
*/
- __pyx_t_31 = __pyx_v_x_i;
- __pyx_t_32 = (__pyx_v_y_i + 1);
- __pyx_t_33 = __pyx_v_z_i;
- if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_0_table;
- if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_1_table;
- if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_2_table;
- __pyx_5 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_31, __pyx_bstride_0_table, __pyx_t_32, __pyx_bstride_1_table, __pyx_t_33, __pyx_bstride_2_table)));
+ __pyx_t_26 = __pyx_v_x_i;
+ __pyx_t_27 = (__pyx_v_y_i + 1);
+ __pyx_t_28 = __pyx_v_z_i;
+ if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_0_table;
+ if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_1_table;
+ if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":104
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":112
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \ # <<<<<<<<<<<<<<
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \
*/
- __pyx_t_34 = __pyx_v_x_i;
- __pyx_t_35 = __pyx_v_y_i;
- __pyx_t_36 = (__pyx_v_z_i + 1);
- if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_0_table;
- if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_1_table;
- if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_2_table;
- __pyx_6 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_34, __pyx_bstride_0_table, __pyx_t_35, __pyx_bstride_1_table, __pyx_t_36, __pyx_bstride_2_table)));
+ __pyx_t_29 = __pyx_v_x_i;
+ __pyx_t_30 = __pyx_v_y_i;
+ __pyx_t_31 = (__pyx_v_z_i + 1);
+ if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_0_table;
+ if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_1_table;
+ if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":105
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":113
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \ # <<<<<<<<<<<<<<
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \
* + table[x_i+1,y_i+1,z_i ] * (xp*yp*zm) \
*/
- __pyx_t_37 = (__pyx_v_x_i + 1);
- __pyx_t_38 = __pyx_v_y_i;
- __pyx_t_39 = (__pyx_v_z_i + 1);
- if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_0_table;
- if (__pyx_t_38 < 0) __pyx_t_38 += __pyx_bshape_1_table;
- if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_2_table;
- __pyx_7 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_37, __pyx_bstride_0_table, __pyx_t_38, __pyx_bstride_1_table, __pyx_t_39, __pyx_bstride_2_table)));
+ __pyx_t_32 = (__pyx_v_x_i + 1);
+ __pyx_t_33 = __pyx_v_y_i;
+ __pyx_t_34 = (__pyx_v_z_i + 1);
+ if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_0_table;
+ if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_1_table;
+ if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":106
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":114
* + table[x_i ,y_i ,z_i+1] * (xm*ym*zp) \
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \ # <<<<<<<<<<<<<<
* + table[x_i+1,y_i+1,z_i ] * (xp*yp*zm) \
* + table[x_i+1,y_i+1,z_i+1] * (xp*yp*zp)
*/
- __pyx_t_40 = __pyx_v_x_i;
- __pyx_t_41 = (__pyx_v_y_i + 1);
- __pyx_t_42 = (__pyx_v_z_i + 1);
- if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_0_table;
- if (__pyx_t_41 < 0) __pyx_t_41 += __pyx_bshape_1_table;
- if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_2_table;
- __pyx_8 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_40, __pyx_bstride_0_table, __pyx_t_41, __pyx_bstride_1_table, __pyx_t_42, __pyx_bstride_2_table)));
+ __pyx_t_35 = __pyx_v_x_i;
+ __pyx_t_36 = (__pyx_v_y_i + 1);
+ __pyx_t_37 = (__pyx_v_z_i + 1);
+ if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_0_table;
+ if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_1_table;
+ if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":107
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":115
* + table[x_i+1,y_i ,z_i+1] * (xp*ym*zp) \
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \
* + table[x_i+1,y_i+1,z_i ] * (xp*yp*zm) \ # <<<<<<<<<<<<<<
* + table[x_i+1,y_i+1,z_i+1] * (xp*yp*zp)
*/
- __pyx_t_43 = (__pyx_v_x_i + 1);
- __pyx_t_44 = (__pyx_v_y_i + 1);
- __pyx_t_45 = __pyx_v_z_i;
- if (__pyx_t_43 < 0) __pyx_t_43 += __pyx_bshape_0_table;
- if (__pyx_t_44 < 0) __pyx_t_44 += __pyx_bshape_1_table;
- if (__pyx_t_45 < 0) __pyx_t_45 += __pyx_bshape_2_table;
- __pyx_9 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_43, __pyx_bstride_0_table, __pyx_t_44, __pyx_bstride_1_table, __pyx_t_45, __pyx_bstride_2_table)));
+ __pyx_t_38 = (__pyx_v_x_i + 1);
+ __pyx_t_39 = (__pyx_v_y_i + 1);
+ __pyx_t_40 = __pyx_v_z_i;
+ if (__pyx_t_38 < 0) __pyx_t_38 += __pyx_bshape_0_table;
+ if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_1_table;
+ if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_2_table;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":108
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":116
* + table[x_i ,y_i+1,z_i+1] * (xm*yp*zp) \
* + table[x_i+1,y_i+1,z_i ] * (xp*yp*zm) \
* + table[x_i+1,y_i+1,z_i+1] * (xp*yp*zp) # <<<<<<<<<<<<<<
*/
- __pyx_t_46 = (__pyx_v_x_i + 1);
- __pyx_t_47 = (__pyx_v_y_i + 1);
- __pyx_t_48 = (__pyx_v_z_i + 1);
- if (__pyx_t_46 < 0) __pyx_t_46 += __pyx_bshape_0_table;
- if (__pyx_t_47 < 0) __pyx_t_47 += __pyx_bshape_1_table;
- if (__pyx_t_48 < 0) __pyx_t_48 += __pyx_bshape_2_table;
- __pyx_10 = *((__pyx_t_5numpy_float64_t *)((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided3d(__pyx_bstruct_table.buf, __pyx_t_46, __pyx_bstride_0_table, __pyx_t_47, __pyx_bstride_1_table, __pyx_t_48, __pyx_bstride_2_table)));
-
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":101
- * ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
- * zm = (z_bins[z_i+1] - z) / (z_bins[z_i+1] - z_bins[z_i])
+ __pyx_t_41 = (__pyx_v_x_i + 1);
+ __pyx_t_42 = (__pyx_v_y_i + 1);
+ __pyx_t_43 = (__pyx_v_z_i + 1);
+ if (__pyx_t_41 < 0) __pyx_t_41 += __pyx_bshape_0_table;
+ if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_1_table;
+ if (__pyx_t_43 < 0) __pyx_t_43 += __pyx_bshape_2_table;
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":109
+ * ym = (y_bins[y_i+1] - y) * dy_inv
+ * zm = (z_bins[z_i+1] - z) * dz_inv
* output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \ # <<<<<<<<<<<<<<
* + table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
* + table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
*/
- __pyx_t_49 = __pyx_v_i;
- if (__pyx_t_49 < 0) __pyx_t_49 += __pyx_bshape_0_output;
- *((__pyx_t_5numpy_float64_t *)__Pyx_BufPtrStrided1d(__pyx_bstruct_output.buf, __pyx_t_49, __pyx_bstride_0_output)) = ((((((((__pyx_3 * ((__pyx_v_xm * __pyx_v_ym) * __pyx_v_zm)) + (__pyx_4 * ((__pyx_v_xp * __pyx_v_ym) * __pyx_v_zm))) + (__pyx_5 * ((__pyx_v_xm * __pyx_v_yp) * __pyx_v_zm))) + (__pyx_6 * ((__pyx_v_xm * __pyx_v_ym) * __pyx_v_zp))) + (__pyx_7 * ((__pyx_v_xp * __pyx_v_ym) * __pyx_v_zp))) + (__pyx_8 * ((__pyx_v_xm * __pyx_v_yp) * __pyx_v_zp))) + (__pyx_9 * ((__pyx_v_xp * __pyx_v_yp) * __pyx_v_zm))) + (__pyx_10 * ((__pyx_v_xp * __pyx_v_yp) * __pyx_v_zp)));
+ __pyx_t_44 = __pyx_v_i;
+ if (__pyx_t_44 < 0) __pyx_t_44 += __pyx_bshape_0_output;
+ *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_output.buf, __pyx_t_44, __pyx_bstride_0_output) = (((((((((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_20, __pyx_bstride_0_table, __pyx_t_21, __pyx_bstride_1_table, __pyx_t_22, __pyx_bstride_2_table)) * ((__pyx_v_xm * __pyx_v_ym) * __pyx_v_zm)) + ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_23, __pyx_bstride_0_table, __pyx_t_24, __pyx_bstride_1_table, __pyx_t_25, __pyx_bstride_2_table)) * ((__pyx_v_xp * __pyx_v_ym) * __pyx_v_zm))) + ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_26, __pyx_bstride_0_table, __pyx_t_27, __pyx_bstride_1_table, __pyx_t_28, __pyx_bstride_2_table)) * ((__pyx_v_xm * __pyx_v_yp) * __pyx_v_zm))) + ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_29, __pyx_bstride_0_table, __pyx_t_30, __pyx_bstride_1_table, __pyx_t_31, __pyx_bstride_2_table)) * ((__pyx_v_xm * __pyx_v_ym) * __pyx_v_zp))) + ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_32, __pyx_bstride_0_table, __pyx_t_33, __pyx_bstride_1_table, __pyx_t_34, __pyx_bstride_2_table)) * ((__pyx_v_xp * __pyx_v_ym) * __pyx_v_zp))) + ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_35, __pyx_bstride_0_table, __pyx_t_36, __pyx_bstride_1_table, __pyx_t_37, __pyx_bstride_2_table)) * ((__pyx_v_xm * __pyx_v_yp) * __pyx_v_zp))) + ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_38, __pyx_bstride_0_table, __pyx_t_39, __pyx_bstride_1_table, __pyx_t_40, __pyx_bstride_2_table)) * ((__pyx_v_xp * __pyx_v_yp) * __pyx_v_zm))) + ((*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_float64_t *, __pyx_bstruct_table.buf, __pyx_t_41, __pyx_bstride_0_table, __pyx_t_42, __pyx_bstride_1_table, __pyx_t_43, __pyx_bstride_2_table)) * ((__pyx_v_xp * __pyx_v_yp) * __pyx_v_zp)));
}
- __pyx_r = Py_None; Py_INCREF(Py_None);
+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);
goto __pyx_L0;
__pyx_L1_error:;
{ PyObject *__pyx_type, *__pyx_value, *__pyx_tb;
- PyErr_Fetch(&__pyx_type, &__pyx_value, &__pyx_tb);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_z_is, &__pyx_bstruct_z_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_is, &__pyx_bstruct_y_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_bins, &__pyx_bstruct_y_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_z_bins, &__pyx_bstruct_z_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_output, &__pyx_bstruct_output);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_table, &__pyx_bstruct_table);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_vals, &__pyx_bstruct_y_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_z_vals, &__pyx_bstruct_z_vals);
- PyErr_Restore(__pyx_type, __pyx_value, __pyx_tb);}
+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_z_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_z_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_output);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_table);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_z_vals);
+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}
__Pyx_AddTraceback("yt.lagos.Interpolators.TrilinearlyInterpolate");
__pyx_r = NULL;
goto __pyx_L2;
__pyx_L0:;
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_z_is, &__pyx_bstruct_z_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_vals, &__pyx_bstruct_x_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_is, &__pyx_bstruct_y_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_bins, &__pyx_bstruct_y_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_z_bins, &__pyx_bstruct_z_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_is, &__pyx_bstruct_x_is);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_output, &__pyx_bstruct_output);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_table, &__pyx_bstruct_table);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_x_bins, &__pyx_bstruct_x_bins);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_y_vals, &__pyx_bstruct_y_vals);
- __Pyx_SafeReleaseBuffer((PyObject*)__pyx_v_z_vals, &__pyx_bstruct_z_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_z_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_z_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_is);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_output);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_table);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x_bins);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_y_vals);
+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_z_vals);
__pyx_L2:;
+ __Pyx_XGIVEREF(__pyx_r);
+ __Pyx_FinishRefcountContext();
return __pyx_r;
}
-/* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":36
+/* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":65
* # experimental exception made for __getbuffer__ and __releasebuffer__
* # -- the details of this may change.
* def __getbuffer__(ndarray self, Py_buffer* info, int flags): # <<<<<<<<<<<<<<
* # This implementation of getbuffer is geared towards Cython
- * # requirements, and does not yet fullfill the PEP (specifically,
+ * # requirements, and does not yet fullfill the PEP.
*/
static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags); /*proto*/
static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags) {
+ int __pyx_v_copy_shape;
+ int __pyx_v_i;
+ int __pyx_v_ndim;
+ int __pyx_v_endian_detector;
+ int __pyx_v_little_endian;
int __pyx_v_t;
char *__pyx_v_f;
+ PyArray_Descr *__pyx_v_descr = 0;
+ int __pyx_v_offset;
+ int __pyx_v_hasfields;
int __pyx_r;
- int __pyx_1;
- PyObject *__pyx_2 = 0;
- PyObject *__pyx_3 = 0;
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":42
- * # so the flags are not even checked).
+ int __pyx_t_1;
+ PyObject *__pyx_t_2 = NULL;
+ PyObject *__pyx_t_3 = NULL;
+ int __pyx_t_4;
+ int __pyx_t_5;
+ int __pyx_t_6;
+ char *__pyx_t_7;
+ __Pyx_SetupRefcountContext("__getbuffer__");
+ if (__pyx_v_info == NULL) return 0;
+ __pyx_v_info->obj = Py_None; __Pyx_INCREF(Py_None);
+ __Pyx_GIVEREF(__pyx_v_info->obj);
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":71
+ * # of flags
+ * cdef int copy_shape, i, ndim
+ * cdef int endian_detector = 1 # <<<<<<<<<<<<<<
+ * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0)
*
- * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<<
- * raise RuntimeError("Py_intptr_t and Py_ssize_t differs in size, numpy.pxd does not support this")
+ */
+ __pyx_v_endian_detector = 1;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":72
+ * cdef int copy_shape, i, ndim
+ * cdef int endian_detector = 1
+ * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0) # <<<<<<<<<<<<<<
*
+ * ndim = PyArray_NDIM(self)
*/
- __pyx_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t)));
- if (__pyx_1) {
+ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0);
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":43
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":74
+ * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0)
+ *
+ * ndim = PyArray_NDIM(self) # <<<<<<<<<<<<<<
*
* if sizeof(npy_intp) != sizeof(Py_ssize_t):
- * raise RuntimeError("Py_intptr_t and Py_ssize_t differs in size, numpy.pxd does not support this") # <<<<<<<<<<<<<<
+ */
+ __pyx_v_ndim = PyArray_NDIM(((PyArrayObject *)__pyx_v_self));
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":76
+ * ndim = PyArray_NDIM(self)
*
- * info.buf = PyArray_DATA(self)
+ * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<<
+ * copy_shape = 1
+ * else:
+ */
+ __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t)));
+ if (__pyx_t_1) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":77
+ *
+ * if sizeof(npy_intp) != sizeof(Py_ssize_t):
+ * copy_shape = 1 # <<<<<<<<<<<<<<
+ * else:
+ * copy_shape = 0
*/
- __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- Py_INCREF(__pyx_kp_1);
- PyTuple_SET_ITEM(__pyx_2, 0, __pyx_kp_1);
- __pyx_3 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- Py_DECREF(((PyObject *)__pyx_2)); __pyx_2 = 0;
- __Pyx_Raise(__pyx_3, 0, 0);
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_v_copy_shape = 1;
goto __pyx_L5;
}
+ /*else*/ {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":79
+ * copy_shape = 1
+ * else:
+ * copy_shape = 0 # <<<<<<<<<<<<<<
+ *
+ * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS)
+ */
+ __pyx_v_copy_shape = 0;
+ }
__pyx_L5:;
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":45
- * raise RuntimeError("Py_intptr_t and Py_ssize_t differs in size, numpy.pxd does not support this")
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":81
+ * copy_shape = 0
+ *
+ * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) # <<<<<<<<<<<<<<
+ * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)):
+ * raise ValueError("ndarray is not C contiguous")
+ */
+ if (((__pyx_v_flags & PyBUF_C_CONTIGUOUS) == PyBUF_C_CONTIGUOUS)) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":82
+ *
+ * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS)
+ * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)): # <<<<<<<<<<<<<<
+ * raise ValueError("ndarray is not C contiguous")
+ *
+ */
+ __pyx_t_1 = (!PyArray_CHKFLAGS(((PyArrayObject *)__pyx_v_self), NPY_C_CONTIGUOUS));
+ } else {
+ __pyx_t_1 = ((__pyx_v_flags & PyBUF_C_CONTIGUOUS) == PyBUF_C_CONTIGUOUS);
+ }
+ if (__pyx_t_1) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":83
+ * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS)
+ * and not PyArray_CHKFLAGS(self, NPY_C_CONTIGUOUS)):
+ * raise ValueError("ndarray is not C contiguous") # <<<<<<<<<<<<<<
+ *
+ * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS)
+ */
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+ __Pyx_INCREF(__pyx_kp_1);
+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_1);
+ __Pyx_GIVEREF(__pyx_kp_1);
+ __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_3);
+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+ __Pyx_Raise(__pyx_t_3, 0, 0);
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ goto __pyx_L6;
+ }
+ __pyx_L6:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":85
+ * raise ValueError("ndarray is not C contiguous")
+ *
+ * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) # <<<<<<<<<<<<<<
+ * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)):
+ * raise ValueError("ndarray is not Fortran contiguous")
+ */
+ if (((__pyx_v_flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS)) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":86
+ *
+ * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS)
+ * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)): # <<<<<<<<<<<<<<
+ * raise ValueError("ndarray is not Fortran contiguous")
+ *
+ */
+ __pyx_t_1 = (!PyArray_CHKFLAGS(((PyArrayObject *)__pyx_v_self), NPY_F_CONTIGUOUS));
+ } else {
+ __pyx_t_1 = ((__pyx_v_flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS);
+ }
+ if (__pyx_t_1) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":87
+ * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS)
+ * and not PyArray_CHKFLAGS(self, NPY_F_CONTIGUOUS)):
+ * raise ValueError("ndarray is not Fortran contiguous") # <<<<<<<<<<<<<<
+ *
+ * info.buf = PyArray_DATA(self)
+ */
+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+ __Pyx_INCREF(__pyx_kp_2);
+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_2);
+ __Pyx_GIVEREF(__pyx_kp_2);
+ __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+ __Pyx_Raise(__pyx_t_2, 0, 0);
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ goto __pyx_L7;
+ }
+ __pyx_L7:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":89
+ * raise ValueError("ndarray is not Fortran contiguous")
*
* info.buf = PyArray_DATA(self) # <<<<<<<<<<<<<<
- * info.ndim = PyArray_NDIM(self)
- * info.strides = <Py_ssize_t*>PyArray_STRIDES(self)
+ * info.ndim = ndim
+ * if copy_shape:
*/
__pyx_v_info->buf = PyArray_DATA(((PyArrayObject *)__pyx_v_self));
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":46
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":90
*
* info.buf = PyArray_DATA(self)
- * info.ndim = PyArray_NDIM(self) # <<<<<<<<<<<<<<
- * info.strides = <Py_ssize_t*>PyArray_STRIDES(self)
- * info.shape = <Py_ssize_t*>PyArray_DIMS(self)
+ * info.ndim = ndim # <<<<<<<<<<<<<<
+ * if copy_shape:
+ * # Allocate new buffer for strides and shape info. This is allocated
*/
- __pyx_v_info->ndim = PyArray_NDIM(((PyArrayObject *)__pyx_v_self));
+ __pyx_v_info->ndim = __pyx_v_ndim;
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":47
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":91
* info.buf = PyArray_DATA(self)
- * info.ndim = PyArray_NDIM(self)
- * info.strides = <Py_ssize_t*>PyArray_STRIDES(self) # <<<<<<<<<<<<<<
- * info.shape = <Py_ssize_t*>PyArray_DIMS(self)
+ * info.ndim = ndim
+ * if copy_shape: # <<<<<<<<<<<<<<
+ * # Allocate new buffer for strides and shape info. This is allocated
+ * # as one block, strides first.
+ */
+ __pyx_t_4 = __pyx_v_copy_shape;
+ if (__pyx_t_4) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":94
+ * # Allocate new buffer for strides and shape info. This is allocated
+ * # as one block, strides first.
+ * info.strides = <Py_ssize_t*>stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2) # <<<<<<<<<<<<<<
+ * info.shape = info.strides + ndim
+ * for i in range(ndim):
+ */
+ __pyx_v_info->strides = ((Py_ssize_t *)malloc((((sizeof(Py_ssize_t)) * __pyx_v_ndim) * 2)));
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":95
+ * # as one block, strides first.
+ * info.strides = <Py_ssize_t*>stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2)
+ * info.shape = info.strides + ndim # <<<<<<<<<<<<<<
+ * for i in range(ndim):
+ * info.strides[i] = PyArray_STRIDES(self)[i]
+ */
+ __pyx_v_info->shape = (__pyx_v_info->strides + __pyx_v_ndim);
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":96
+ * info.strides = <Py_ssize_t*>stdlib.malloc(sizeof(Py_ssize_t) * ndim * 2)
+ * info.shape = info.strides + ndim
+ * for i in range(ndim): # <<<<<<<<<<<<<<
+ * info.strides[i] = PyArray_STRIDES(self)[i]
+ * info.shape[i] = PyArray_DIMS(self)[i]
+ */
+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_v_ndim; __pyx_t_4+=1) {
+ __pyx_v_i = __pyx_t_4;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":97
+ * info.shape = info.strides + ndim
+ * for i in range(ndim):
+ * info.strides[i] = PyArray_STRIDES(self)[i] # <<<<<<<<<<<<<<
+ * info.shape[i] = PyArray_DIMS(self)[i]
+ * else:
+ */
+ (__pyx_v_info->strides[__pyx_v_i]) = (PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))[__pyx_v_i]);
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":98
+ * for i in range(ndim):
+ * info.strides[i] = PyArray_STRIDES(self)[i]
+ * info.shape[i] = PyArray_DIMS(self)[i] # <<<<<<<<<<<<<<
+ * else:
+ * info.strides = <Py_ssize_t*>PyArray_STRIDES(self)
+ */
+ (__pyx_v_info->shape[__pyx_v_i]) = (PyArray_DIMS(((PyArrayObject *)__pyx_v_self))[__pyx_v_i]);
+ }
+ goto __pyx_L8;
+ }
+ /*else*/ {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":100
+ * info.shape[i] = PyArray_DIMS(self)[i]
+ * else:
+ * info.strides = <Py_ssize_t*>PyArray_STRIDES(self) # <<<<<<<<<<<<<<
+ * info.shape = <Py_ssize_t*>PyArray_DIMS(self)
* info.suboffsets = NULL
*/
- __pyx_v_info->strides = ((Py_ssize_t *)PyArray_STRIDES(((PyArrayObject *)__pyx_v_self)));
+ __pyx_v_info->strides = ((Py_ssize_t *)PyArray_STRIDES(((PyArrayObject *)__pyx_v_self)));
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":48
- * info.ndim = PyArray_NDIM(self)
- * info.strides = <Py_ssize_t*>PyArray_STRIDES(self)
- * info.shape = <Py_ssize_t*>PyArray_DIMS(self) # <<<<<<<<<<<<<<
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":101
+ * else:
+ * info.strides = <Py_ssize_t*>PyArray_STRIDES(self)
+ * info.shape = <Py_ssize_t*>PyArray_DIMS(self) # <<<<<<<<<<<<<<
* info.suboffsets = NULL
* info.itemsize = PyArray_ITEMSIZE(self)
*/
- __pyx_v_info->shape = ((Py_ssize_t *)PyArray_DIMS(((PyArrayObject *)__pyx_v_self)));
+ __pyx_v_info->shape = ((Py_ssize_t *)PyArray_DIMS(((PyArrayObject *)__pyx_v_self)));
+ }
+ __pyx_L8:;
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":49
- * info.strides = <Py_ssize_t*>PyArray_STRIDES(self)
- * info.shape = <Py_ssize_t*>PyArray_DIMS(self)
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":102
+ * info.strides = <Py_ssize_t*>PyArray_STRIDES(self)
+ * info.shape = <Py_ssize_t*>PyArray_DIMS(self)
* info.suboffsets = NULL # <<<<<<<<<<<<<<
* info.itemsize = PyArray_ITEMSIZE(self)
* info.readonly = not PyArray_ISWRITEABLE(self)
*/
__pyx_v_info->suboffsets = NULL;
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":50
- * info.shape = <Py_ssize_t*>PyArray_DIMS(self)
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":103
+ * info.shape = <Py_ssize_t*>PyArray_DIMS(self)
* info.suboffsets = NULL
* info.itemsize = PyArray_ITEMSIZE(self) # <<<<<<<<<<<<<<
* info.readonly = not PyArray_ISWRITEABLE(self)
@@ -1534,492 +2533,1964 @@
*/
__pyx_v_info->itemsize = PyArray_ITEMSIZE(((PyArrayObject *)__pyx_v_self));
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":51
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":104
* info.suboffsets = NULL
* info.itemsize = PyArray_ITEMSIZE(self)
* info.readonly = not PyArray_ISWRITEABLE(self) # <<<<<<<<<<<<<<
*
- * # Formats that are not tested and working in Cython are not
+ * cdef int t
*/
__pyx_v_info->readonly = (!PyArray_ISWRITEABLE(((PyArrayObject *)__pyx_v_self)));
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":55
- * # Formats that are not tested and working in Cython are not
- * # made available from this pxd file yet.
- * cdef int t = PyArray_TYPE(self) # <<<<<<<<<<<<<<
- * cdef char* f = NULL
- * if t == NPY_BYTE: f = "b"
- */
- __pyx_v_t = PyArray_TYPE(((PyArrayObject *)__pyx_v_self));
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":56
- * # made available from this pxd file yet.
- * cdef int t = PyArray_TYPE(self)
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":107
+ *
+ * cdef int t
* cdef char* f = NULL # <<<<<<<<<<<<<<
- * if t == NPY_BYTE: f = "b"
- * elif t == NPY_UBYTE: f = "B"
+ * cdef dtype descr = self.descr
+ * cdef list stack
*/
__pyx_v_f = NULL;
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":57
- * cdef int t = PyArray_TYPE(self)
- * cdef char* f = NULL
- * if t == NPY_BYTE: f = "b" # <<<<<<<<<<<<<<
- * elif t == NPY_UBYTE: f = "B"
- * elif t == NPY_SHORT: f = "h"
- */
- switch (__pyx_v_t) {
- case NPY_BYTE:
- __pyx_v_f = __pyx_k_2;
- break;
- case NPY_UBYTE:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":58
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":108
+ * cdef int t
* cdef char* f = NULL
- * if t == NPY_BYTE: f = "b"
- * elif t == NPY_UBYTE: f = "B" # <<<<<<<<<<<<<<
- * elif t == NPY_SHORT: f = "h"
- * elif t == NPY_USHORT: f = "H"
- */
- __pyx_v_f = __pyx_k_3;
- break;
- case NPY_SHORT:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":59
- * if t == NPY_BYTE: f = "b"
- * elif t == NPY_UBYTE: f = "B"
- * elif t == NPY_SHORT: f = "h" # <<<<<<<<<<<<<<
- * elif t == NPY_USHORT: f = "H"
- * elif t == NPY_INT: f = "i"
- */
- __pyx_v_f = __pyx_k_4;
- break;
- case NPY_USHORT:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":60
- * elif t == NPY_UBYTE: f = "B"
- * elif t == NPY_SHORT: f = "h"
- * elif t == NPY_USHORT: f = "H" # <<<<<<<<<<<<<<
- * elif t == NPY_INT: f = "i"
- * elif t == NPY_UINT: f = "I"
- */
- __pyx_v_f = __pyx_k_5;
- break;
- case NPY_INT:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":61
- * elif t == NPY_SHORT: f = "h"
- * elif t == NPY_USHORT: f = "H"
- * elif t == NPY_INT: f = "i" # <<<<<<<<<<<<<<
- * elif t == NPY_UINT: f = "I"
- * elif t == NPY_LONG: f = "l"
- */
- __pyx_v_f = __pyx_k_6;
- break;
- case NPY_UINT:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":62
- * elif t == NPY_USHORT: f = "H"
- * elif t == NPY_INT: f = "i"
- * elif t == NPY_UINT: f = "I" # <<<<<<<<<<<<<<
- * elif t == NPY_LONG: f = "l"
- * elif t == NPY_ULONG: f = "L"
- */
- __pyx_v_f = __pyx_k_7;
- break;
- case NPY_LONG:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":63
- * elif t == NPY_INT: f = "i"
- * elif t == NPY_UINT: f = "I"
- * elif t == NPY_LONG: f = "l" # <<<<<<<<<<<<<<
- * elif t == NPY_ULONG: f = "L"
- * elif t == NPY_LONGLONG: f = "q"
- */
- __pyx_v_f = __pyx_k_8;
- break;
- case NPY_ULONG:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":64
- * elif t == NPY_UINT: f = "I"
- * elif t == NPY_LONG: f = "l"
- * elif t == NPY_ULONG: f = "L" # <<<<<<<<<<<<<<
- * elif t == NPY_LONGLONG: f = "q"
- * elif t == NPY_ULONGLONG: f = "Q"
- */
- __pyx_v_f = __pyx_k_9;
- break;
- case NPY_LONGLONG:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":65
- * elif t == NPY_LONG: f = "l"
- * elif t == NPY_ULONG: f = "L"
- * elif t == NPY_LONGLONG: f = "q" # <<<<<<<<<<<<<<
- * elif t == NPY_ULONGLONG: f = "Q"
- * elif t == NPY_FLOAT: f = "f"
- */
- __pyx_v_f = __pyx_k_10;
- break;
- case NPY_ULONGLONG:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":66
- * elif t == NPY_ULONG: f = "L"
- * elif t == NPY_LONGLONG: f = "q"
- * elif t == NPY_ULONGLONG: f = "Q" # <<<<<<<<<<<<<<
- * elif t == NPY_FLOAT: f = "f"
- * elif t == NPY_DOUBLE: f = "d"
- */
- __pyx_v_f = __pyx_k_11;
- break;
- case NPY_FLOAT:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":67
- * elif t == NPY_LONGLONG: f = "q"
- * elif t == NPY_ULONGLONG: f = "Q"
- * elif t == NPY_FLOAT: f = "f" # <<<<<<<<<<<<<<
- * elif t == NPY_DOUBLE: f = "d"
- * elif t == NPY_LONGDOUBLE: f = "g"
- */
- __pyx_v_f = __pyx_k_12;
- break;
- case NPY_DOUBLE:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":68
- * elif t == NPY_ULONGLONG: f = "Q"
- * elif t == NPY_FLOAT: f = "f"
- * elif t == NPY_DOUBLE: f = "d" # <<<<<<<<<<<<<<
- * elif t == NPY_LONGDOUBLE: f = "g"
- * elif t == NPY_OBJECT: f = "O"
- */
- __pyx_v_f = __pyx_k_13;
- break;
- case NPY_LONGDOUBLE:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":69
- * elif t == NPY_FLOAT: f = "f"
- * elif t == NPY_DOUBLE: f = "d"
- * elif t == NPY_LONGDOUBLE: f = "g" # <<<<<<<<<<<<<<
- * elif t == NPY_OBJECT: f = "O"
- *
- */
- __pyx_v_f = __pyx_k_14;
- break;
- case NPY_OBJECT:
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":70
- * elif t == NPY_DOUBLE: f = "d"
- * elif t == NPY_LONGDOUBLE: f = "g"
- * elif t == NPY_OBJECT: f = "O" # <<<<<<<<<<<<<<
- *
- * if f == NULL:
- */
- __pyx_v_f = __pyx_k_15;
- break;
- }
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":72
- * elif t == NPY_OBJECT: f = "O"
- *
- * if f == NULL: # <<<<<<<<<<<<<<
- * raise ValueError("only objects, int and float dtypes supported for ndarray buffer access so far (dtype is %d)" % t)
- * info.format = f
- */
- __pyx_1 = (__pyx_v_f == NULL);
- if (__pyx_1) {
-
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":73
- *
- * if f == NULL:
- * raise ValueError("only objects, int and float dtypes supported for ndarray buffer access so far (dtype is %d)" % t) # <<<<<<<<<<<<<<
- * info.format = f
- *
- */
- __pyx_2 = PyInt_FromLong(__pyx_v_t); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __pyx_3 = PyNumber_Remainder(__pyx_kp_16, __pyx_2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3);
- __pyx_3 = 0;
- __pyx_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_2), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- Py_DECREF(((PyObject *)__pyx_2)); __pyx_2 = 0;
- __Pyx_Raise(__pyx_3, 0, 0);
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- goto __pyx_L6;
- }
- __pyx_L6:;
+ * cdef dtype descr = self.descr # <<<<<<<<<<<<<<
+ * cdef list stack
+ * cdef int offset
+ */
+ __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_self)->descr));
+ __pyx_v_descr = ((PyArrayObject *)__pyx_v_self)->descr;
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":74
- * if f == NULL:
- * raise ValueError("only objects, int and float dtypes supported for ndarray buffer access so far (dtype is %d)" % t)
- * info.format = f # <<<<<<<<<<<<<<
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":112
+ * cdef int offset
*
+ * cdef bint hasfields = PyDataType_HASFIELDS(descr) # <<<<<<<<<<<<<<
*
+ * if not hasfields and not copy_shape:
*/
- __pyx_v_info->format = __pyx_v_f;
+ __pyx_v_hasfields = PyDataType_HASFIELDS(__pyx_v_descr);
- __pyx_r = 0;
- goto __pyx_L0;
- __pyx_L1_error:;
- Py_XDECREF(__pyx_2);
- Py_XDECREF(__pyx_3);
- __Pyx_AddTraceback("numpy.ndarray.__getbuffer__");
- __pyx_r = -1;
- __pyx_L0:;
- return __pyx_r;
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":114
+ * cdef bint hasfields = PyDataType_HASFIELDS(descr)
+ *
+ * if not hasfields and not copy_shape: # <<<<<<<<<<<<<<
+ * # do not call releasebuffer
+ * info.obj = None
+ */
+ if ((!__pyx_v_hasfields)) {
+ __pyx_t_1 = (!__pyx_v_copy_shape);
+ } else {
+ __pyx_t_1 = (!__pyx_v_hasfields);
+ }
+ if (__pyx_t_1) {
-static struct PyMethodDef __pyx_methods[] = {
- {"UnilinearlyInterpolate", (PyCFunction)__pyx_pf_2yt_5lagos_13Interpolators_UnilinearlyInterpolate, METH_VARARGS|METH_KEYWORDS, 0},
- {"BilinearlyInterpolate", (PyCFunction)__pyx_pf_2yt_5lagos_13Interpolators_BilinearlyInterpolate, METH_VARARGS|METH_KEYWORDS, 0},
- {"TrilinearlyInterpolate", (PyCFunction)__pyx_pf_2yt_5lagos_13Interpolators_TrilinearlyInterpolate, METH_VARARGS|METH_KEYWORDS, 0},
- {0, 0, 0, 0}
-};
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":116
+ * if not hasfields and not copy_shape:
+ * # do not call releasebuffer
+ * info.obj = None # <<<<<<<<<<<<<<
+ * else:
+ * # need to call releasebuffer
+ */
+ __Pyx_INCREF(Py_None);
+ __Pyx_GIVEREF(Py_None);
+ __Pyx_GOTREF(__pyx_v_info->obj);
+ __Pyx_DECREF(__pyx_v_info->obj);
+ __pyx_v_info->obj = Py_None;
+ goto __pyx_L11;
+ }
+ /*else*/ {
-static void __pyx_init_filenames(void); /*proto*/
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":119
+ * else:
+ * # need to call releasebuffer
+ * info.obj = self # <<<<<<<<<<<<<<
+ *
+ * if not hasfields:
+ */
+ __Pyx_INCREF(__pyx_v_self);
+ __Pyx_GIVEREF(__pyx_v_self);
+ __Pyx_GOTREF(__pyx_v_info->obj);
+ __Pyx_DECREF(__pyx_v_info->obj);
+ __pyx_v_info->obj = __pyx_v_self;
+ }
+ __pyx_L11:;
-#if PY_MAJOR_VERSION >= 3
-static struct PyModuleDef __pyx_moduledef = {
- PyModuleDef_HEAD_INIT,
- "Interpolators",
- __pyx_mdoc, /* m_doc */
- -1, /* m_size */
- __pyx_methods /* m_methods */,
- NULL, /* m_reload */
- NULL, /* m_traverse */
- NULL, /* m_clear */
- NULL /* m_free */
-};
-#endif
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":121
+ * info.obj = self
+ *
+ * if not hasfields: # <<<<<<<<<<<<<<
+ * t = descr.type_num
+ * if ((descr.byteorder == '>' and little_endian) or
+ */
+ __pyx_t_1 = (!__pyx_v_hasfields);
+ if (__pyx_t_1) {
-static __Pyx_StringTabEntry __pyx_string_tab[] = {
- {&__pyx_kp_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 1, 1, 1},
- {&__pyx_kp_np, __pyx_k_np, sizeof(__pyx_k_np), 0, 1, 1},
- {&__pyx_kp___getbuffer__, __pyx_k___getbuffer__, sizeof(__pyx_k___getbuffer__), 0, 1, 1},
- {&__pyx_kp_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 1, 1, 1},
- {&__pyx_kp_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 1, 1, 1},
- {&__pyx_kp_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 0},
- {&__pyx_kp_16, __pyx_k_16, sizeof(__pyx_k_16), 0, 0, 0},
- {0, 0, 0, 0, 0, 0}
-};
-static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- return 0;
- __pyx_L1_error:;
- return -1;
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":122
+ *
+ * if not hasfields:
+ * t = descr.type_num # <<<<<<<<<<<<<<
+ * if ((descr.byteorder == '>' and little_endian) or
+ * (descr.byteorder == '<' and not little_endian)):
+ */
+ __pyx_v_t = __pyx_v_descr->type_num;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":123
+ * if not hasfields:
+ * t = descr.type_num
+ * if ((descr.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<<
+ * (descr.byteorder == '<' and not little_endian)):
+ * raise ValueError("Non-native byte order not supported")
+ */
+ if ((__pyx_v_descr->byteorder == '>')) {
+ __pyx_t_1 = __pyx_v_little_endian;
+ } else {
+ __pyx_t_1 = (__pyx_v_descr->byteorder == '>');
+ }
+ if (!__pyx_t_1) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":124
+ * t = descr.type_num
+ * if ((descr.byteorder == '>' and little_endian) or
+ * (descr.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<<
+ * raise ValueError("Non-native byte order not supported")
+ * if t == NPY_BYTE: f = "b"
+ */
+ if ((__pyx_v_descr->byteorder == '<')) {
+ __pyx_t_5 = (!__pyx_v_little_endian);
+ } else {
+ __pyx_t_5 = (__pyx_v_descr->byteorder == '<');
+ }
+ __pyx_t_6 = __pyx_t_5;
+ } else {
+ __pyx_t_6 = __pyx_t_1;
+ }
+ if (__pyx_t_6) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":125
+ * if ((descr.byteorder == '>' and little_endian) or
+ * (descr.byteorder == '<' and not little_endian)):
+ * raise ValueError("Non-native byte order not supported") # <<<<<<<<<<<<<<
+ * if t == NPY_BYTE: f = "b"
+ * elif t == NPY_UBYTE: f = "B"
+ */
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+ __Pyx_INCREF(__pyx_kp_5);
+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_5);
+ __Pyx_GIVEREF(__pyx_kp_5);
+ __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_3);
+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+ __Pyx_Raise(__pyx_t_3, 0, 0);
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ goto __pyx_L13;
+ }
+ __pyx_L13:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":126
+ * (descr.byteorder == '<' and not little_endian)):
+ * raise ValueError("Non-native byte order not supported")
+ * if t == NPY_BYTE: f = "b" # <<<<<<<<<<<<<<
+ * elif t == NPY_UBYTE: f = "B"
+ * elif t == NPY_SHORT: f = "h"
+ */
+ switch (__pyx_v_t) {
+ case NPY_BYTE:
+ __pyx_v_f = __pyx_k_6;
+ break;
-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;};
- return 0;
- __pyx_L1_error:;
- return -1;
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":127
+ * raise ValueError("Non-native byte order not supported")
+ * if t == NPY_BYTE: f = "b"
+ * elif t == NPY_UBYTE: f = "B" # <<<<<<<<<<<<<<
+ * elif t == NPY_SHORT: f = "h"
+ * elif t == NPY_USHORT: f = "H"
+ */
+ case NPY_UBYTE:
+ __pyx_v_f = __pyx_k_7;
+ break;
-#if PY_MAJOR_VERSION < 3
-PyMODINIT_FUNC initInterpolators(void); /*proto*/
-PyMODINIT_FUNC initInterpolators(void)
-#else
-PyMODINIT_FUNC PyInit_Interpolators(void); /*proto*/
-PyMODINIT_FUNC PyInit_Interpolators(void)
-#endif
-{
- PyObject *__pyx_1 = 0;
- __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;}
- /*--- Libary function declarations ---*/
- __pyx_init_filenames();
- /*--- 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;}
- /*--- Module creation code ---*/
- #if PY_MAJOR_VERSION < 3
- __pyx_m = Py_InitModule4("Interpolators", __pyx_methods, __pyx_mdoc, 0, PYTHON_API_VERSION);
- #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);
- #endif
- __pyx_b = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME);
- if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
- if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
- /*--- Builtin init code ---*/
- if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __pyx_skip_dispatch = 0;
- /*--- Global init code ---*/
- /*--- Function export code ---*/
- /*--- Type init code ---*/
- /*--- Type import code ---*/
- __pyx_ptype_5numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- /*--- Function import code ---*/
- /*--- Execution code ---*/
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":128
+ * if t == NPY_BYTE: f = "b"
+ * elif t == NPY_UBYTE: f = "B"
+ * elif t == NPY_SHORT: f = "h" # <<<<<<<<<<<<<<
+ * elif t == NPY_USHORT: f = "H"
+ * elif t == NPY_INT: f = "i"
+ */
+ case NPY_SHORT:
+ __pyx_v_f = __pyx_k_8;
+ break;
- /* "/Users/matthewturk/Development/yt/trunk/yt/lagos/Interpolators.pyx":26
- * """
- *
- * import numpy as np # <<<<<<<<<<<<<<
- * cimport numpy as np
- * cimport cython
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":129
+ * elif t == NPY_UBYTE: f = "B"
+ * elif t == NPY_SHORT: f = "h"
+ * elif t == NPY_USHORT: f = "H" # <<<<<<<<<<<<<<
+ * elif t == NPY_INT: f = "i"
+ * elif t == NPY_UINT: f = "I"
*/
- __pyx_1 = __Pyx_Import(__pyx_kp_numpy, 0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- Py_DECREF(__pyx_1); __pyx_1 = 0;
+ case NPY_USHORT:
+ __pyx_v_f = __pyx_k_9;
+ break;
- /* "/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/Cython-0.9.8.1.1-py2.5-macosx-10.3-fat.egg/Cython/Includes/numpy.pxd":36
- * # experimental exception made for __getbuffer__ and __releasebuffer__
- * # -- the details of this may change.
- * def __getbuffer__(ndarray self, Py_buffer* info, int flags): # <<<<<<<<<<<<<<
- * # This implementation of getbuffer is geared towards Cython
- * # requirements, and does not yet fullfill the PEP (specifically,
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":130
+ * elif t == NPY_SHORT: f = "h"
+ * elif t == NPY_USHORT: f = "H"
+ * elif t == NPY_INT: f = "i" # <<<<<<<<<<<<<<
+ * elif t == NPY_UINT: f = "I"
+ * elif t == NPY_LONG: f = "l"
*/
- #if PY_MAJOR_VERSION < 3
- return;
- #else
- return __pyx_m;
- #endif
- __pyx_L1_error:;
- Py_XDECREF(__pyx_1);
- __Pyx_AddTraceback("yt.lagos.Interpolators");
- #if PY_MAJOR_VERSION >= 3
- return NULL;
- #endif
-}
+ case NPY_INT:
+ __pyx_v_f = __pyx_k_10;
+ break;
-static const char *__pyx_filenames[] = {
- "Interpolators.pyx",
- "numpy.pxd",
-};
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":131
+ * elif t == NPY_USHORT: f = "H"
+ * elif t == NPY_INT: f = "i"
+ * elif t == NPY_UINT: f = "I" # <<<<<<<<<<<<<<
+ * elif t == NPY_LONG: f = "l"
+ * elif t == NPY_ULONG: f = "L"
+ */
+ case NPY_UINT:
+ __pyx_v_f = __pyx_k_11;
+ break;
-/* Runtime support code */
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":132
+ * elif t == NPY_INT: f = "i"
+ * elif t == NPY_UINT: f = "I"
+ * elif t == NPY_LONG: f = "l" # <<<<<<<<<<<<<<
+ * elif t == NPY_ULONG: f = "L"
+ * elif t == NPY_LONGLONG: f = "q"
+ */
+ case NPY_LONG:
+ __pyx_v_f = __pyx_k_12;
+ break;
-static void __pyx_init_filenames(void) {
- __pyx_f = __pyx_filenames;
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":133
+ * elif t == NPY_UINT: f = "I"
+ * elif t == NPY_LONG: f = "l"
+ * elif t == NPY_ULONG: f = "L" # <<<<<<<<<<<<<<
+ * elif t == NPY_LONGLONG: f = "q"
+ * elif t == NPY_ULONGLONG: f = "Q"
+ */
+ case NPY_ULONG:
+ __pyx_v_f = __pyx_k_13;
+ break;
-static INLINE void __Pyx_SafeReleaseBuffer(PyObject* obj, Py_buffer* info) {
- if (info->buf == NULL) return;
- if (info->suboffsets == __Pyx_minusones) info->suboffsets = NULL;
- __Pyx_ReleaseBuffer(obj, info);
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":134
+ * elif t == NPY_LONG: f = "l"
+ * elif t == NPY_ULONG: f = "L"
+ * elif t == NPY_LONGLONG: f = "q" # <<<<<<<<<<<<<<
+ * elif t == NPY_ULONGLONG: f = "Q"
+ * elif t == NPY_FLOAT: f = "f"
+ */
+ case NPY_LONGLONG:
+ __pyx_v_f = __pyx_k_14;
+ break;
-static INLINE void __Pyx_ZeroBuffer(Py_buffer* buf) {
- buf->buf = NULL;
- buf->strides = __Pyx_zeros;
- buf->shape = __Pyx_zeros;
- buf->suboffsets = __Pyx_minusones;
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":135
+ * elif t == NPY_ULONG: f = "L"
+ * elif t == NPY_LONGLONG: f = "q"
+ * elif t == NPY_ULONGLONG: f = "Q" # <<<<<<<<<<<<<<
+ * elif t == NPY_FLOAT: f = "f"
+ * elif t == NPY_DOUBLE: f = "d"
+ */
+ case NPY_ULONGLONG:
+ __pyx_v_f = __pyx_k_15;
+ break;
-static INLINE const char* __Pyx_ConsumeWhitespace(const char* ts) {
- while (1) {
- switch (*ts) {
- case 10:
- case 13:
- case ' ':
- ++ts;
- default:
- return ts;
- }
- }
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":136
+ * elif t == NPY_LONGLONG: f = "q"
+ * elif t == NPY_ULONGLONG: f = "Q"
+ * elif t == NPY_FLOAT: f = "f" # <<<<<<<<<<<<<<
+ * elif t == NPY_DOUBLE: f = "d"
+ * elif t == NPY_LONGDOUBLE: f = "g"
+ */
+ case NPY_FLOAT:
+ __pyx_v_f = __pyx_k_16;
+ break;
-static INLINE const char* __Pyx_BufferTypestringCheckEndian(const char* ts) {
- int num = 1;
- int little_endian = ((char*)&num)[0];
- int ok = 1;
- switch (*ts) {
- case '@':
- case '=':
- ++ts; break;
- case '<':
- if (little_endian) ++ts;
- else ok = 0;
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":137
+ * elif t == NPY_ULONGLONG: f = "Q"
+ * elif t == NPY_FLOAT: f = "f"
+ * elif t == NPY_DOUBLE: f = "d" # <<<<<<<<<<<<<<
+ * elif t == NPY_LONGDOUBLE: f = "g"
+ * elif t == NPY_CFLOAT: f = "Zf"
+ */
+ case NPY_DOUBLE:
+ __pyx_v_f = __pyx_k_17;
break;
- case '>':
- case '!':
- if (!little_endian) ++ts;
- else ok = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":138
+ * elif t == NPY_FLOAT: f = "f"
+ * elif t == NPY_DOUBLE: f = "d"
+ * elif t == NPY_LONGDOUBLE: f = "g" # <<<<<<<<<<<<<<
+ * elif t == NPY_CFLOAT: f = "Zf"
+ * elif t == NPY_CDOUBLE: f = "Zd"
+ */
+ case NPY_LONGDOUBLE:
+ __pyx_v_f = __pyx_k_18;
break;
- }
- if (!ok) {
- PyErr_Format(PyExc_ValueError, "Buffer has wrong endianness (rejecting on '%s')", ts);
- return NULL;
- }
- return ts;
-}
-static void __Pyx_BufferNdimError(Py_buffer* buffer, int expected_ndim) {
- PyErr_Format(PyExc_ValueError,
- "Buffer has wrong number of dimensions (expected %d, got %d)",
- expected_ndim, buffer->ndim);
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":139
+ * elif t == NPY_DOUBLE: f = "d"
+ * elif t == NPY_LONGDOUBLE: f = "g"
+ * elif t == NPY_CFLOAT: f = "Zf" # <<<<<<<<<<<<<<
+ * elif t == NPY_CDOUBLE: f = "Zd"
+ * elif t == NPY_CLONGDOUBLE: f = "Zg"
+ */
+ case NPY_CFLOAT:
+ __pyx_v_f = __pyx_k_19;
+ break;
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":140
+ * elif t == NPY_LONGDOUBLE: f = "g"
+ * elif t == NPY_CFLOAT: f = "Zf"
+ * elif t == NPY_CDOUBLE: f = "Zd" # <<<<<<<<<<<<<<
+ * elif t == NPY_CLONGDOUBLE: f = "Zg"
+ * elif t == NPY_OBJECT: f = "O"
+ */
+ case NPY_CDOUBLE:
+ __pyx_v_f = __pyx_k_20;
+ break;
-static const char* __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_float64_t(const char* ts) {
- int ok;
- if (*ts == '1') ++ts;
- switch (*ts) {
- case 'f': ok = (sizeof(__pyx_t_5numpy_float64_t) == sizeof(float) && (__pyx_t_5numpy_float64_t)-1 < 0); break;
- case 'd': ok = (sizeof(__pyx_t_5numpy_float64_t) == sizeof(double) && (__pyx_t_5numpy_float64_t)-1 < 0); break;
- case 'g': ok = (sizeof(__pyx_t_5numpy_float64_t) == sizeof(long double) && (__pyx_t_5numpy_float64_t)-1 < 0); break; default: ok = 0;
- }
- if (!ok) {
- PyErr_Format(PyExc_ValueError, "Buffer datatype mismatch (rejecting on '%s')", ts);
- return NULL;
- } else return ts + 1;
-
-}
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":141
+ * elif t == NPY_CFLOAT: f = "Zf"
+ * elif t == NPY_CDOUBLE: f = "Zd"
+ * elif t == NPY_CLONGDOUBLE: f = "Zg" # <<<<<<<<<<<<<<
+ * elif t == NPY_OBJECT: f = "O"
+ * else:
+ */
+ case NPY_CLONGDOUBLE:
+ __pyx_v_f = __pyx_k_21;
+ break;
-static int __Pyx_GetBuffer_nn___pyx_t_5numpy_float64_t(PyObject* obj, Py_buffer* buf, int flags, int nd) {
- const char* ts;
- if (obj == Py_None) {
- __Pyx_ZeroBuffer(buf);
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":142
+ * elif t == NPY_CDOUBLE: f = "Zd"
+ * elif t == NPY_CLONGDOUBLE: f = "Zg"
+ * elif t == NPY_OBJECT: f = "O" # <<<<<<<<<<<<<<
+ * else:
+ * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t)
+ */
+ case NPY_OBJECT:
+ __pyx_v_f = __pyx_k_22;
+ break;
+ default:
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":144
+ * elif t == NPY_OBJECT: f = "O"
+ * else:
+ * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<<
+ * info.format = f
+ * return
+ */
+ __pyx_t_3 = PyInt_FromLong(__pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_3);
+ __pyx_t_2 = PyNumber_Remainder(__pyx_kp_23, __pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 144; __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);
+ __pyx_t_2 = 0;
+ __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+ __Pyx_Raise(__pyx_t_2, 0, 0);
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ break;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":145
+ * else:
+ * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t)
+ * info.format = f # <<<<<<<<<<<<<<
+ * return
+ * else:
+ */
+ __pyx_v_info->format = __pyx_v_f;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":146
+ * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t)
+ * info.format = f
+ * return # <<<<<<<<<<<<<<
+ * else:
+ * info.format = <char*>stdlib.malloc(_buffer_format_string_len)
+ */
+ __pyx_r = 0;
+ goto __pyx_L0;
+ goto __pyx_L12;
+ }
+ /*else*/ {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":148
+ * return
+ * else:
+ * info.format = <char*>stdlib.malloc(_buffer_format_string_len) # <<<<<<<<<<<<<<
+ * info.format[0] = '^' # Native data types, manual alignment
+ * offset = 0
+ */
+ __pyx_v_info->format = ((char *)malloc(255));
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":149
+ * else:
+ * info.format = <char*>stdlib.malloc(_buffer_format_string_len)
+ * info.format[0] = '^' # Native data types, manual alignment # <<<<<<<<<<<<<<
+ * offset = 0
+ * f = _util_dtypestring(descr, info.format + 1,
+ */
+ (__pyx_v_info->format[0]) = '^';
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":150
+ * info.format = <char*>stdlib.malloc(_buffer_format_string_len)
+ * info.format[0] = '^' # Native data types, manual alignment
+ * offset = 0 # <<<<<<<<<<<<<<
+ * f = _util_dtypestring(descr, info.format + 1,
+ * info.format + _buffer_format_string_len,
+ */
+ __pyx_v_offset = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":153
+ * f = _util_dtypestring(descr, info.format + 1,
+ * info.format + _buffer_format_string_len,
+ * &offset) # <<<<<<<<<<<<<<
+ * f[0] = 0 # Terminate format string
+ *
+ */
+ __pyx_t_7 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_v_f = __pyx_t_7;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":154
+ * info.format + _buffer_format_string_len,
+ * &offset)
+ * f[0] = 0 # Terminate format string # <<<<<<<<<<<<<<
+ *
+ * def __releasebuffer__(ndarray self, Py_buffer* info):
+ */
+ (__pyx_v_f[0]) = 0;
+ }
+ __pyx_L12:;
+
+ __pyx_r = 0;
+ goto __pyx_L0;
+ __pyx_L1_error:;
+ __Pyx_XDECREF(__pyx_t_2);
+ __Pyx_XDECREF(__pyx_t_3);
+ __Pyx_AddTraceback("numpy.ndarray.__getbuffer__");
+ __pyx_r = -1;
+ __Pyx_GOTREF(__pyx_v_info->obj);
+ __Pyx_DECREF(__pyx_v_info->obj); __pyx_v_info->obj = NULL;
+ goto __pyx_L2;
+ __pyx_L0:;
+ if (__pyx_v_info->obj == Py_None) {
+ __Pyx_GOTREF(Py_None);
+ __Pyx_DECREF(Py_None); __pyx_v_info->obj = NULL;
+ }
+ __pyx_L2:;
+ __Pyx_XDECREF((PyObject *)__pyx_v_descr);
+ __Pyx_FinishRefcountContext();
+ return __pyx_r;
+}
+
+/* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":156
+ * f[0] = 0 # Terminate format string
+ *
+ * def __releasebuffer__(ndarray self, Py_buffer* info): # <<<<<<<<<<<<<<
+ * if PyArray_HASFIELDS(self):
+ * stdlib.free(info.format)
+ */
+
+static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info); /*proto*/
+static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info) {
+ int __pyx_t_1;
+ int __pyx_t_2;
+ __Pyx_SetupRefcountContext("__releasebuffer__");
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":157
+ *
+ * def __releasebuffer__(ndarray self, Py_buffer* info):
+ * if PyArray_HASFIELDS(self): # <<<<<<<<<<<<<<
+ * stdlib.free(info.format)
+ * if sizeof(npy_intp) != sizeof(Py_ssize_t):
+ */
+ __pyx_t_1 = PyArray_HASFIELDS(((PyArrayObject *)__pyx_v_self));
+ if (__pyx_t_1) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":158
+ * def __releasebuffer__(ndarray self, Py_buffer* info):
+ * if PyArray_HASFIELDS(self):
+ * stdlib.free(info.format) # <<<<<<<<<<<<<<
+ * if sizeof(npy_intp) != sizeof(Py_ssize_t):
+ * stdlib.free(info.strides)
+ */
+ free(__pyx_v_info->format);
+ goto __pyx_L5;
+ }
+ __pyx_L5:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":159
+ * if PyArray_HASFIELDS(self):
+ * stdlib.free(info.format)
+ * if sizeof(npy_intp) != sizeof(Py_ssize_t): # <<<<<<<<<<<<<<
+ * stdlib.free(info.strides)
+ * # info.shape was stored after info.strides in the same block
+ */
+ __pyx_t_2 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t)));
+ if (__pyx_t_2) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":160
+ * stdlib.free(info.format)
+ * if sizeof(npy_intp) != sizeof(Py_ssize_t):
+ * stdlib.free(info.strides) # <<<<<<<<<<<<<<
+ * # info.shape was stored after info.strides in the same block
+ *
+ */
+ free(__pyx_v_info->strides);
+ goto __pyx_L6;
+ }
+ __pyx_L6:;
+
+ __Pyx_FinishRefcountContext();
+}
+
+/* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":277
+ * ctypedef npy_cdouble complex_t
+ *
+ * cdef inline char* _util_dtypestring(dtype descr, char* f, char* end, int* offset) except NULL: # <<<<<<<<<<<<<<
+ * # Recursive utility function used in __getbuffer__ to get format
+ * # string. The new location in the format string is returned.
+ */
+
+static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_descr, char *__pyx_v_f, char *__pyx_v_end, int *__pyx_v_offset) {
+ PyArray_Descr *__pyx_v_child;
+ PyObject *__pyx_v_i;
+ int __pyx_v_endian_detector;
+ int __pyx_v_little_endian;
+ PyObject *__pyx_v_new_offset;
+ PyObject *__pyx_v_t;
+ char *__pyx_r;
+ PyObject *__pyx_1 = 0;
+ Py_ssize_t __pyx_t_1;
+ PyObject *__pyx_t_2 = NULL;
+ PyObject *__pyx_t_3 = NULL;
+ PyObject *__pyx_t_4 = NULL;
+ PyObject *__pyx_t_5 = NULL;
+ int __pyx_t_6;
+ int __pyx_t_7;
+ int __pyx_t_8;
+ char *__pyx_t_9;
+ __Pyx_SetupRefcountContext("_util_dtypestring");
+ __pyx_v_child = ((PyArray_Descr *)Py_None); __Pyx_INCREF(Py_None);
+ __pyx_v_i = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);
+ __pyx_v_new_offset = Py_None; __Pyx_INCREF(Py_None);
+ __pyx_v_t = Py_None; __Pyx_INCREF(Py_None);
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":284
+ * cdef int delta_offset
+ * cdef tuple i
+ * cdef int endian_detector = 1 # <<<<<<<<<<<<<<
+ * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0)
+ *
+ */
+ __pyx_v_endian_detector = 1;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":285
+ * cdef tuple i
+ * cdef int endian_detector = 1
+ * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0) # <<<<<<<<<<<<<<
+ *
+ * for i in descr.fields.itervalues():
+ */
+ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0);
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":287
+ * cdef bint little_endian = ((<char*>&endian_detector)[0] != 0)
+ *
+ * for i in descr.fields.itervalues(): # <<<<<<<<<<<<<<
+ * child = i[0]
+ * new_offset = i[1]
+ */
+ __pyx_t_2 = PyObject_GetAttr(__pyx_v_descr->fields, __pyx_kp_itervalues); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_3);
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+ if (PyList_CheckExact(__pyx_t_3) || PyTuple_CheckExact(__pyx_t_3)) {
+ __pyx_t_1 = 0; __pyx_t_2 = __pyx_t_3; __Pyx_INCREF(__pyx_t_2);
+ } else {
+ __pyx_t_1 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_2);
+ }
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+ for (;;) {
+ if (likely(PyList_CheckExact(__pyx_t_2))) {
+ if (__pyx_t_1 >= PyList_GET_SIZE(__pyx_t_2)) break;
+ __pyx_t_3 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_1); __Pyx_INCREF(__pyx_t_3); __pyx_t_1++;
+ } else if (likely(PyTuple_CheckExact(__pyx_t_2))) {
+ if (__pyx_t_1 >= PyTuple_GET_SIZE(__pyx_t_2)) break;
+ __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_1); __Pyx_INCREF(__pyx_t_3); __pyx_t_1++;
+ } else {
+ __pyx_t_3 = PyIter_Next(__pyx_t_2);
+ if (!__pyx_t_3) {
+ if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ break;
+ }
+ __Pyx_GOTREF(__pyx_t_3);
+ }
+ if (!(likely(PyTuple_CheckExact(__pyx_t_3)) || (__pyx_t_3) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected tuple, got %s", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(((PyObject *)__pyx_v_i));
+ __pyx_v_i = ((PyObject *)__pyx_t_3);
+ __pyx_t_3 = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":288
+ *
+ * for i in descr.fields.itervalues():
+ * child = i[0] # <<<<<<<<<<<<<<
+ * new_offset = i[1]
+ *
+ */
+ __pyx_1 = __Pyx_GetItemInt_Tuple(((PyObject *)__pyx_v_i), 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_1);
+ if (!(__Pyx_TypeTest(__pyx_1, __pyx_ptype_5numpy_dtype))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(((PyObject *)__pyx_v_child));
+ __pyx_v_child = ((PyArray_Descr *)__pyx_1);
+ __pyx_1 = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":289
+ * for i in descr.fields.itervalues():
+ * child = i[0]
+ * new_offset = i[1] # <<<<<<<<<<<<<<
+ *
+ * if (end - f) - (new_offset - offset[0]) < 15:
+ */
+ __pyx_1 = __Pyx_GetItemInt_Tuple(((PyObject *)__pyx_v_i), 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_1);
+ __Pyx_DECREF(__pyx_v_new_offset);
+ __pyx_v_new_offset = __pyx_1;
+ __pyx_1 = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":291
+ * new_offset = i[1]
+ *
+ * if (end - f) - (new_offset - offset[0]) < 15: # <<<<<<<<<<<<<<
+ * raise RuntimeError("Format string allocated too short, see comment in numpy.pxd")
+ *
+ */
+ __pyx_t_3 = PyInt_FromLong((__pyx_v_end - __pyx_v_f)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_3);
+ __pyx_t_4 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyNumber_Subtract(__pyx_v_new_offset, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_4 = PyNumber_Subtract(__pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_int_15, Py_LT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_6) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":292
+ *
+ * if (end - f) - (new_offset - offset[0]) < 15:
+ * raise RuntimeError("Format string allocated too short, see comment in numpy.pxd") # <<<<<<<<<<<<<<
+ *
+ * if ((child.byteorder == '>' and little_endian) or
+ */
+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_5));
+ __Pyx_INCREF(__pyx_kp_25);
+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_25);
+ __Pyx_GIVEREF(__pyx_kp_25);
+ __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+ __Pyx_Raise(__pyx_t_4, 0, 0);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ goto __pyx_L5;
+ }
+ __pyx_L5:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":294
+ * raise RuntimeError("Format string allocated too short, see comment in numpy.pxd")
+ *
+ * if ((child.byteorder == '>' and little_endian) or # <<<<<<<<<<<<<<
+ * (child.byteorder == '<' and not little_endian)):
+ * raise ValueError("Non-native byte order not supported")
+ */
+ if ((__pyx_v_child->byteorder == '>')) {
+ __pyx_t_6 = __pyx_v_little_endian;
+ } else {
+ __pyx_t_6 = (__pyx_v_child->byteorder == '>');
+ }
+ if (!__pyx_t_6) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":295
+ *
+ * if ((child.byteorder == '>' and little_endian) or
+ * (child.byteorder == '<' and not little_endian)): # <<<<<<<<<<<<<<
+ * raise ValueError("Non-native byte order not supported")
+ * # One could encode it in the format string and have Cython
+ */
+ if ((__pyx_v_child->byteorder == '<')) {
+ __pyx_t_7 = (!__pyx_v_little_endian);
+ } else {
+ __pyx_t_7 = (__pyx_v_child->byteorder == '<');
+ }
+ __pyx_t_8 = __pyx_t_7;
+ } else {
+ __pyx_t_8 = __pyx_t_6;
+ }
+ if (__pyx_t_8) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":296
+ * if ((child.byteorder == '>' and little_endian) or
+ * (child.byteorder == '<' and not little_endian)):
+ * raise ValueError("Non-native byte order not supported") # <<<<<<<<<<<<<<
+ * # One could encode it in the format string and have Cython
+ * # complain instead, BUT: < and > in format strings also imply
+ */
+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+ __Pyx_INCREF(__pyx_kp_28);
+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_28);
+ __Pyx_GIVEREF(__pyx_kp_28);
+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+ __Pyx_Raise(__pyx_t_5, 0, 0);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ goto __pyx_L6;
+ }
+ __pyx_L6:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":306
+ *
+ * # Output padding bytes
+ * while offset[0] < new_offset: # <<<<<<<<<<<<<<
+ * f[0] = 120 # "x"; pad byte
+ * f += 1
+ */
+ while (1) {
+ __pyx_t_5 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_t_5, __pyx_v_new_offset, Py_LT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (!__pyx_t_8) break;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":307
+ * # Output padding bytes
+ * while offset[0] < new_offset:
+ * f[0] = 120 # "x"; pad byte # <<<<<<<<<<<<<<
+ * f += 1
+ * offset[0] += 1
+ */
+ (__pyx_v_f[0]) = 120;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":308
+ * while offset[0] < new_offset:
+ * f[0] = 120 # "x"; pad byte
+ * f += 1 # <<<<<<<<<<<<<<
+ * offset[0] += 1
+ *
+ */
+ __pyx_v_f += 1;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":309
+ * f[0] = 120 # "x"; pad byte
+ * f += 1
+ * offset[0] += 1 # <<<<<<<<<<<<<<
+ *
+ * offset[0] += child.itemsize
+ */
+ (__pyx_v_offset[0]) += 1;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":311
+ * offset[0] += 1
+ *
+ * offset[0] += child.itemsize # <<<<<<<<<<<<<<
+ *
+ * if not PyDataType_HASFIELDS(child):
+ */
+ (__pyx_v_offset[0]) += __pyx_v_child->elsize;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":313
+ * offset[0] += child.itemsize
+ *
+ * if not PyDataType_HASFIELDS(child): # <<<<<<<<<<<<<<
+ * t = child.type_num
+ * if end - f < 5:
+ */
+ __pyx_t_8 = (!PyDataType_HASFIELDS(__pyx_v_child));
+ if (__pyx_t_8) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":314
+ *
+ * if not PyDataType_HASFIELDS(child):
+ * t = child.type_num # <<<<<<<<<<<<<<
+ * if end - f < 5:
+ * raise RuntimeError("Format string allocated too short.")
+ */
+ __pyx_t_4 = PyInt_FromLong(__pyx_v_child->type_num); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_v_t);
+ __pyx_v_t = __pyx_t_4;
+ __pyx_t_4 = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":315
+ * if not PyDataType_HASFIELDS(child):
+ * t = child.type_num
+ * if end - f < 5: # <<<<<<<<<<<<<<
+ * raise RuntimeError("Format string allocated too short.")
+ *
+ */
+ __pyx_t_8 = ((__pyx_v_end - __pyx_v_f) < 5);
+ if (__pyx_t_8) {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":316
+ * t = child.type_num
+ * if end - f < 5:
+ * raise RuntimeError("Format string allocated too short.") # <<<<<<<<<<<<<<
+ *
+ * # Until ticket #99 is fixed, use integers to avoid warnings
+ */
+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 316; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+ __Pyx_INCREF(__pyx_kp_29);
+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_29);
+ __Pyx_GIVEREF(__pyx_kp_29);
+ __pyx_t_5 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 316; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+ __Pyx_Raise(__pyx_t_5, 0, 0);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 316; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ goto __pyx_L10;
+ }
+ __pyx_L10:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":319
+ *
+ * # Until ticket #99 is fixed, use integers to avoid warnings
+ * if t == NPY_BYTE: f[0] = 98 #"b" # <<<<<<<<<<<<<<
+ * elif t == NPY_UBYTE: f[0] = 66 #"B"
+ * elif t == NPY_SHORT: f[0] = 104 #"h"
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_BYTE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 98;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":320
+ * # Until ticket #99 is fixed, use integers to avoid warnings
+ * if t == NPY_BYTE: f[0] = 98 #"b"
+ * elif t == NPY_UBYTE: f[0] = 66 #"B" # <<<<<<<<<<<<<<
+ * elif t == NPY_SHORT: f[0] = 104 #"h"
+ * elif t == NPY_USHORT: f[0] = 72 #"H"
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_UBYTE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 320; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 320; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 320; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 66;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":321
+ * if t == NPY_BYTE: f[0] = 98 #"b"
+ * elif t == NPY_UBYTE: f[0] = 66 #"B"
+ * elif t == NPY_SHORT: f[0] = 104 #"h" # <<<<<<<<<<<<<<
+ * elif t == NPY_USHORT: f[0] = 72 #"H"
+ * elif t == NPY_INT: f[0] = 105 #"i"
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_SHORT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 104;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":322
+ * elif t == NPY_UBYTE: f[0] = 66 #"B"
+ * elif t == NPY_SHORT: f[0] = 104 #"h"
+ * elif t == NPY_USHORT: f[0] = 72 #"H" # <<<<<<<<<<<<<<
+ * elif t == NPY_INT: f[0] = 105 #"i"
+ * elif t == NPY_UINT: f[0] = 73 #"I"
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_USHORT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 72;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":323
+ * elif t == NPY_SHORT: f[0] = 104 #"h"
+ * elif t == NPY_USHORT: f[0] = 72 #"H"
+ * elif t == NPY_INT: f[0] = 105 #"i" # <<<<<<<<<<<<<<
+ * elif t == NPY_UINT: f[0] = 73 #"I"
+ * elif t == NPY_LONG: f[0] = 108 #"l"
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_INT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 105;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":324
+ * elif t == NPY_USHORT: f[0] = 72 #"H"
+ * elif t == NPY_INT: f[0] = 105 #"i"
+ * elif t == NPY_UINT: f[0] = 73 #"I" # <<<<<<<<<<<<<<
+ * elif t == NPY_LONG: f[0] = 108 #"l"
+ * elif t == NPY_ULONG: f[0] = 76 #"L"
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_UINT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 324; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 324; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 324; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 73;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":325
+ * elif t == NPY_INT: f[0] = 105 #"i"
+ * elif t == NPY_UINT: f[0] = 73 #"I"
+ * elif t == NPY_LONG: f[0] = 108 #"l" # <<<<<<<<<<<<<<
+ * elif t == NPY_ULONG: f[0] = 76 #"L"
+ * elif t == NPY_LONGLONG: f[0] = 113 #"q"
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_LONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 108;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":326
+ * elif t == NPY_UINT: f[0] = 73 #"I"
+ * elif t == NPY_LONG: f[0] = 108 #"l"
+ * elif t == NPY_ULONG: f[0] = 76 #"L" # <<<<<<<<<<<<<<
+ * elif t == NPY_LONGLONG: f[0] = 113 #"q"
+ * elif t == NPY_ULONGLONG: f[0] = 81 #"Q"
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_ULONG); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 76;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":327
+ * elif t == NPY_LONG: f[0] = 108 #"l"
+ * elif t == NPY_ULONG: f[0] = 76 #"L"
+ * elif t == NPY_LONGLONG: f[0] = 113 #"q" # <<<<<<<<<<<<<<
+ * elif t == NPY_ULONGLONG: f[0] = 81 #"Q"
+ * elif t == NPY_FLOAT: f[0] = 102 #"f"
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 113;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":328
+ * elif t == NPY_ULONG: f[0] = 76 #"L"
+ * elif t == NPY_LONGLONG: f[0] = 113 #"q"
+ * elif t == NPY_ULONGLONG: f[0] = 81 #"Q" # <<<<<<<<<<<<<<
+ * elif t == NPY_FLOAT: f[0] = 102 #"f"
+ * elif t == NPY_DOUBLE: f[0] = 100 #"d"
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 81;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":329
+ * elif t == NPY_LONGLONG: f[0] = 113 #"q"
+ * elif t == NPY_ULONGLONG: f[0] = 81 #"Q"
+ * elif t == NPY_FLOAT: f[0] = 102 #"f" # <<<<<<<<<<<<<<
+ * elif t == NPY_DOUBLE: f[0] = 100 #"d"
+ * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g"
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_FLOAT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 102;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":330
+ * elif t == NPY_ULONGLONG: f[0] = 81 #"Q"
+ * elif t == NPY_FLOAT: f[0] = 102 #"f"
+ * elif t == NPY_DOUBLE: f[0] = 100 #"d" # <<<<<<<<<<<<<<
+ * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g"
+ * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_DOUBLE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 100;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":331
+ * elif t == NPY_FLOAT: f[0] = 102 #"f"
+ * elif t == NPY_DOUBLE: f[0] = 100 #"d"
+ * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g" # <<<<<<<<<<<<<<
+ * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf
+ * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_LONGDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 103;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":332
+ * elif t == NPY_DOUBLE: f[0] = 100 #"d"
+ * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g"
+ * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf # <<<<<<<<<<<<<<
+ * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd
+ * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_CFLOAT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 90;
+ (__pyx_v_f[1]) = 102;
+ __pyx_v_f += 1;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":333
+ * elif t == NPY_LONGDOUBLE: f[0] = 103 #"g"
+ * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf
+ * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd # <<<<<<<<<<<<<<
+ * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg
+ * elif t == NPY_OBJECT: f[0] = 79 #"O"
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_CDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 333; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 333; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 333; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 90;
+ (__pyx_v_f[1]) = 100;
+ __pyx_v_f += 1;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":334
+ * elif t == NPY_CFLOAT: f[0] = 90; f[1] = 102; f += 1 # Zf
+ * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd
+ * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg # <<<<<<<<<<<<<<
+ * elif t == NPY_OBJECT: f[0] = 79 #"O"
+ * else:
+ */
+ __pyx_t_4 = PyInt_FromLong(NPY_CLONGDOUBLE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 334; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 334; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 334; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 90;
+ (__pyx_v_f[1]) = 103;
+ __pyx_v_f += 1;
+ goto __pyx_L11;
+ }
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":335
+ * elif t == NPY_CDOUBLE: f[0] = 90; f[1] = 100; f += 1 # Zd
+ * elif t == NPY_CLONGDOUBLE: f[0] = 90; f[1] = 103; f += 1 # Zg
+ * elif t == NPY_OBJECT: f[0] = 79 #"O" # <<<<<<<<<<<<<<
+ * else:
+ * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t)
+ */
+ __pyx_t_5 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_t_8 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ if (__pyx_t_8) {
+ (__pyx_v_f[0]) = 79;
+ goto __pyx_L11;
+ }
+ /*else*/ {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":337
+ * elif t == NPY_OBJECT: f[0] = 79 #"O"
+ * else:
+ * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t) # <<<<<<<<<<<<<<
+ * f += 1
+ * else:
+ */
+ __pyx_t_4 = PyNumber_Remainder(__pyx_kp_30, __pyx_v_t); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(((PyObject *)__pyx_t_5));
+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);
+ __Pyx_GIVEREF(__pyx_t_4);
+ __pyx_t_4 = 0;
+ __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+ __Pyx_Raise(__pyx_t_4, 0, 0);
+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ }
+ __pyx_L11:;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":338
+ * else:
+ * raise ValueError("unknown dtype code in numpy.pxd (%d)" % t)
+ * f += 1 # <<<<<<<<<<<<<<
+ * else:
+ * # Cython ignores struct boundary information ("T{...}"),
+ */
+ __pyx_v_f += 1;
+ goto __pyx_L9;
+ }
+ /*else*/ {
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":342
+ * # Cython ignores struct boundary information ("T{...}"),
+ * # so don't output it
+ * f = _util_dtypestring(child, f, end, offset) # <<<<<<<<<<<<<<
+ * return f
+ *
+ */
+ __pyx_t_9 = __pyx_f_5numpy__util_dtypestring(__pyx_v_child, __pyx_v_f, __pyx_v_end, __pyx_v_offset); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_v_f = __pyx_t_9;
+ }
+ __pyx_L9:;
+ }
+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/numpy.pxd":343
+ * # so don't output it
+ * f = _util_dtypestring(child, f, end, offset)
+ * return f # <<<<<<<<<<<<<<
+ *
+ */
+ __pyx_r = __pyx_v_f;
+ goto __pyx_L0;
+
+ __pyx_r = 0;
+ goto __pyx_L0;
+ __pyx_L1_error:;
+ __Pyx_XDECREF(__pyx_1);
+ __Pyx_XDECREF(__pyx_t_2);
+ __Pyx_XDECREF(__pyx_t_3);
+ __Pyx_XDECREF(__pyx_t_4);
+ __Pyx_XDECREF(__pyx_t_5);
+ __Pyx_AddTraceback("numpy._util_dtypestring");
+ __pyx_r = NULL;
+ __pyx_L0:;
+ __Pyx_DECREF((PyObject *)__pyx_v_child);
+ __Pyx_DECREF(__pyx_v_i);
+ __Pyx_DECREF(__pyx_v_new_offset);
+ __Pyx_DECREF(__pyx_v_t);
+ __Pyx_FinishRefcountContext();
+ return __pyx_r;
+}
+
+static struct PyMethodDef __pyx_methods[] = {
+ {__Pyx_NAMESTR("UnilinearlyInterpolate"), (PyCFunction)__pyx_pf_2yt_5lagos_13Interpolators_UnilinearlyInterpolate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+ {__Pyx_NAMESTR("BilinearlyInterpolate"), (PyCFunction)__pyx_pf_2yt_5lagos_13Interpolators_BilinearlyInterpolate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+ {__Pyx_NAMESTR("TrilinearlyInterpolate"), (PyCFunction)__pyx_pf_2yt_5lagos_13Interpolators_TrilinearlyInterpolate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+ {0, 0, 0, 0}
+};
+
+static void __pyx_init_filenames(void); /*proto*/
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef __pyx_moduledef = {
+ PyModuleDef_HEAD_INIT,
+ __Pyx_NAMESTR("Interpolators"),
+ __Pyx_DOCSTR(__pyx_mdoc), /* m_doc */
+ -1, /* m_size */
+ __pyx_methods /* m_methods */,
+ NULL, /* m_reload */
+ NULL, /* m_traverse */
+ NULL, /* m_clear */
+ NULL /* m_free */
+};
+#endif
+
+static __Pyx_StringTabEntry __pyx_string_tab[] = {
+ {&__pyx_kp___main__, __pyx_k___main__, sizeof(__pyx_k___main__), 1, 1, 1},
+ {&__pyx_kp_table, __pyx_k_table, sizeof(__pyx_k_table), 1, 1, 1},
+ {&__pyx_kp_x_vals, __pyx_k_x_vals, sizeof(__pyx_k_x_vals), 1, 1, 1},
+ {&__pyx_kp_x_bins, __pyx_k_x_bins, sizeof(__pyx_k_x_bins), 1, 1, 1},
+ {&__pyx_kp_x_is, __pyx_k_x_is, sizeof(__pyx_k_x_is), 1, 1, 1},
+ {&__pyx_kp_output, __pyx_k_output, sizeof(__pyx_k_output), 1, 1, 1},
+ {&__pyx_kp_y_vals, __pyx_k_y_vals, sizeof(__pyx_k_y_vals), 1, 1, 1},
+ {&__pyx_kp_y_bins, __pyx_k_y_bins, sizeof(__pyx_k_y_bins), 1, 1, 1},
+ {&__pyx_kp_y_is, __pyx_k_y_is, sizeof(__pyx_k_y_is), 1, 1, 1},
+ {&__pyx_kp_z_vals, __pyx_k_z_vals, sizeof(__pyx_k_z_vals), 1, 1, 1},
+ {&__pyx_kp_z_bins, __pyx_k_z_bins, sizeof(__pyx_k_z_bins), 1, 1, 1},
+ {&__pyx_kp_z_is, __pyx_k_z_is, sizeof(__pyx_k_z_is), 1, 1, 1},
+ {&__pyx_kp_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 1, 1, 1},
+ {&__pyx_kp_np, __pyx_k_np, sizeof(__pyx_k_np), 0, 1, 1},
+ {&__pyx_kp_range, __pyx_k_range, sizeof(__pyx_k_range), 1, 1, 1},
+ {&__pyx_kp___getbuffer__, __pyx_k___getbuffer__, sizeof(__pyx_k___getbuffer__), 1, 1, 1},
+ {&__pyx_kp___releasebuffer__, __pyx_k___releasebuffer__, sizeof(__pyx_k___releasebuffer__), 1, 1, 1},
+ {&__pyx_kp_info, __pyx_k_info, sizeof(__pyx_k_info), 1, 1, 1},
+ {&__pyx_kp_flags, __pyx_k_flags, sizeof(__pyx_k_flags), 1, 1, 1},
+ {&__pyx_kp_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 1, 1, 1},
+ {&__pyx_kp_itervalues, __pyx_k_itervalues, sizeof(__pyx_k_itervalues), 1, 1, 1},
+ {&__pyx_kp_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 1, 1, 1},
+ {&__pyx_kp_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 0},
+ {&__pyx_kp_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 0},
+ {&__pyx_kp_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 0},
+ {&__pyx_kp_23, __pyx_k_23, sizeof(__pyx_k_23), 0, 0, 0},
+ {&__pyx_kp_25, __pyx_k_25, sizeof(__pyx_k_25), 0, 0, 0},
+ {&__pyx_kp_28, __pyx_k_28, sizeof(__pyx_k_28), 0, 0, 0},
+ {&__pyx_kp_29, __pyx_k_29, sizeof(__pyx_k_29), 0, 0, 0},
+ {&__pyx_kp_30, __pyx_k_30, sizeof(__pyx_k_30), 0, 0, 0},
+ {0, 0, 0, 0, 0, 0}
+};
+static int __Pyx_InitCachedBuiltins(void) {
+ __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 292; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ return 0;
+ __pyx_L1_error:;
+ return -1;
+}
+
+static int __Pyx_InitGlobals(void) {
+ __pyx_int_15 = PyInt_FromLong(15); if (unlikely(!__pyx_int_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+ if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+ return 0;
+ __pyx_L1_error:;
+ return -1;
+}
+
+#if PY_MAJOR_VERSION < 3
+PyMODINIT_FUNC initInterpolators(void); /*proto*/
+PyMODINIT_FUNC initInterpolators(void)
+#else
+PyMODINIT_FUNC PyInit_Interpolators(void); /*proto*/
+PyMODINIT_FUNC PyInit_Interpolators(void)
+#endif
+{
+ PyObject *__pyx_1 = 0;
+ #ifdef CYTHON_REFNANNY
+ void* __pyx_refchk = NULL;
+ __Pyx_Refnanny = __Pyx_ImportRefcountAPI("refnanny");
+ if (!__Pyx_Refnanny) {
+ PyErr_Clear();
+ __Pyx_Refnanny = __Pyx_ImportRefcountAPI("Cython.Runtime.refnanny");
+ if (!__Pyx_Refnanny)
+ Py_FatalError("failed to import refnanny module");
+ }
+ __pyx_refchk = __Pyx_Refnanny->NewContext("PyMODINIT_FUNC PyInit_Interpolators(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;}
+ /*--- Library function declarations ---*/
+ __pyx_init_filenames();
+ /*--- Threads initialization code ---*/
+ #if defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS
+ #ifdef WITH_THREAD /* Python build with threading support? */
+ PyEval_InitThreads();
+ #endif
+ #endif
+ /*--- 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;}
+ /*--- Module creation code ---*/
+ #if PY_MAJOR_VERSION < 3
+ __pyx_m = Py_InitModule4(__Pyx_NAMESTR("Interpolators"), __pyx_methods, __pyx_mdoc, 0, PYTHON_API_VERSION);
+ #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);
+ #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;};
+ if (__pyx_module_is_main_yt__lagos__Interpolators) {
+ if (__Pyx_SetAttrString(__pyx_m, "__name__", __pyx_kp___main__) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+ }
+ /*--- Builtin init code ---*/
+ if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_skip_dispatch = 0;
+ /*--- Global init code ---*/
+ /*--- Function export code ---*/
+ /*--- Type init code ---*/
+ /*--- Type import code ---*/
+ __pyx_ptype_5numpy_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr)); if (unlikely(!__pyx_ptype_5numpy_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_ptype_5numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ /*--- Function import code ---*/
+ /*--- Execution code ---*/
+
+ /* "/Users/jwise/codes/yt/yt/lagos/Interpolators.pyx":26
+ * """
+ *
+ * import numpy as np # <<<<<<<<<<<<<<
+ * cimport numpy as np
+ * cimport cython
+ */
+ __pyx_1 = __Pyx_Import(__pyx_kp_numpy, 0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_1);
+ if (PyObject_SetAttr(__pyx_m, __pyx_kp_np, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+
+ /* "/usr/local/python/lib/python2.6/site-packages/Cython/Includes/stdlib.pxd":2
+ *
+ * cdef extern from "stdlib.h" nogil: # <<<<<<<<<<<<<<
+ * void free(void *ptr)
+ * void *malloc(size_t size)
+ */
+ goto __pyx_L0;
+ __pyx_L1_error:;
+ __Pyx_XDECREF(__pyx_1);
+ __Pyx_AddTraceback("yt.lagos.Interpolators");
+ Py_DECREF(__pyx_m); __pyx_m = 0;
+ __pyx_L0:;
+ __Pyx_FinishRefcountContext();
+ #if PY_MAJOR_VERSION < 3
+ return;
+ #else
+ return __pyx_m;
+ #endif
+}
+
+static const char *__pyx_filenames[] = {
+ "Interpolators.pyx",
+ "numpy.pxd",
+};
+
+/* Runtime support code */
+
+static void __pyx_init_filenames(void) {
+ __pyx_f = __pyx_filenames;
+}
+
+static void __Pyx_RaiseDoubleKeywordsError(
+ const char* func_name,
+ PyObject* kw_name)
+{
+ PyErr_Format(PyExc_TypeError,
+ #if PY_MAJOR_VERSION >= 3
+ "%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));
+ #endif
+}
+
+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)
+{
+ Py_ssize_t num_expected;
+ const char *number, *more_or_less;
+
+ if (num_found < num_min) {
+ num_expected = num_min;
+ more_or_less = "at least";
+ } else {
+ num_expected = num_max;
+ more_or_less = "at most";
+ }
+ 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);
+}
+
+static int __Pyx_ParseOptionalKeywords(
+ PyObject *kwds,
+ PyObject **argnames[],
+ PyObject *kwds2,
+ PyObject *values[],
+ Py_ssize_t num_pos_args,
+ const char* function_name)
+{
+ PyObject *key = 0, *value = 0;
+ 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) {
+ 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;
+ }
+ }
+ }
+ }
+ }
return 0;
+arg_passed_twice:
+ __Pyx_RaiseDoubleKeywordsError(function_name, **name);
+ goto bad;
+invalid_keyword_type:
+ PyErr_Format(PyExc_TypeError,
+ "%s() 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'",
+ function_name, PyString_AsString(key));
+ #else
+ "%s() got an unexpected keyword argument '%U'",
+ function_name, key);
+ #endif
+bad:
+ return -1;
+}
+
+static INLINE int __Pyx_IsLittleEndian(void) {
+ unsigned int n = 1;
+ return *(unsigned char*)(&n) != 0;
+}
+
+typedef struct {
+ __Pyx_StructField root;
+ __Pyx_BufFmt_StackElem* head;
+ size_t fmt_offset;
+ int new_count, enc_count;
+ int is_complex;
+ char enc_type;
+ char packmode;
+} __Pyx_BufFmt_Context;
+
+static void __Pyx_BufFmt_Init(__Pyx_BufFmt_Context* ctx,
+ __Pyx_BufFmt_StackElem* stack,
+ __Pyx_TypeInfo* type) {
+ stack[0].field = &ctx->root;
+ stack[0].parent_offset = 0;
+ ctx->root.type = type;
+ ctx->root.name = "buffer dtype";
+ ctx->root.offset = 0;
+ ctx->head = stack;
+ ctx->head->field = &ctx->root;
+ ctx->fmt_offset = 0;
+ ctx->head->parent_offset = 0;
+ ctx->packmode = '@';
+ ctx->new_count = 1;
+ ctx->enc_count = 0;
+ ctx->enc_type = 0;
+ ctx->is_complex = 0;
+ while (type->typegroup == 'S') {
+ ++ctx->head;
+ ctx->head->field = type->fields;
+ ctx->head->parent_offset = 0;
+ type = type->fields->type;
}
- buf->buf = NULL;
- if (__Pyx_GetBuffer(obj, buf, flags) == -1) goto fail;
- if (buf->ndim != nd) {
- __Pyx_BufferNdimError(buf, nd);
- goto fail;
+}
+
+static int __Pyx_BufFmt_ParseNumber(const char** ts) {
+ int count;
+ const char* t = *ts;
+ if (*t < '0' || *t > '9') {
+ return -1;
+ } else {
+ count = *t++ - '0';
+ while (*t >= '0' && *t < '9') {
+ count *= 10;
+ count += *t++ - '0';
+ }
+ }
+ *ts = t;
+ return count;
+}
+
+static void __Pyx_BufFmt_RaiseUnexpectedChar(char ch) {
+ char msg[] = {ch, 0};
+ PyErr_Format(PyExc_ValueError, "Unexpected format string character: '%s'", msg);
+}
+
+static const char* __Pyx_BufFmt_DescribeTypeChar(char ch, int is_complex) {
+ switch (ch) {
+ case 'b': return "'char'";
+ case 'B': return "'unsigned char'";
+ case 'h': return "'short'";
+ case 'H': return "'unsigned short'";
+ case 'i': return "'int'";
+ case 'I': return "'unsigned int'";
+ case 'l': return "'long'";
+ case 'L': return "'unsigned long'";
+ case 'q': return "'long long'";
+ case 'Q': return "'unsigned long long'";
+ case 'f': return (is_complex ? "'complex float'" : "'float'");
+ case 'd': return (is_complex ? "'complex double'" : "'double'");
+ case 'g': return (is_complex ? "'complex long double'" : "'long double'");
+ case 'T': return "a struct";
+ case 'O': return "Python object";
+ case 'P': return "a pointer";
+ case 0: return "end";
+ default: return "unparseable format string";
+ }
+}
+
+static size_t __Pyx_BufFmt_TypeCharToStandardSize(char ch, int is_complex) {
+ switch (ch) {
+ case '?': case 'c': case 'b': case 'B': return 1;
+ case 'h': case 'H': return 2;
+ case 'i': case 'I': case 'l': case 'L': return 4;
+ case 'q': case 'Q': return 8;
+ case 'f': return (is_complex ? 8 : 4);
+ case 'd': return (is_complex ? 16 : 8);
+ case 'g': {
+ PyErr_SetString(PyExc_ValueError, "Python does not define a standard format string size for long double ('g')..");
+ return 0;
+ }
+ case 'O': case 'P': return sizeof(void*);
+ default:
+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);
+ return 0;
+ }
+}
+
+static size_t __Pyx_BufFmt_TypeCharToNativeSize(char ch, int is_complex) {
+ switch (ch) {
+ case 'c': case 'b': case 'B': return 1;
+ case 'h': case 'H': return sizeof(short);
+ case 'i': case 'I': return sizeof(int);
+ case 'l': case 'L': return sizeof(long);
+ #ifdef HAVE_LONG_LONG
+ case 'q': case 'Q': return sizeof(PY_LONG_LONG);
+ #endif
+ case 'f': return sizeof(float) * (is_complex ? 2 : 1);
+ case 'd': return sizeof(double) * (is_complex ? 2 : 1);
+ case 'g': return sizeof(long double) * (is_complex ? 2 : 1);
+ case 'O': case 'P': return sizeof(void*);
+ default: {
+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);
+ return 0;
+ }
+ }
+}
+
+typedef struct { char c; short x; } __Pyx_st_short;
+typedef struct { char c; int x; } __Pyx_st_int;
+typedef struct { char c; long x; } __Pyx_st_long;
+typedef struct { char c; float x; } __Pyx_st_float;
+typedef struct { char c; double x; } __Pyx_st_double;
+typedef struct { char c; long double x; } __Pyx_st_longdouble;
+typedef struct { char c; void *x; } __Pyx_st_void_p;
+#ifdef HAVE_LONG_LONG
+typedef struct { char c; PY_LONG_LONG x; } __Pyx_s_long_long;
+#endif
+
+static size_t __Pyx_BufFmt_TypeCharToAlignment(char ch, int is_complex) {
+ switch (ch) {
+ case '?': case 'c': case 'b': case 'B': return 1;
+ case 'h': case 'H': return sizeof(__Pyx_st_short) - sizeof(short);
+ case 'i': case 'I': return sizeof(__Pyx_st_int) - sizeof(int);
+ case 'l': case 'L': return sizeof(__Pyx_st_long) - sizeof(long);
+#ifdef HAVE_LONG_LONG
+ case 'q': case 'Q': return sizeof(__Pyx_s_long_long) - sizeof(PY_LONG_LONG);
+#endif
+ case 'f': return sizeof(__Pyx_st_float) - sizeof(float);
+ case 'd': return sizeof(__Pyx_st_double) - sizeof(double);
+ case 'g': return sizeof(__Pyx_st_longdouble) - sizeof(long double);
+ case 'P': case 'O': return sizeof(__Pyx_st_void_p) - sizeof(void*);
+ default:
+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);
+ return 0;
+ }
+}
+
+static size_t __Pyx_BufFmt_TypeCharToGroup(char ch, int is_complex) {
+ switch (ch) {
+ case 'c': case 'b': case 'h': case 'i': case 'l': case 'q': return 'I';
+ case 'B': case 'H': case 'I': case 'L': case 'Q': return 'U';
+ case 'f': case 'd': case 'g': return (is_complex ? 'C' : 'R');
+ case 'O': return 'O';
+ case 'P': return 'P';
+ default: {
+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);
+ return 0;
+ }
}
- ts = buf->format;
- ts = __Pyx_ConsumeWhitespace(ts);
- ts = __Pyx_BufferTypestringCheckEndian(ts);
- if (!ts) goto fail;
- ts = __Pyx_ConsumeWhitespace(ts);
- ts = __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_float64_t(ts);
- if (!ts) goto fail;
- ts = __Pyx_ConsumeWhitespace(ts);
- if (*ts != 0) {
+}
+
+static void __Pyx_BufFmt_RaiseExpected(__Pyx_BufFmt_Context* ctx) {
+ if (ctx->head == NULL || ctx->head->field == &ctx->root) {
+ const char* expected;
+ const char* quote;
+ if (ctx->head == NULL) {
+ expected = "end";
+ quote = "";
+ } else {
+ expected = ctx->head->field->type->name;
+ quote = "'";
+ }
PyErr_Format(PyExc_ValueError,
- "Expected non-struct buffer data type (expected end, got '%s')", ts);
- goto fail;
+ "Buffer dtype mismatch, expected %s%s%s but got %s",
+ quote, expected, quote,
+ __Pyx_BufFmt_DescribeTypeChar(ctx->enc_type, ctx->is_complex));
+ } else {
+ __Pyx_StructField* field = ctx->head->field;
+ __Pyx_StructField* parent = (ctx->head - 1)->field;
+ PyErr_Format(PyExc_ValueError,
+ "Buffer dtype mismatch, expected '%s' but got %s in '%s.%s'",
+ field->type->name, __Pyx_BufFmt_DescribeTypeChar(ctx->enc_type, ctx->is_complex),
+ parent->type->name, field->name);
+ }
+}
+
+static int __Pyx_BufFmt_ProcessTypeChunk(__Pyx_BufFmt_Context* ctx) {
+ char group;
+ size_t size, offset;
+ if (ctx->enc_type == 0) return 0;
+ group = __Pyx_BufFmt_TypeCharToGroup(ctx->enc_type, ctx->is_complex);
+ do {
+ __Pyx_StructField* field = ctx->head->field;
+ __Pyx_TypeInfo* type = field->type;
+
+ if (ctx->packmode == '@' || ctx->packmode == '^') {
+ size = __Pyx_BufFmt_TypeCharToNativeSize(ctx->enc_type, ctx->is_complex);
+ } else {
+ size = __Pyx_BufFmt_TypeCharToStandardSize(ctx->enc_type, ctx->is_complex);
+ }
+ if (ctx->packmode == '@') {
+ int align_at = __Pyx_BufFmt_TypeCharToAlignment(ctx->enc_type, ctx->is_complex);
+ int align_mod_offset;
+ if (align_at == 0) return -1;
+ align_mod_offset = ctx->fmt_offset % align_at;
+ if (align_mod_offset > 0) ctx->fmt_offset += align_at - align_mod_offset;
+ }
+
+ if (type->size != size || type->typegroup != group) {
+ if (type->typegroup == 'C' && type->fields != NULL) {
+ /* special case -- treat as struct rather than complex number */
+ size_t parent_offset = ctx->head->parent_offset + field->offset;
+ ++ctx->head;
+ ctx->head->field = type->fields;
+ ctx->head->parent_offset = parent_offset;
+ continue;
+ }
+
+ __Pyx_BufFmt_RaiseExpected(ctx);
+ return -1;
+ }
+
+ offset = ctx->head->parent_offset + field->offset;
+ if (ctx->fmt_offset != offset) {
+ PyErr_Format(PyExc_ValueError,
+ "Buffer dtype mismatch; next field is at offset %"PY_FORMAT_SIZE_T"d "
+ "but %"PY_FORMAT_SIZE_T"d expected", ctx->fmt_offset, offset);
+ return -1;
+ }
+
+ ctx->fmt_offset += size;
+
+ --ctx->enc_count; /* Consume from buffer string */
+
+ /* Done checking, move to next field, pushing or popping struct stack if needed */
+ while (1) {
+ if (field == &ctx->root) {
+ ctx->head = NULL;
+ if (ctx->enc_count != 0) {
+ __Pyx_BufFmt_RaiseExpected(ctx);
+ return -1;
+ }
+ break; /* breaks both loops as ctx->enc_count == 0 */
+ }
+ ctx->head->field = ++field;
+ if (field->type == NULL) {
+ --ctx->head;
+ field = ctx->head->field;
+ continue;
+ } else if (field->type->typegroup == 'S') {
+ size_t parent_offset = ctx->head->parent_offset + field->offset;
+ if (field->type->fields->type == NULL) continue; /* empty struct */
+ field = field->type->fields;
+ ++ctx->head;
+ ctx->head->field = field;
+ ctx->head->parent_offset = parent_offset;
+ break;
+ } else {
+ break;
+ }
+ }
+ } while (ctx->enc_count);
+ ctx->enc_type = 0;
+ ctx->is_complex = 0;
+ return 0;
+}
+
+static int __Pyx_BufFmt_FirstPack(__Pyx_BufFmt_Context* ctx) {
+ if (ctx->enc_type != 0 || ctx->packmode != '@') {
+ PyErr_SetString(PyExc_ValueError, "Buffer packing mode currently only allowed at beginning of format string (this is a defect)");
+ return -1;
+ }
+ return 0;
+}
+
+static const char* __Pyx_BufFmt_CheckString(__Pyx_BufFmt_Context* ctx, const char* ts) {
+ int got_Z = 0;
+ while (1) {
+ switch(*ts) {
+ case 0:
+ if (ctx->enc_type != 0 && ctx->head == NULL) {
+ __Pyx_BufFmt_RaiseExpected(ctx);
+ return NULL;
+ }
+ if (__Pyx_BufFmt_ProcessTypeChunk(ctx) == -1) return NULL;
+ if (ctx->head != NULL) {
+ __Pyx_BufFmt_RaiseExpected(ctx);
+ return NULL;
+ }
+ return ts;
+ case ' ':
+ case 10:
+ case 13:
+ ++ts;
+ break;
+ case '<':
+ if (!__Pyx_IsLittleEndian()) {
+ PyErr_SetString(PyExc_ValueError, "Little-endian buffer not supported on big-endian compiler");
+ return NULL;
+ }
+ if (__Pyx_BufFmt_FirstPack(ctx) == -1) return NULL;
+ ctx->packmode = '=';
+ ++ts;
+ break;
+ case '>':
+ case '!':
+ if (__Pyx_IsLittleEndian()) {
+ PyErr_SetString(PyExc_ValueError, "Big-endian buffer not supported on little-endian compiler");
+ return NULL;
+ }
+ if (__Pyx_BufFmt_FirstPack(ctx) == -1) return NULL;
+ ctx->packmode = '=';
+ ++ts;
+ break;
+ case '=':
+ case '@':
+ case '^':
+ if (__Pyx_BufFmt_FirstPack(ctx) == -1) return NULL;
+ ctx->packmode = *ts++;
+ break;
+ case 'T': /* substruct */
+ {
+ int i;
+ const char* ts_after_sub;
+ int struct_count = ctx->new_count;
+ ctx->new_count = 1;
+ ++ts;
+ if (*ts != '{') {
+ PyErr_SetString(PyExc_ValueError, "Buffer acquisition: Expected '{' after 'T'");
+ return NULL;
+ }
+ ++ts;
+ ts_after_sub = ts;
+ for (i = 0; i != struct_count; ++i) {
+ ts_after_sub = __Pyx_BufFmt_CheckString(ctx, ts);
+ if (!ts_after_sub) return NULL;
+ }
+ ts = ts_after_sub;
+ }
+ break;
+ case '}': /* end of substruct; either repeat or move on */
+ ++ts;
+ return ts;
+ case 'x':
+ if (__Pyx_BufFmt_ProcessTypeChunk(ctx) == -1) return NULL;
+ ctx->fmt_offset += ctx->new_count;
+ ctx->new_count = 1;
+ ctx->enc_count = 0;
+ ctx->enc_type = 0;
+ ++ts;
+ break;
+ case 'Z':
+ got_Z = 1;
+ ++ts;
+ if (*ts != 'f' && *ts != 'd' && *ts != 'g') {
+ __Pyx_BufFmt_RaiseUnexpectedChar('Z');
+ return NULL;
+ } /* fall through */
+ case 'c': case 'b': case 'B': case 'h': case 'H': case 'i': case 'I':
+ case 'l': case 'L': case 'q': case 'Q':
+ case 'f': case 'd': case 'g':
+ case 'O':
+ if (ctx->enc_type == *ts && got_Z == ctx->is_complex) {
+ /* Continue pooling same type */
+ ctx->enc_count += ctx->new_count;
+ } else {
+ /* New type */
+ if (__Pyx_BufFmt_ProcessTypeChunk(ctx) == -1) return NULL;
+ ctx->enc_count = ctx->new_count;
+ ctx->enc_type = *ts;
+ ctx->is_complex = got_Z;
+ }
+ ++ts;
+ ctx->new_count = 1;
+ got_Z = 0;
+ break;
+ default:
+ {
+ ctx->new_count = __Pyx_BufFmt_ParseNumber(&ts);
+ if (ctx->new_count == -1) { /* First char was not a digit */
+ char msg[2] = { *ts, 0 };
+ PyErr_Format(PyExc_ValueError,
+ "Does not understand character buffer dtype format string ('%s')", msg);
+ return NULL;
+ }
+ }
+
+ }
}
- if (buf->suboffsets == NULL) buf->suboffsets = __Pyx_minusones;
- return 0;
-fail:;
- __Pyx_ZeroBuffer(buf);
- return -1;
}
-static const char* __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_int32_t(const char* ts) {
- int ok;
- if (*ts == '1') ++ts;
- switch (*ts) {
- case 'b': ok = (sizeof(__pyx_t_5numpy_int32_t) == sizeof(char) && (__pyx_t_5numpy_int32_t)-1 < 0); break;
- case 'h': ok = (sizeof(__pyx_t_5numpy_int32_t) == sizeof(short) && (__pyx_t_5numpy_int32_t)-1 < 0); break;
- case 'i': ok = (sizeof(__pyx_t_5numpy_int32_t) == sizeof(int) && (__pyx_t_5numpy_int32_t)-1 < 0); break;
- case 'l': ok = (sizeof(__pyx_t_5numpy_int32_t) == sizeof(long) && (__pyx_t_5numpy_int32_t)-1 < 0); break;
- case 'q': ok = (sizeof(__pyx_t_5numpy_int32_t) == sizeof(long long) && (__pyx_t_5numpy_int32_t)-1 < 0); break; default: ok = 0;
- }
- if (!ok) {
- PyErr_Format(PyExc_ValueError, "Buffer datatype mismatch (rejecting on '%s')", ts);
- return NULL;
- } else return ts + 1;
-
+
+static INLINE void __Pyx_ZeroBuffer(Py_buffer* buf) {
+ buf->buf = NULL;
+ buf->obj = NULL;
+ buf->strides = __Pyx_zeros;
+ buf->shape = __Pyx_zeros;
+ buf->suboffsets = __Pyx_minusones;
}
-static int __Pyx_GetBuffer_nn___pyx_t_5numpy_int32_t(PyObject* obj, Py_buffer* buf, int flags, int nd) {
- const char* ts;
+static int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack) {
if (obj == Py_None) {
__Pyx_ZeroBuffer(buf);
return 0;
@@ -2027,20 +4498,22 @@
buf->buf = NULL;
if (__Pyx_GetBuffer(obj, buf, flags) == -1) goto fail;
if (buf->ndim != nd) {
- __Pyx_BufferNdimError(buf, nd);
+ PyErr_Format(PyExc_ValueError,
+ "Buffer has wrong number of dimensions (expected %d, got %d)",
+ nd, buf->ndim);
goto fail;
}
- ts = buf->format;
- ts = __Pyx_ConsumeWhitespace(ts);
- ts = __Pyx_BufferTypestringCheckEndian(ts);
- if (!ts) goto fail;
- ts = __Pyx_ConsumeWhitespace(ts);
- ts = __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_int32_t(ts);
- if (!ts) goto fail;
- ts = __Pyx_ConsumeWhitespace(ts);
- if (*ts != 0) {
+ if (!cast) {
+ __Pyx_BufFmt_Context ctx;
+ __Pyx_BufFmt_Init(&ctx, stack, dtype);
+ if (!__Pyx_BufFmt_CheckString(&ctx, buf->format)) goto fail;
+ }
+ if ((unsigned)buf->itemsize != dtype->size) {
PyErr_Format(PyExc_ValueError,
- "Expected non-struct buffer data type (expected end, got '%s')", ts);
+ "Item size of buffer (%"PY_FORMAT_SIZE_T"d byte%s) does not match size of '%s' (%"PY_FORMAT_SIZE_T"d byte%s)",
+ buf->itemsize, (buf->itemsize > 1) ? "s" : "",
+ dtype->name,
+ dtype->size, (dtype->size > 1) ? "s" : "");
goto fail;
}
if (buf->suboffsets == NULL) buf->suboffsets = __Pyx_minusones;
@@ -2049,55 +4522,73 @@
__Pyx_ZeroBuffer(buf);
return -1;
}
-static const char* __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_int_t(const char* ts) {
- int ok;
- if (*ts == '1') ++ts;
- switch (*ts) {
- case 'b': ok = (sizeof(__pyx_t_5numpy_int_t) == sizeof(char) && (__pyx_t_5numpy_int_t)-1 < 0); break;
- case 'h': ok = (sizeof(__pyx_t_5numpy_int_t) == sizeof(short) && (__pyx_t_5numpy_int_t)-1 < 0); break;
- case 'i': ok = (sizeof(__pyx_t_5numpy_int_t) == sizeof(int) && (__pyx_t_5numpy_int_t)-1 < 0); break;
- case 'l': ok = (sizeof(__pyx_t_5numpy_int_t) == sizeof(long) && (__pyx_t_5numpy_int_t)-1 < 0); break;
- case 'q': ok = (sizeof(__pyx_t_5numpy_int_t) == sizeof(long long) && (__pyx_t_5numpy_int_t)-1 < 0); break; default: ok = 0;
- }
- if (!ok) {
- PyErr_Format(PyExc_ValueError, "Buffer datatype mismatch (rejecting on '%s')", ts);
- return NULL;
- } else return ts + 1;
-
+
+static INLINE void __Pyx_SafeReleaseBuffer(Py_buffer* info) {
+ if (info->buf == NULL) return;
+ if (info->suboffsets == __Pyx_minusones) info->suboffsets = NULL;
+ __Pyx_ReleaseBuffer(info);
}
-static int __Pyx_GetBuffer_nn___pyx_t_5numpy_int_t(PyObject* obj, Py_buffer* buf, int flags, int nd) {
- const char* ts;
- if (obj == Py_None) {
- __Pyx_ZeroBuffer(buf);
+static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
+ PyObject *tmp_type, *tmp_value, *tmp_tb;
+ PyThreadState *tstate = PyThreadState_GET();
+
+#if PY_MAJOR_VERSION >= 3
+ /* Note: this is a temporary work-around to prevent crashes in Python 3.0 */
+ if ((tstate->exc_type != NULL) & (tstate->exc_type != Py_None)) {
+ tmp_type = tstate->exc_type;
+ tmp_value = tstate->exc_value;
+ tmp_tb = tstate->exc_traceback;
+ PyErr_NormalizeException(&type, &value, &tb);
+ PyErr_NormalizeException(&tmp_type, &tmp_value, &tmp_tb);
+ tstate->exc_type = 0;
+ tstate->exc_value = 0;
+ tstate->exc_traceback = 0;
+ PyException_SetContext(value, tmp_value);
+ Py_DECREF(tmp_type);
+ Py_XDECREF(tmp_tb);
+ }
+#endif
+
+ tmp_type = tstate->curexc_type;
+ tmp_value = tstate->curexc_value;
+ tmp_tb = tstate->curexc_traceback;
+ tstate->curexc_type = type;
+ tstate->curexc_value = value;
+ tstate->curexc_traceback = tb;
+ Py_XDECREF(tmp_type);
+ Py_XDECREF(tmp_value);
+ Py_XDECREF(tmp_tb);
+}
+
+static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
+ PyThreadState *tstate = PyThreadState_GET();
+ *type = tstate->curexc_type;
+ *value = tstate->curexc_value;
+ *tb = tstate->curexc_traceback;
+
+ tstate->curexc_type = 0;
+ tstate->curexc_value = 0;
+ tstate->curexc_traceback = 0;
+}
+
+
+
+static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
+ if (!type) {
+ PyErr_Format(PyExc_SystemError, "Missing type object");
+ return 0;
+ }
+ if (obj == Py_None || PyObject_TypeCheck(obj, type))
+ return 1;
+ PyErr_Format(PyExc_TypeError, "Cannot convert %s to %s",
+ Py_TYPE(obj)->tp_name, type->tp_name);
return 0;
- }
- buf->buf = NULL;
- if (__Pyx_GetBuffer(obj, buf, flags) == -1) goto fail;
- if (buf->ndim != nd) {
- __Pyx_BufferNdimError(buf, nd);
- goto fail;
- }
- ts = buf->format;
- ts = __Pyx_ConsumeWhitespace(ts);
- ts = __Pyx_BufferTypestringCheckEndian(ts);
- if (!ts) goto fail;
- ts = __Pyx_ConsumeWhitespace(ts);
- ts = __Pyx_BufferTypestringCheck_item_nn___pyx_t_5numpy_int_t(ts);
- if (!ts) goto fail;
- ts = __Pyx_ConsumeWhitespace(ts);
- if (*ts != 0) {
- PyErr_Format(PyExc_ValueError,
- "Expected non-struct buffer data type (expected end, got '%s')", ts);
- goto fail;
- }
- if (buf->suboffsets == NULL) buf->suboffsets = __Pyx_minusones;
- return 0;
-fail:;
- __Pyx_ZeroBuffer(buf);
- return -1;
}
-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name, int exact) {
+
+static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,
+ const char *name, int exact)
+{
if (!type) {
PyErr_Format(PyExc_SystemError, "Missing type object");
return 0;
@@ -2115,21 +4606,12 @@
return 0;
}
-static INLINE void __Pyx_RaiseArgtupleTooLong(
- Py_ssize_t num_expected,
- Py_ssize_t num_found)
-{
- const char* error_message =
- #if PY_VERSION_HEX < 0x02050000
- "function takes at most %d positional arguments (%d given)";
- #else
- "function takes at most %zd positional arguments (%zd given)";
- #endif
- PyErr_Format(PyExc_TypeError, error_message, num_expected, num_found);
-}
-
-#if (PY_MAJOR_VERSION < 3) && !(Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_NEWBUFFER)
+#if PY_MAJOR_VERSION < 3
static int __Pyx_GetBuffer(PyObject *obj, Py_buffer *view, int flags) {
+ #if PY_VERSION_HEX >= 0x02060000
+ if (Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_NEWBUFFER)
+ return PyObject_GetBuffer(obj, view, flags);
+ #endif
if (PyObject_TypeCheck(obj, __pyx_ptype_5numpy_ndarray)) return __pyx_pf_5numpy_7ndarray___getbuffer__(obj, view, flags);
else {
PyErr_Format(PyExc_TypeError, "'%100s' does not have the buffer interface", Py_TYPE(obj)->tp_name);
@@ -2137,138 +4619,435 @@
}
}
-static void __Pyx_ReleaseBuffer(PyObject *obj, Py_buffer *view) {
+static void __Pyx_ReleaseBuffer(Py_buffer *view) {
+ PyObject* obj = view->obj;
+ if (obj) {
+if (PyObject_TypeCheck(obj, __pyx_ptype_5numpy_ndarray)) __pyx_pf_5numpy_7ndarray___releasebuffer__(obj, view);
+ Py_DECREF(obj);
+ view->obj = NULL;
+ }
+}
+
+#endif
+
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
+ PyObject *__import__ = 0;
+ PyObject *empty_list = 0;
+ PyObject *module = 0;
+ PyObject *global_dict = 0;
+ PyObject *empty_dict = 0;
+ PyObject *list;
+ __import__ = __Pyx_GetAttrString(__pyx_b, "__import__");
+ if (!__import__)
+ 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)
+ goto bad;
+ empty_dict = PyDict_New();
+ if (!empty_dict)
+ goto bad;
+ module = PyObject_CallFunctionObjArgs(__import__,
+ name, global_dict, empty_dict, list, NULL);
+bad:
+ Py_XDECREF(empty_list);
+ Py_XDECREF(__import__);
+ Py_XDECREF(empty_dict);
+ return module;
+}
+
+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {
+ PyObject *result;
+ result = PyObject_GetAttr(dict, name);
+ if (!result)
+ PyErr_SetObject(PyExc_NameError, name);
+ return result;
+}
+
+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
+ 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;
+ Py_INCREF(value);
+ }
+ #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) {
+ 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
+ }
+ __Pyx_ErrRestore(type, value, tb);
+ return;
+raise_error:
+ Py_XDECREF(value);
+ Py_XDECREF(type);
+ Py_XDECREF(tb);
+ return;
+}
+
+static INLINE int __Pyx_StrEq(const char *s1, const char *s2) {
+ while (*s1 != '\0' && *s1 == *s2) { s1++; s2++; }
+ return *s1 == *s2;
+}
+
+static INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
+ 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()))
+ return (unsigned char)-1;
+ if (unlikely(val < 0)) {
+ PyErr_SetString(PyExc_OverflowError,
+ "can't convert negative value to unsigned char");
+ return (unsigned char)-1;
+ }
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to unsigned char");
+ return (unsigned char)-1;
+ }
+ return (unsigned char)val;
+ }
+ return (unsigned char)__Pyx_PyInt_AsUnsignedLong(x);
+}
+
+static INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
+ 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()))
+ return (unsigned short)-1;
+ if (unlikely(val < 0)) {
+ PyErr_SetString(PyExc_OverflowError,
+ "can't convert negative value to unsigned short");
+ return (unsigned short)-1;
+ }
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to unsigned short");
+ return (unsigned short)-1;
+ }
+ return (unsigned short)val;
+ }
+ return (unsigned short)__Pyx_PyInt_AsUnsignedLong(x);
+}
+
+static INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
+ 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()))
+ return (unsigned int)-1;
+ if (unlikely(val < 0)) {
+ PyErr_SetString(PyExc_OverflowError,
+ "can't convert negative value to unsigned int");
+ return (unsigned int)-1;
+ }
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to unsigned int");
+ return (unsigned int)-1;
+ }
+ return (unsigned int)val;
+ }
+ return (unsigned int)__Pyx_PyInt_AsUnsignedLong(x);
+}
+
+static INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
+ if (sizeof(char) < sizeof(long)) {
+ long val = __Pyx_PyInt_AsLong(x);
+ if (unlikely(val != (long)(char)val)) {
+ if (unlikely(val == -1 && PyErr_Occurred()))
+ return (char)-1;
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to char");
+ return (char)-1;
+ }
+ return (char)val;
+ }
+ return (char)__Pyx_PyInt_AsLong(x);
+}
+
+static INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
+ if (sizeof(short) < sizeof(long)) {
+ long val = __Pyx_PyInt_AsLong(x);
+ if (unlikely(val != (long)(short)val)) {
+ if (unlikely(val == -1 && PyErr_Occurred()))
+ return (short)-1;
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to short");
+ return (short)-1;
+ }
+ return (short)val;
+ }
+ return (short)__Pyx_PyInt_AsLong(x);
+}
+
+static INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
+ if (sizeof(int) < sizeof(long)) {
+ long val = __Pyx_PyInt_AsLong(x);
+ if (unlikely(val != (long)(int)val)) {
+ if (unlikely(val == -1 && PyErr_Occurred()))
+ return (int)-1;
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to int");
+ return (int)-1;
+ }
+ return (int)val;
+ }
+ return (int)__Pyx_PyInt_AsLong(x);
+}
+
+static INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
+ 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()))
+ return (signed char)-1;
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to signed char");
+ return (signed char)-1;
+ }
+ return (signed char)val;
+ }
+ return (signed char)__Pyx_PyInt_AsSignedLong(x);
+}
+
+static INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
+ 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()))
+ return (signed short)-1;
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to signed short");
+ return (signed short)-1;
+ }
+ return (signed short)val;
+ }
+ return (signed short)__Pyx_PyInt_AsSignedLong(x);
+}
+
+static INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
+ 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()))
+ return (signed int)-1;
+ PyErr_SetString(PyExc_OverflowError,
+ "value too large to convert to signed int");
+ return (signed int)-1;
+ }
+ return (signed int)val;
+ }
+ return (signed int)__Pyx_PyInt_AsSignedLong(x);
+}
+
+static INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
+#if PY_VERSION_HEX < 0x03000000
+ if (likely(PyInt_CheckExact(x) || PyInt_Check(x))) {
+ long val = PyInt_AS_LONG(x);
+ if (unlikely(val < 0)) {
+ PyErr_SetString(PyExc_OverflowError,
+ "can't convert negative value to unsigned long");
+ return (unsigned long)-1;
+ }
+ return (unsigned long)val;
+ } else
+#endif
+ if (likely(PyLong_CheckExact(x) || PyLong_Check(x))) {
+ 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 {
+ 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 INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
+#if PY_VERSION_HEX < 0x03000000
+ if (likely(PyInt_CheckExact(x) || PyInt_Check(x))) {
+ long val = PyInt_AS_LONG(x);
+ if (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
+#endif
+ if (likely(PyLong_CheckExact(x) || PyLong_Check(x))) {
+ 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 {
+ 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;
+ }
+}
+static INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
+#if PY_VERSION_HEX < 0x03000000
+ if (likely(PyInt_CheckExact(x) || PyInt_Check(x))) {
+ long val = PyInt_AS_LONG(x);
+ return (long)val;
+ } else
+#endif
+ if (likely(PyLong_CheckExact(x) || PyLong_Check(x))) {
+ return PyLong_AsLong(x);
+ } else {
+ long val;
+ PyObject *tmp = __Pyx_PyNumber_Int(x);
+ if (!tmp) return (long)-1;
+ val = __Pyx_PyInt_AsLong(tmp);
+ Py_DECREF(tmp);
+ return val;
+ }
}
+static INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
+#if PY_VERSION_HEX < 0x03000000
+ if (likely(PyInt_CheckExact(x) || PyInt_Check(x))) {
+ long val = PyInt_AS_LONG(x);
+ return (PY_LONG_LONG)val;
+ } else
#endif
-
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
- PyObject *__import__ = 0;
- PyObject *empty_list = 0;
- PyObject *module = 0;
- PyObject *global_dict = 0;
- PyObject *empty_dict = 0;
- PyObject *list;
- __import__ = PyObject_GetAttrString(__pyx_b, "__import__");
- if (!__import__)
- goto bad;
- if (from_list)
- list = from_list;
- else {
- empty_list = PyList_New(0);
- if (!empty_list)
- goto bad;
- list = empty_list;
+ if (likely(PyLong_CheckExact(x) || PyLong_Check(x))) {
+ 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;
}
- global_dict = PyModule_GetDict(__pyx_m);
- if (!global_dict)
- goto bad;
- empty_dict = PyDict_New();
- if (!empty_dict)
- goto bad;
- module = PyObject_CallFunction(__import__, "OOOO",
- name, global_dict, empty_dict, list);
-bad:
- Py_XDECREF(empty_list);
- Py_XDECREF(__import__);
- Py_XDECREF(empty_dict);
- return module;
}
-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {
- PyObject *result;
- result = PyObject_GetAttr(dict, name);
- if (!result)
- PyErr_SetObject(PyExc_NameError, name);
- return result;
+static INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
+#if PY_VERSION_HEX < 0x03000000
+ if (likely(PyInt_CheckExact(x) || PyInt_Check(x))) {
+ long val = PyInt_AS_LONG(x);
+ return (signed long)val;
+ } else
+#endif
+ if (likely(PyLong_CheckExact(x) || PyLong_Check(x))) {
+ return PyLong_AsLong(x);
+ } else {
+ signed long val;
+ PyObject *tmp = __Pyx_PyNumber_Int(x);
+ if (!tmp) return (signed long)-1;
+ val = __Pyx_PyInt_AsSignedLong(tmp);
+ Py_DECREF(tmp);
+ return val;
+ }
}
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
- 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;
- Py_INCREF(value);
- }
- #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) {
- 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
+static INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
+#if PY_VERSION_HEX < 0x03000000
+ if (likely(PyInt_CheckExact(x) || PyInt_Check(x))) {
+ long val = PyInt_AS_LONG(x);
+ return (signed PY_LONG_LONG)val;
+ } else
+#endif
+ if (likely(PyLong_CheckExact(x) || PyLong_Check(x))) {
+ return PyLong_AsLongLong(x);
+ } 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;
}
- PyErr_Restore(type, value, tb);
- return;
-raise_error:
- Py_XDECREF(value);
- Py_XDECREF(type);
- Py_XDECREF(tb);
- return;
}
#ifndef __PYX_HAVE_RT_ImportType
#define __PYX_HAVE_RT_ImportType
-static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name,
+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name,
long size)
{
PyObject *py_module = 0;
PyObject *result = 0;
PyObject *py_name = 0;
+ py_module = __Pyx_ImportModule(module_name);
+ if (!py_module)
+ goto bad;
#if PY_MAJOR_VERSION < 3
- py_name = PyString_FromString(module_name);
+ py_name = PyString_FromString(class_name);
#else
- py_name = PyUnicode_FromString(module_name);
+ py_name = PyUnicode_FromString(class_name);
#endif
if (!py_name)
goto bad;
-
- py_module = __Pyx_ImportModule(module_name);
- if (!py_module)
- goto bad;
- result = PyObject_GetAttrString(py_module, class_name);
+ 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)) {
@@ -2285,7 +5064,7 @@
}
return (PyTypeObject *)result;
bad:
- Py_XDECREF(py_name);
+ Py_XDECREF(py_module);
Py_XDECREF(result);
return 0;
}
@@ -2293,7 +5072,7 @@
#ifndef __PYX_HAVE_RT_ImportModule
#define __PYX_HAVE_RT_ImportModule
-static PyObject *__Pyx_ImportModule(char *name) {
+static PyObject *__Pyx_ImportModule(const char *name) {
PyObject *py_name = 0;
PyObject *py_module = 0;
@@ -2375,7 +5154,7 @@
);
if (!py_code) goto bad;
py_frame = PyFrame_New(
- PyThreadState_Get(), /*PyThreadState *tstate,*/
+ PyThreadState_GET(), /*PyThreadState *tstate,*/
py_code, /*PyCodeObject *code,*/
py_globals, /*PyObject *globals,*/
0 /*PyObject *locals*/
@@ -2419,221 +5198,91 @@
/* Type Conversion Functions */
-static INLINE Py_ssize_t __pyx_PyIndex_AsSsize_t(PyObject* b) {
- Py_ssize_t ival;
- PyObject* x = PyNumber_Index(b);
- if (!x) return -1;
- ival = PyInt_AsSsize_t(x);
- Py_DECREF(x);
- return ival;
-}
-
static INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
if (x == Py_True) return 1;
- else if (x == Py_False) return 0;
+ else if ((x == Py_False) | (x == Py_None)) return 0;
else return PyObject_IsTrue(x);
}
-static INLINE PY_LONG_LONG __pyx_PyInt_AsLongLong(PyObject* x) {
- if (PyInt_CheckExact(x)) {
- return PyInt_AS_LONG(x);
- }
- else if (PyLong_CheckExact(x)) {
- return PyLong_AsLongLong(x);
- }
- else {
- PY_LONG_LONG val;
- PyObject* tmp = PyNumber_Int(x); if (!tmp) return (PY_LONG_LONG)-1;
- val = __pyx_PyInt_AsLongLong(tmp);
- Py_DECREF(tmp);
- return val;
- }
-}
-
-static INLINE unsigned PY_LONG_LONG __pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
- if (PyInt_CheckExact(x)) {
- long val = PyInt_AS_LONG(x);
- if (unlikely(val < 0)) {
- PyErr_SetString(PyExc_TypeError, "Negative assignment to unsigned type.");
- return (unsigned PY_LONG_LONG)-1;
- }
- return val;
- }
- else if (PyLong_CheckExact(x)) {
- return PyLong_AsUnsignedLongLong(x);
- }
- else {
- PY_LONG_LONG val;
- PyObject* tmp = PyNumber_Int(x); if (!tmp) return (PY_LONG_LONG)-1;
- val = __pyx_PyInt_AsUnsignedLongLong(tmp);
- Py_DECREF(tmp);
- return val;
- }
-}
-
-
-static INLINE unsigned char __pyx_PyInt_unsigned_char(PyObject* x) {
- if (sizeof(unsigned char) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- unsigned char val = (unsigned char)long_val;
- if (unlikely((val != long_val) || (long_val < 0))) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to unsigned char");
- return (unsigned char)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
-}
-
-static INLINE unsigned short __pyx_PyInt_unsigned_short(PyObject* x) {
- if (sizeof(unsigned short) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- unsigned short val = (unsigned short)long_val;
- if (unlikely((val != long_val) || (long_val < 0))) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to unsigned short");
- return (unsigned short)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
-}
-
-static INLINE char __pyx_PyInt_char(PyObject* x) {
- if (sizeof(char) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- char val = (char)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to char");
- return (char)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
-}
-
-static INLINE short __pyx_PyInt_short(PyObject* x) {
- if (sizeof(short) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- short val = (short)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to short");
- return (short)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
-}
-
-static INLINE int __pyx_PyInt_int(PyObject* x) {
- if (sizeof(int) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- int val = (int)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to int");
- return (int)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
-}
-
-static INLINE long __pyx_PyInt_long(PyObject* x) {
- if (sizeof(long) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- long val = (long)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to long");
- return (long)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
-}
-
-static INLINE signed char __pyx_PyInt_signed_char(PyObject* x) {
- if (sizeof(signed char) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- signed char val = (signed char)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to signed char");
- return (signed char)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
+static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
+ PyNumberMethods *m;
+ const char *name = NULL;
+ PyObject *res = NULL;
+#if PY_VERSION_HEX < 0x03000000
+ if (PyInt_Check(x) || PyLong_Check(x))
+#else
+ if (PyLong_Check(x))
+#endif
+ return Py_INCREF(x), x;
+ m = Py_TYPE(x)->tp_as_number;
+#if PY_VERSION_HEX < 0x03000000
+ if (m && m->nb_int) {
+ name = "int";
+ res = PyNumber_Int(x);
+ }
+ else if (m && m->nb_long) {
+ name = "long";
+ res = PyNumber_Long(x);
+ }
+#else
+ if (m && m->nb_int) {
+ name = "int";
+ res = PyNumber_Long(x);
+ }
+#endif
+ if (res) {
+#if PY_VERSION_HEX < 0x03000000
+ if (!PyInt_Check(res) && !PyLong_Check(res)) {
+#else
+ if (!PyLong_Check(res)) {
+#endif
+ PyErr_Format(PyExc_TypeError,
+ "__%s__ returned non-%s (type %.200s)",
+ name, name, Py_TYPE(res)->tp_name);
+ Py_DECREF(res);
+ return NULL;
}
+ }
+ else if (!PyErr_Occurred()) {
+ PyErr_SetString(PyExc_TypeError,
+ "an integer is required");
+ }
+ return res;
}
-static INLINE signed short __pyx_PyInt_signed_short(PyObject* x) {
- if (sizeof(signed short) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- signed short val = (signed short)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to signed short");
- return (signed short)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
+static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
+ Py_ssize_t ival;
+ PyObject* x = PyNumber_Index(b);
+ if (!x) return -1;
+ ival = PyInt_AsSsize_t(x);
+ Py_DECREF(x);
+ return ival;
}
-static INLINE signed int __pyx_PyInt_signed_int(PyObject* x) {
- if (sizeof(signed int) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- signed int val = (signed int)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to signed int");
- return (signed int)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
+static 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);
+#endif
}
-static INLINE signed long __pyx_PyInt_signed_long(PyObject* x) {
- if (sizeof(signed long) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- signed long val = (signed long)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to signed long");
- return (signed long)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
+static 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 INLINE long double __pyx_PyInt_long_double(PyObject* x) {
- if (sizeof(long double) < sizeof(long)) {
- long long_val = __pyx_PyInt_AsLong(x);
- long double val = (long double)long_val;
- if (unlikely((val != long_val) )) {
- PyErr_SetString(PyExc_OverflowError, "value too large to convert to long double");
- return (long double)-1;
- }
- return val;
- }
- else {
- return __pyx_PyInt_AsLong(x);
- }
-}
Modified: trunk/yt/lagos/Interpolators.pyx
==============================================================================
--- trunk/yt/lagos/Interpolators.pyx (original)
+++ trunk/yt/lagos/Interpolators.pyx Mon Aug 24 18:01:19 2009
@@ -38,8 +38,9 @@
for i in range(x_vals.shape[0]):
x_i = x_is[i]
x = x_vals[i]
- xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
+ dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ xp = (x - x_bins[x_i]) * dx_inv
+ xm = (x_bins[x_i+1] - x) * dx_inv
output[i] = table[x_i ] * (xm) \
+ table[x_i+1] * (xp)
@@ -54,16 +55,19 @@
np.ndarray[np.float64_t, ndim=1] output):
cdef double x, xp, xm
cdef double y, yp, ym
+ cdef double dx_inv, dy_inv
cdef int i, x_i, y_i
for i in range(x_vals.shape[0]):
x_i = x_is[i]
y_i = y_is[i]
x = x_vals[i]
y = y_vals[i]
- xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
+ dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ xp = (x - x_bins[x_i]) * dx_inv
+ yp = (y - y_bins[y_i]) * dy_inv
+ xm = (x_bins[x_i+1] - x) * dx_inv
+ ym = (y_bins[y_i+1] - y) * dy_inv
output[i] = table[x_i , y_i ] * (xm*ym) \
+ table[x_i+1, y_i ] * (xp*ym) \
+ table[x_i , y_i+1] * (xm*yp) \
@@ -84,6 +88,7 @@
cdef double x, xp, xm
cdef double y, yp, ym
cdef double z, zp, zm
+ cdef double dx_inv, dy_inv, dz_inv
cdef int i, x_i, y_i, z_i
for i in range(x_vals.shape[0]):
x_i = x_is[i]
@@ -92,12 +97,15 @@
x = x_vals[i]
y = y_vals[i]
z = z_vals[i]
- xp = (x - x_bins[x_i]) / (x_bins[x_i+1] - x_bins[x_i])
- yp = (y - y_bins[y_i]) / (y_bins[y_i+1] - y_bins[y_i])
- zp = (z - z_bins[z_i]) / (z_bins[z_i+1] - z_bins[z_i])
- xm = (x_bins[x_i+1] - x) / (x_bins[x_i+1] - x_bins[x_i])
- ym = (y_bins[y_i+1] - y) / (y_bins[y_i+1] - y_bins[y_i])
- zm = (z_bins[z_i+1] - z) / (z_bins[z_i+1] - z_bins[z_i])
+ dx_inv = 1.0 / (x_bins[x_i+1] - x_bins[x_i])
+ dy_inv = 1.0 / (y_bins[y_i+1] - y_bins[y_i])
+ dz_inv = 1.0 / (z_bins[z_i+1] - z_bins[z_i])
+ xp = (x - x_bins[x_i]) * dx_inv
+ yp = (y - y_bins[y_i]) * dy_inv
+ zp = (z - z_bins[z_i]) * dz_inv
+ xm = (x_bins[x_i+1] - x) * dx_inv
+ ym = (y_bins[y_i+1] - y) * dy_inv
+ zm = (z_bins[z_i+1] - z) * dz_inv
output[i] = table[x_i ,y_i ,z_i ] * (xm*ym*zm) \
+ table[x_i+1,y_i ,z_i ] * (xp*ym*zm) \
+ table[x_i ,y_i+1,z_i ] * (xm*yp*zm) \
More information about the yt-svn
mailing list