update headers

Author: AustinDeric

stl_tools/numpy_include/numpy/__multiarray_api.h

@@ -16,8 +16,7 @@ extern NPY_NO_EXPORT PyTypeObject PyBigArray_Type;
 
 extern NPY_NO_EXPORT PyTypeObject PyArray_Type;
 
-extern NPY_NO_EXPORT PyArray_DTypeMeta PyArrayDescr_TypeFull;
-#define PyArrayDescr_Type (*(PyTypeObject *)(&PyArrayDescr_TypeFull))
+extern NPY_NO_EXPORT PyTypeObject PyArrayDescr_Type;
 
 extern NPY_NO_EXPORT PyTypeObject PyArrayFlags_Type;
 
@@ -568,7 +567,7 @@ NPY_NO_EXPORT  PyArrayObject * PyArray_EinsteinSum \
 NPY_NO_EXPORT NPY_STEALS_REF_TO_ARG(3) NPY_GCC_NONNULL(1) PyObject * PyArray_NewLikeArray \
        (PyArrayObject *, NPY_ORDER, PyArray_Descr *, int);
 NPY_NO_EXPORT  int PyArray_GetArrayParamsFromObject \
-       (PyObject *NPY_UNUSED(op), PyArray_Descr *NPY_UNUSED(requested_dtype), npy_bool NPY_UNUSED(writeable), PyArray_Descr **NPY_UNUSED(out_dtype), int *NPY_UNUSED(out_ndim), npy_intp *NPY_UNUSED(out_dims), PyArrayObject **NPY_UNUSED(out_arr), PyObject *NPY_UNUSED(context));
+       (PyObject *, PyArray_Descr *, npy_bool, PyArray_Descr **, int *, npy_intp *, PyArrayObject **, PyObject *);
 NPY_NO_EXPORT  int PyArray_ConvertClipmodeSequence \
        (PyObject *, NPY_CLIPMODE *, int);
 NPY_NO_EXPORT  PyObject * PyArray_MatrixProduct2 \
@@ -1383,7 +1382,7 @@ static void **PyArray_API=NULL;
         (*(PyObject * (*)(PyArrayObject *, NPY_ORDER, PyArray_Descr *, int)) \
          PyArray_API[277])
 #define PyArray_GetArrayParamsFromObject \
