Skip to content

Commit

Permalink
STY: Remove support for versions of numpy < 1.
Browse files Browse the repository at this point in the history
  • Loading branch information
@charris
charris committed Feb 4, 2012
1 parent 8fce1e6 commit fb35bc4
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 186 deletions.
31 changes: 0 additions & 31 deletions scipy/sparse/sparsetools/bsr_wrap.cxx
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a)) #define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a))
#define array_is_native(a) (PyArray_ISNOTSWAPPED(a)) #define array_is_native(a) (PyArray_ISNOTSWAPPED(a))


/* Support older NumPy data type names
*/
#if NDARRAY_VERSION < 0x01000000
#define NPY_BOOL PyArray_BOOL
#define NPY_BYTE PyArray_BYTE
#define NPY_UBYTE PyArray_UBYTE
#define NPY_SHORT PyArray_SHORT
#define NPY_USHORT PyArray_USHORT
#define NPY_INT PyArray_INT
#define NPY_UINT PyArray_UINT
#define NPY_LONG PyArray_LONG
#define NPY_ULONG PyArray_ULONG
#define NPY_LONGLONG PyArray_LONGLONG
#define NPY_ULONGLONG PyArray_ULONGLONG
#define NPY_FLOAT PyArray_FLOAT
#define NPY_DOUBLE PyArray_DOUBLE
#define NPY_LONGDOUBLE PyArray_LONGDOUBLE
#define NPY_CFLOAT PyArray_CFLOAT
#define NPY_CDOUBLE PyArray_CDOUBLE
#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
#define NPY_OBJECT PyArray_OBJECT
#define NPY_STRING PyArray_STRING
#define NPY_UNICODE PyArray_UNICODE
#define NPY_VOID PyArray_VOID
#define NPY_NTYPES PyArray_NTYPES
#define NPY_NOTYPE PyArray_NOTYPE
#define NPY_CHAR PyArray_CHAR
#define NPY_USERDEF PyArray_USERDEF
#define npy_intp intp
#endif

/* Given a PyObject, return a string describing its type. /* Given a PyObject, return a string describing its type.
*/ */
const char* pytype_string(PyObject* py_obj) { const char* pytype_string(PyObject* py_obj) {
Expand Down
31 changes: 0 additions & 31 deletions scipy/sparse/sparsetools/coo_wrap.cxx
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a)) #define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a))
#define array_is_native(a) (PyArray_ISNOTSWAPPED(a)) #define array_is_native(a) (PyArray_ISNOTSWAPPED(a))


/* Support older NumPy data type names
*/
#if NDARRAY_VERSION < 0x01000000
#define NPY_BOOL PyArray_BOOL
#define NPY_BYTE PyArray_BYTE
#define NPY_UBYTE PyArray_UBYTE
#define NPY_SHORT PyArray_SHORT
#define NPY_USHORT PyArray_USHORT
#define NPY_INT PyArray_INT
#define NPY_UINT PyArray_UINT
#define NPY_LONG PyArray_LONG
#define NPY_ULONG PyArray_ULONG
#define NPY_LONGLONG PyArray_LONGLONG
#define NPY_ULONGLONG PyArray_ULONGLONG
#define NPY_FLOAT PyArray_FLOAT
#define NPY_DOUBLE PyArray_DOUBLE
#define NPY_LONGDOUBLE PyArray_LONGDOUBLE
#define NPY_CFLOAT PyArray_CFLOAT
#define NPY_CDOUBLE PyArray_CDOUBLE
#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
#define NPY_OBJECT PyArray_OBJECT
#define NPY_STRING PyArray_STRING
#define NPY_UNICODE PyArray_UNICODE
#define NPY_VOID PyArray_VOID
#define NPY_NTYPES PyArray_NTYPES
#define NPY_NOTYPE PyArray_NOTYPE
#define NPY_CHAR PyArray_CHAR
#define NPY_USERDEF PyArray_USERDEF
#define npy_intp intp
#endif

