Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

STY: Remove support for versions of numpy < 1.

  • Loading branch information...
commit fb35bc4bd808d905f7ce92f419ba97b3d09a05b9 1 parent 8fce1e6
@charris charris authored
View
31 scipy/sparse/sparsetools/bsr_wrap.cxx
@@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(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.
*/
const char* pytype_string(PyObject* py_obj) {
View
31 scipy/sparse/sparsetools/coo_wrap.cxx
@@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(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.
*/
const char* pytype_string(PyObject* py_obj) {
View
31 scipy/sparse/sparsetools/csc_wrap.cxx
@@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(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.
*/
const char* pytype_string(PyObject* py_obj) {
View
31 scipy/sparse/sparsetools/csgraph_wrap.cxx
@@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(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.
*/
const char* pytype_string(PyObject* py_obj) {
View
31 scipy/sparse/sparsetools/csr_wrap.cxx
@@ -2866,37 +2866,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(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.
*/
const char* pytype_string(PyObject* py_obj) {
View
31 scipy/sparse/sparsetools/dia_wrap.cxx
@@ -2852,37 +2852,6 @@ namespace swig {
#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(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.
*/
const char* pytype_string(PyObject* py_obj) {
Please sign in to comment.
Something went wrong with that request. Please try again.