-        (*(int (*)(PyObject *NPY_UNUSED(op), PyArray_Descr *NPY_UNUSED(requested_dtype), npy_bool NPY_UNUSED(writeable), PyArray_Descr **NPY_UNUSED(out_dtype), int *NPY_UNUSED(out_ndim), npy_intp *NPY_UNUSED(out_dims), PyArrayObject **NPY_UNUSED(out_arr), PyObject *NPY_UNUSED(context))) \
+        (*(int (*)(PyObject *, PyArray_Descr *, npy_bool, PyArray_Descr **, int *, npy_intp *, PyArrayObject **, PyObject *)) \
          PyArray_API[278])
 #define PyArray_ConvertClipmodeSequence \
         (*(int (*)(PyObject *, NPY_CLIPMODE *, int)) \

stl_tools/numpy_include/numpy/_numpyconfig.h

@@ -25,7 +25,7 @@
 #define NPY_USE_C99_FORMATS 1
 #define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden")))
 #define NPY_ABI_VERSION 0x01000009
-#define NPY_API_VERSION 0x0000000E
+#define NPY_API_VERSION 0x0000000D
 
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS 1

stl_tools/numpy_include/numpy/arrayscalars.h

@@ -134,12 +134,12 @@ typedef struct {
         char obval;
 } PyScalarObject;
 
-#define PyStringScalarObject PyBytesObject
+#define PyStringScalarObject PyStringObject
+#define PyStringScalarObject PyStringObject
 typedef struct {
         /* note that the PyObject_HEAD macro lives right here */
         PyUnicodeObject base;
         Py_UCS4 *obval;
-        char *buffer_fmt;
 } PyUnicodeScalarObject;
 
 
@@ -149,7 +149,6 @@ typedef struct {
         PyArray_Descr *descr;
         int flags;
         PyObject *base;
-        void *_buffer_info;  /* private buffer info, tagged to allow warning */
 } PyVoidScalarObject;
 
 /* Macros

stl_tools/numpy_include/numpy/multiarray_api.txt

@@ -1634,12 +1634,7 @@ Makes a copy of the iterator
   int
   NpyIter_Deallocate(NpyIter *iter)
 
-Deallocate an iterator.
-
-To correctly work when an error is in progress, we have to check
-`PyErr_Occurred()`. This is necessary when buffers are not finalized
-or WritebackIfCopy is used. We could avoid that check by exposing a new
-function which is passed in whether or not a Python error is already set.
+Deallocate an iterator
 
 ::
 
@@ -1687,14 +1682,10 @@ This function may be safely called without holding the Python GIL.
 
 Resets the iterator to its initial state
 
-The use of errmsg is discouraged, it cannot be guaranteed that the GIL
-will not be grabbed on casting errors even when this is passed.
-
 If errmsg is non-NULL, it should point to a variable which will
 receive the error message, and no Python exception will be set.
 This is so that the function can be called from code not holding
-the GIL. Note that cast errors may still lead to the GIL being
-grabbed temporarily.
+the GIL.
 
 ::
 
@@ -1708,8 +1699,7 @@ This function requires great caution.
 If errmsg is non-NULL, it should point to a variable which will
 receive the error message, and no Python exception will be set.
 This is so that the function can be called from code not holding
-the GIL. Note that cast errors may still lead to the GIL being
-grabbed temporarily.
+the GIL.
 
 ::
 
@@ -1722,8 +1712,7 @@ Resets the iterator to a new iterator index range
 If errmsg is non-NULL, it should point to a variable which will
 receive the error message, and no Python exception will be set.
 This is so that the function can be called from code not holding
-the GIL. Note that cast errors may still lead to the GIL being
-grabbed temporarily.
+the GIL.
 
 ::
 
@@ -2180,16 +2169,12 @@ dtype->subarray is true, dtype will be decrefed.
 ::
 
   int
-  PyArray_GetArrayParamsFromObject(PyObject *NPY_UNUSED(op)
-                                   , PyArray_Descr
-                                   *NPY_UNUSED(requested_dtype)
-                                   , npy_bool NPY_UNUSED(writeable)
-                                   , PyArray_Descr
-                                   **NPY_UNUSED(out_dtype) , int
-                                   *NPY_UNUSED(out_ndim) , npy_intp
-                                   *NPY_UNUSED(out_dims) , PyArrayObject
-                                   **NPY_UNUSED(out_arr) , PyObject
-                                   *NPY_UNUSED(context) )
+  PyArray_GetArrayParamsFromObject(PyObject *op, PyArray_Descr
+                                   *requested_dtype, npy_bool
+                                   writeable, PyArray_Descr
+                                   **out_dtype, int *out_ndim, npy_intp
+                                   *out_dims, PyArrayObject
+                                   **out_arr, PyObject *context)
 
 
 ::

stl_tools/numpy_include/numpy/ndarraytypes.h

@@ -210,7 +210,6 @@ typedef enum {
 
 /* For specifying allowed casting in operations which support it */
 typedef enum {
-        _NPY_ERROR_OCCURRED_IN_CAST = -1,
         /* Only allow identical types */
         NPY_NO_CASTING=0,
         /* Allow identical and byte swapped types */
@@ -220,14 +219,7 @@ typedef enum {
         /* Allow safe casts or casts within the same kind */
         NPY_SAME_KIND_CASTING=3,
         /* Allow any casts */
-        NPY_UNSAFE_CASTING=4,
-        /*
-         * Flag to allow signalling that a cast is a view, this flag is not
-         * valid when requesting a cast of specific safety.
-         * _NPY_CAST_IS_VIEW|NPY_EQUIV_CASTING means the same as NPY_NO_CASTING.
-         */
-        // TODO-DTYPES: Needs to be documented.
-        _NPY_CAST_IS_VIEW = 1 << 16,
+        NPY_UNSAFE_CASTING=4
 } NPY_CASTING;
 
 typedef enum {
@@ -349,6 +341,9 @@ struct NpyAuxData_tag {
 #define NPY_ERR(str) fprintf(stderr, #str); fflush(stderr);
 #define NPY_ERR2(str) fprintf(stderr, str); fflush(stderr);
 
+#define NPY_STRINGIFY(x) #x
+#define NPY_TOSTRING(x) NPY_STRINGIFY(x)
+
   /*
    * Macros to define how array, and dimension/strides data is
    * allocated.
@@ -709,7 +704,6 @@ typedef struct tagPyArrayObject_fields {
     int flags;
     /* For weak references */
     PyObject *weakreflist;
-    void *_buffer_info;  /* private buffer info, tagged to allow warning */
 } PyArrayObject_fields;
 
 /*
@@ -729,18 +723,7 @@ typedef struct tagPyArrayObject {
 } PyArrayObject;
 #endif
 
-/*
- * Removed 2020-Nov-25, NumPy 1.20
- * #define NPY_SIZEOF_PYARRAYOBJECT (sizeof(PyArrayObject_fields))
- *
- * The above macro was removed as it gave a false sense of a stable ABI
- * with respect to the structures size.  If you require a runtime constant,
- * you can use `PyArray_Type.tp_basicsize` instead.  Otherwise, please
- * see the PyArrayObject documentation or ask the NumPy developers for
- * information on how to correctly replace the macro in a way that is
- * compatible with multiple NumPy versions.
- */
-
+#define NPY_SIZEOF_PYARRAYOBJECT (sizeof(PyArrayObject_fields))
 
 /* Array Flags Object */
 typedef struct PyArrayFlagsObject {
@@ -1567,15 +1550,11 @@ PyArray_GETITEM(const PyArrayObject *arr, const char *itemptr)
                                         (void *)itemptr, (PyArrayObject *)arr);
 }
 
-/*
- * SETITEM should only be used if it is known that the value is a scalar
- * and of a type understood by the arrays dtype.
- * Use `PyArray_Pack` if the value may be of a different dtype.
- */
 static NPY_INLINE int
 PyArray_SETITEM(PyArrayObject *arr, char *itemptr, PyObject *v)
 {
-    return ((PyArrayObject_fields *)arr)->descr->f->setitem(v, itemptr, arr);
+    return ((PyArrayObject_fields *)arr)->descr->f->setitem(
+                                                        v, itemptr, arr);
 }
 
 #else
@@ -1779,8 +1758,8 @@ typedef struct {
 } npy_stride_sort_item;
 
 /************************************************************
- * This is the form of the struct that's stored in the
- * PyCapsule returned by an array's __array_struct__ attribute. See
+ * This is the form of the struct that's returned pointed by the
+ * PyCObject attribute of an array __array_struct__. See
  * https://docs.scipy.org/doc/numpy/reference/arrays.interface.html for the full
  * documentation.
  ************************************************************/
@@ -1830,107 +1809,6 @@ typedef struct {
 typedef void (PyDataMem_EventHookFunc)(void *inp, void *outp, size_t size,
                                        void *user_data);
 
-
-/*
- * PyArray_DTypeMeta related definitions.
- *
- * As of now, this API is preliminary and will be extended as necessary.
- */
-#if defined(NPY_INTERNAL_BUILD) && NPY_INTERNAL_BUILD
-    /*
-     * The Structures defined in this block are considered private API and
-     * may change without warning!
-     */
-    /* TODO: Make this definition public in the API, as soon as its settled */
-    NPY_NO_EXPORT extern PyTypeObject PyArrayDTypeMeta_Type;
-
-    typedef struct PyArray_DTypeMeta_tag PyArray_DTypeMeta;
-
-    typedef PyArray_Descr *(discover_descr_from_pyobject_function)(
-            PyArray_DTypeMeta *cls, PyObject *obj);
-
-    /*
-     * Before making this public, we should decide whether it should pass
-     * the type, or allow looking at the object. A possible use-case:
-     * `np.array(np.array([0]), dtype=np.ndarray)`
-     * Could consider arrays that are not `dtype=ndarray` "scalars".
-     */
-    typedef int (is_known_scalar_type_function)(
-            PyArray_DTypeMeta *cls, PyTypeObject *obj);
-
-    typedef PyArray_Descr *(default_descr_function)(PyArray_DTypeMeta *cls);
-    typedef PyArray_DTypeMeta *(common_dtype_function)(
-            PyArray_DTypeMeta *dtype1, PyArray_DTypeMeta *dtyep2);
-    typedef PyArray_Descr *(common_instance_function)(
-            PyArray_Descr *dtype1, PyArray_Descr *dtyep2);
-
-    /*
-     * While NumPy DTypes would not need to be heap types the plan is to
-     * make DTypes available in Python at which point they will be heap types.
-     * Since we also wish to add fields to the DType class, this looks like
-     * a typical instance definition, but with PyHeapTypeObject instead of
-     * only the PyObject_HEAD.
-     * This must only be exposed very extremely careful consideration, since
-     * it is a fairly complex construct which may be better to allow
-     * refactoring of.
-     */
-    struct PyArray_DTypeMeta_tag {
-        PyHeapTypeObject super;
-
-        /*
-         * Most DTypes will have a singleton default instance, for the
-         * parametric legacy DTypes (bytes, string, void, datetime) this
-         * may be a pointer to the *prototype* instance?
-         */
-        PyArray_Descr *singleton;
-        /*
-         * Is this DType created using the old API? This exists mainly to
-         * allow for assertions in paths specific to wrapping legacy types.
-         */
-        npy_bool legacy;
-        /* The values stored by a parametric datatype depend on its instance */
-        npy_bool parametric;
-        /* whether the DType can be instantiated (i.e. np.dtype cannot) */
-        npy_bool abstract;
-
-        /*
-         * The following fields replicate the most important dtype information.
-         * In the legacy implementation most of these are stored in the
-         * PyArray_Descr struct.
-         */
-        /* The type object of the scalar instances (may be NULL?) */
-        PyTypeObject *scalar_type;
-        /* kind for this type */
-        char kind;
-        /* unique-character representing this type */
-        char type;
-        /* flags describing data type */
-        char flags;
-        /* number representing this type */
-        int type_num;
-        /*
-         * Point to the original ArrFuncs.
-         * NOTE: We could make a copy to detect changes to `f`.
-         */
-        PyArray_ArrFuncs *f;
-
-        /* DType methods, these could be moved into its own struct */
-        discover_descr_from_pyobject_function *discover_descr_from_pyobject;
-        is_known_scalar_type_function *is_known_scalar_type;
-        default_descr_function *default_descr;
-        common_dtype_function *common_dtype;
-        common_instance_function *common_instance;
-        /*
-         * Dictionary of ArrayMethods representing most possible casts
-         * (structured and object are exceptions).
-         * This should potentially become a weak mapping in the future.
-         */
-        PyObject *castingimpls;
-    };
-
-#endif  /* NPY_INTERNAL_BUILD */
-
-
 /*
  * Use the keyword NPY_DEPRECATED_INCLUDES to ensure that the header files
  * npy_*_*_deprecated_api.h are only included from here and nowhere else.

stl_tools/numpy_include/numpy/npy_1_7_deprecated_api.h

@@ -13,10 +13,11 @@
 #define _WARN___LOC__ __FILE__ "(" _WARN___STR1__(__LINE__) ") : Warning Msg: "
 #pragma message(_WARN___LOC__"Using deprecated NumPy API, disable it with " \
                          "#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION")
-#else
+#elif defined(__GNUC__)
 #warning "Using deprecated NumPy API, disable it with " \
          "#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION"
 #endif
+/* TODO: How to do this warning message for other compilers? */
 #endif
 
 /*

stl_tools/numpy_include/numpy/npy_3kcompat.h

@@ -28,30 +28,6 @@ extern "C" {
  * PyInt -> PyLong
  */
 
-
-/*
- * This is a renamed copy of the Python non-limited API function _PyLong_AsInt. It is
- * included here because it is missing from the PyPy API. It completes the PyLong_As*
- * group of functions and can be useful in replacing PyInt_Check.
- */
-static NPY_INLINE int
-Npy__PyLong_AsInt(PyObject *obj)
-{
-    int overflow;
-    long result = PyLong_AsLongAndOverflow(obj, &overflow);
-
-    /* INT_MAX and INT_MIN are defined in Python.h */
-    if (overflow || result > INT_MAX || result < INT_MIN) {
-        /* XXX: could be cute and give a different
-           message for overflow == -1 */
-        PyErr_SetString(PyExc_OverflowError,
-                        "Python int too large to convert to C int");
-        return -1;
-    }
-    return (int)result;
-}
-
-
 #if defined(NPY_PY3K)
 /* Return True only if the long fits in a C long */
 static NPY_INLINE int PyInt_Check(PyObject *op) {
@@ -63,7 +39,6 @@ static NPY_INLINE int PyInt_Check(PyObject *op) {
     return (overflow == 0);
 }
 
-
 #define PyInt_FromLong PyLong_FromLong
 #define PyInt_AsLong PyLong_AsLong
 #define PyInt_AS_LONG PyLong_AsLong
@@ -87,11 +62,9 @@ static NPY_INLINE int PyInt_Check(PyObject *op) {
 
 #if PY_VERSION_HEX < 0x030900a4
     /* Introduced in https://github.com/python/cpython/commit/d2ec81a8c99796b51fb8c49b77a7fe369863226f */
-    #define Py_SET_TYPE(obj, type) ((Py_TYPE(obj) = (type)), (void)0)
+    #define Py_SET_TYPE(obj, typ) (Py_TYPE(obj) = typ)
     /* Introduced in https://github.com/python/cpython/commit/b10dc3e7a11fcdb97e285882eba6da92594f90f9 */
-    #define Py_SET_SIZE(obj, size) ((Py_SIZE(obj) = (size)), (void)0)
-    /* Introduced in https://github.com/python/cpython/commit/c86a11221df7e37da389f9c6ce6e47ea22dc44ff */
-    #define Py_SET_REFCNT(obj, refcnt) ((Py_REFCNT(obj) = (refcnt)), (void)0)
+    #define Py_SET_SIZE(obj, size) (Py_SIZE(obj) = size)
 #endif