/* Given a PyObject, return a string describing its type. /* Given a PyObject, return a string describing its type.
*/ */
const char* pytype_string(PyObject* py_obj) { const char* pytype_string(PyObject* py_obj) {
Expand Down
31 changes: 0 additions & 31 deletions scipy/sparse/sparsetools/csc_wrap.cxx
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a)) #define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a))
#define array_is_native(a) (PyArray_ISNOTSWAPPED(a)) #define array_is_native(a) (PyArray_ISNOTSWAPPED(a))


/* Support older NumPy data type names
*/
#if NDARRAY_VERSION < 0x01000000
#define NPY_BOOL PyArray_BOOL
#define NPY_BYTE PyArray_BYTE
#define NPY_UBYTE PyArray_UBYTE
#define NPY_SHORT PyArray_SHORT
#define NPY_USHORT PyArray_USHORT
#define NPY_INT PyArray_INT
#define NPY_UINT PyArray_UINT
#define NPY_LONG PyArray_LONG
#define NPY_ULONG PyArray_ULONG
#define NPY_LONGLONG PyArray_LONGLONG
#define NPY_ULONGLONG PyArray_ULONGLONG
#define NPY_FLOAT PyArray_FLOAT
#define NPY_DOUBLE PyArray_DOUBLE
#define NPY_LONGDOUBLE PyArray_LONGDOUBLE
#define NPY_CFLOAT PyArray_CFLOAT
#define NPY_CDOUBLE PyArray_CDOUBLE
#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
#define NPY_OBJECT PyArray_OBJECT
#define NPY_STRING PyArray_STRING
#define NPY_UNICODE PyArray_UNICODE
#define NPY_VOID PyArray_VOID
#define NPY_NTYPES PyArray_NTYPES
#define NPY_NOTYPE PyArray_NOTYPE
#define NPY_CHAR PyArray_CHAR
#define NPY_USERDEF PyArray_USERDEF
#define npy_intp intp
#endif

/* Given a PyObject, return a string describing its type. /* Given a PyObject, return a string describing its type.
*/ */
const char* pytype_string(PyObject* py_obj) { const char* pytype_string(PyObject* py_obj) {
Expand Down
31 changes: 0 additions & 31 deletions scipy/sparse/sparsetools/csgraph_wrap.cxx
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a)) #define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a))
#define array_is_native(a) (PyArray_ISNOTSWAPPED(a)) #define array_is_native(a) (PyArray_ISNOTSWAPPED(a))


/* Support older NumPy data type names
*/
#if NDARRAY_VERSION < 0x01000000
#define NPY_BOOL PyArray_BOOL
#define NPY_BYTE PyArray_BYTE
#define NPY_UBYTE PyArray_UBYTE
#define NPY_SHORT PyArray_SHORT
#define NPY_USHORT PyArray_USHORT
#define NPY_INT PyArray_INT
#define NPY_UINT PyArray_UINT
#define NPY_LONG PyArray_LONG
#define NPY_ULONG PyArray_ULONG
#define NPY_LONGLONG PyArray_LONGLONG
#define NPY_ULONGLONG PyArray_ULONGLONG
#define NPY_FLOAT PyArray_FLOAT
#define NPY_DOUBLE PyArray_DOUBLE
#define NPY_LONGDOUBLE PyArray_LONGDOUBLE
#define NPY_CFLOAT PyArray_CFLOAT
#define NPY_CDOUBLE PyArray_CDOUBLE
#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
#define NPY_OBJECT PyArray_OBJECT
#define NPY_STRING PyArray_STRING
#define NPY_UNICODE PyArray_UNICODE
#define NPY_VOID PyArray_VOID
#define NPY_NTYPES PyArray_NTYPES
#define NPY_NOTYPE PyArray_NOTYPE
#define NPY_CHAR PyArray_CHAR
#define NPY_USERDEF PyArray_USERDEF
#define npy_intp intp
#endif

/* Given a PyObject, return a string describing its type. /* Given a PyObject, return a string describing its type.
*/ */
const char* pytype_string(PyObject* py_obj) { const char* pytype_string(PyObject* py_obj) {
Expand Down
31 changes: 0 additions & 31 deletions scipy/sparse/sparsetools/csr_wrap.cxx
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2866,37 +2866,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a)) #define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a))
#define array_is_native(a) (PyArray_ISNOTSWAPPED(a)) #define array_is_native(a) (PyArray_ISNOTSWAPPED(a))


/* Support older NumPy data type names
*/
#if NDARRAY_VERSION < 0x01000000
#define NPY_BOOL PyArray_BOOL
#define NPY_BYTE PyArray_BYTE
#define NPY_UBYTE PyArray_UBYTE
#define NPY_SHORT PyArray_SHORT
#define NPY_USHORT PyArray_USHORT
#define NPY_INT PyArray_INT
#define NPY_UINT PyArray_UINT
#define NPY_LONG PyArray_LONG
#define NPY_ULONG PyArray_ULONG
#define NPY_LONGLONG PyArray_LONGLONG
#define NPY_ULONGLONG PyArray_ULONGLONG
#define NPY_FLOAT PyArray_FLOAT
#define NPY_DOUBLE PyArray_DOUBLE
#define NPY_LONGDOUBLE PyArray_LONGDOUBLE
#define NPY_CFLOAT PyArray_CFLOAT
#define NPY_CDOUBLE PyArray_CDOUBLE
#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
#define NPY_OBJECT PyArray_OBJECT
#define NPY_STRING PyArray_STRING
#define NPY_UNICODE PyArray_UNICODE
#define NPY_VOID PyArray_VOID
#define NPY_NTYPES PyArray_NTYPES
#define NPY_NOTYPE PyArray_NOTYPE
#define NPY_CHAR PyArray_CHAR
#define NPY_USERDEF PyArray_USERDEF
#define npy_intp intp
#endif

/* Given a PyObject, return a string describing its type. /* Given a PyObject, return a string describing its type.
*/ */
const char* pytype_string(PyObject* py_obj) { const char* pytype_string(PyObject* py_obj) {
Expand Down
31 changes: 0 additions & 31 deletions scipy/sparse/sparsetools/dia_wrap.cxx
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a)) #define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a))
#define array_is_native(a) (PyArray_ISNOTSWAPPED(a)) #define array_is_native(a) (PyArray_ISNOTSWAPPED(a))


/* Support older NumPy data type names
*/
#if NDARRAY_VERSION < 0x01000000
#define NPY_BOOL PyArray_BOOL
#define NPY_BYTE PyArray_BYTE
#define NPY_UBYTE PyArray_UBYTE
#define NPY_SHORT PyArray_SHORT
#define NPY_USHORT PyArray_USHORT
#define NPY_INT PyArray_INT
#define NPY_UINT PyArray_UINT
#define NPY_LONG PyArray_LONG
#define NPY_ULONG PyArray_ULONG
#define NPY_LONGLONG PyArray_LONGLONG
#define NPY_ULONGLONG PyArray_ULONGLONG
#define NPY_FLOAT PyArray_FLOAT
#define NPY_DOUBLE PyArray_DOUBLE
#define NPY_LONGDOUBLE PyArray_LONGDOUBLE
#define NPY_CFLOAT PyArray_CFLOAT
#define NPY_CDOUBLE PyArray_CDOUBLE
#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE
#define NPY_OBJECT PyArray_OBJECT
#define NPY_STRING PyArray_STRING
#define NPY_UNICODE PyArray_UNICODE
#define NPY_VOID PyArray_VOID
#define NPY_NTYPES PyArray_NTYPES
#define NPY_NOTYPE PyArray_NOTYPE
#define NPY_CHAR PyArray_CHAR
#define NPY_USERDEF PyArray_USERDEF
#define npy_intp intp
#endif

/* Given a PyObject, return a string describing its type. /* Given a PyObject, return a string describing its type.
*/ */
const char* pytype_string(PyObject* py_obj) { const char* pytype_string(PyObject* py_obj) {
Expand Down

0 comments on commit fb35bc4

Please sign in to comment.