Rebase numpy 1.22.4 patch

Author: msimacek

graalpython/lib-graalpython/patches/numpy/numpy-1.22.4.patch

@@ -1,7 +1,8 @@
-diff -u -r a/numpy/core/src/_simd/_simd_convert.inc b/numpy/core/src/_simd/_simd_convert.inc
---- a/numpy/core/src/_simd/_simd_convert.inc	2022-05-17 19:56:58.000000000 +0200
-+++ b/numpy/core/src/_simd/_simd_convert.inc	2022-05-31 16:49:13.000000000 +0200
-@@ -101,9 +101,8 @@
+diff --git a/numpy/core/src/_simd/_simd_convert.inc b/numpy/core/src/_simd/_simd_convert.inc
+index 46e0444..261cf5b 100644
+--- a/numpy/core/src/_simd/_simd_convert.inc
++++ b/numpy/core/src/_simd/_simd_convert.inc
+@@ -101,9 +101,8 @@ simd_sequence_from_iterable(PyObject *obj, simd_data_type dtype, Py_ssize_t min_
      if (dst == NULL) {
          return NULL;
      }
@@ -12,10 +13,11 @@ diff -u -r a/numpy/core/src/_simd/_simd_convert.inc b/numpy/core/src/_simd/_simd
          npyv_lanetype_u8 *sdst = dst + i * info->lane_size;
          memcpy(sdst, &data.u64, info->lane_size);
      }
-diff -u -r a/numpy/core/src/common/ufunc_override.c b/numpy/core/src/common/ufunc_override.c
---- a/numpy/core/src/common/ufunc_override.c	2022-05-20 07:46:10.000000000 +0200
-+++ b/numpy/core/src/common/ufunc_override.c	2022-06-02 13:29:06.000000000 +0200
-@@ -73,13 +73,12 @@
+diff --git a/numpy/core/src/common/ufunc_override.c b/numpy/core/src/common/ufunc_override.c
+index d510f18..205c6e4 100644
+--- a/numpy/core/src/common/ufunc_override.c
++++ b/numpy/core/src/common/ufunc_override.c
+@@ -73,13 +73,12 @@ PyUFunc_HasOverride(PyObject * obj)
  /*
   * Get possible out argument from kwds, and returns the number of outputs
   * contained within it: if a tuple, the number of elements in it, 1 otherwise.
@@ -31,7 +33,7 @@ diff -u -r a/numpy/core/src/common/ufunc_override.c b/numpy/core/src/common/ufun
  {
      if (kwds == NULL) {
          Py_INCREF(Py_None);
-@@ -115,13 +114,11 @@
+@@ -115,13 +114,11 @@ PyUFuncOverride_GetOutObjects(PyObject *kwds, PyObject **out_kwd_obj, PyObject *
              *out_kwd_obj = NULL;
              return -1;
          }
@@ -46,10 +48,11 @@ diff -u -r a/numpy/core/src/common/ufunc_override.c b/numpy/core/src/common/ufun
          return 1;
      }
  }
-diff -u -r a/numpy/core/src/common/ufunc_override.h b/numpy/core/src/common/ufunc_override.h
---- a/numpy/core/src/common/ufunc_override.h	2022-05-17 19:56:58.000000000 +0200
-+++ b/numpy/core/src/common/ufunc_override.h	2022-05-31 16:49:13.000000000 +0200
-@@ -27,12 +27,11 @@
+diff --git a/numpy/core/src/common/ufunc_override.h b/numpy/core/src/common/ufunc_override.h
+index 5da95fb..3879016 100644
+--- a/numpy/core/src/common/ufunc_override.h
++++ b/numpy/core/src/common/ufunc_override.h
+@@ -27,12 +27,11 @@ PyUFunc_HasOverride(PyObject *obj);
  /*
   * Get possible out argument from kwds, and returns the number of outputs
   * contained within it: if a tuple, the number of elements in it, 1 otherwise.
@@ -62,66 +65,69 @@ diff -u -r a/numpy/core/src/common/ufunc_override.h b/numpy/core/src/common/ufun
  NPY_NO_EXPORT int
 -PyUFuncOverride_GetOutObjects(PyObject *kwds, PyObject **out_kwd_obj, PyObject ***out_objs);
 +PyUFuncOverride_GetOutObjects(PyObject *kwds, PyObject **out_kwd_obj);
-
+ 
  #endif  /* NUMPY_CORE_SRC_COMMON_UFUNC_OVERRIDE_H_ */
-diff -u -r a/numpy/core/src/multiarray/array_coercion.c b/numpy/core/src/multiarray/array_coercion.c
---- a/numpy/core/src/multiarray/array_coercion.c	2022-05-20 07:46:10.000000000 +0200
-+++ b/numpy/core/src/multiarray/array_coercion.c	2022-06-02 13:29:06.000000000 +0200
-@@ -1096,7 +1096,6 @@
+diff --git a/numpy/core/src/multiarray/array_coercion.c b/numpy/core/src/multiarray/array_coercion.c
+index 2598e4b..661a358 100644
+--- a/numpy/core/src/multiarray/array_coercion.c
++++ b/numpy/core/src/multiarray/array_coercion.c
+@@ -1096,7 +1096,6 @@ PyArray_DiscoverDTypeAndShape_Recursive(
      }
-
+ 
      npy_intp size = PySequence_Fast_GET_SIZE(seq);
 -    PyObject **objects = PySequence_Fast_ITEMS(seq);
-
+ 
      if (update_shape(curr_dims, &max_dims,
                       out_shape, 1, &size, NPY_TRUE, flags) < 0) {
-@@ -1118,7 +1117,7 @@
+@@ -1118,7 +1117,7 @@ PyArray_DiscoverDTypeAndShape_Recursive(
      /* Recursive call for each sequence item */
      for (Py_ssize_t i = 0; i < size; i++) {
          max_dims = PyArray_DiscoverDTypeAndShape_Recursive(
 -                objects[i], curr_dims + 1, max_dims,
 +        		PySequence_Fast_GET_ITEM(seq, i), curr_dims + 1, max_dims,
                  out_descr, out_shape, coercion_cache_tail_ptr, fixed_DType,
                  flags, never_copy);
-
-diff -u -r a/numpy/core/src/multiarray/arrayfunction_override.c b/numpy/core/src/multiarray/arrayfunction_override.c
---- a/numpy/core/src/multiarray/arrayfunction_override.c	2022-05-20 07:46:10.000000000 +0200
-+++ b/numpy/core/src/multiarray/arrayfunction_override.c	2022-06-02 13:29:06.000000000 +0200
-@@ -72,12 +72,11 @@
+ 
+diff --git a/numpy/core/src/multiarray/arrayfunction_override.c b/numpy/core/src/multiarray/arrayfunction_override.c
+index 463a2d4..e235117 100644
+--- a/numpy/core/src/multiarray/arrayfunction_override.c
++++ b/numpy/core/src/multiarray/arrayfunction_override.c
+@@ -72,12 +72,11 @@ get_implementing_args_and_methods(PyObject *relevant_args,
  {
      int num_implementing_args = 0;
-
+ 
 -    PyObject **items = PySequence_Fast_ITEMS(relevant_args);
      Py_ssize_t length = PySequence_Fast_GET_SIZE(relevant_args);
-
+ 
      for (Py_ssize_t i = 0; i < length; i++) {
          int new_class = 1;
 -        PyObject *argument = items[i];
 +        PyObject *argument = PySequence_Fast_GET_ITEM(relevant_args, i);
-
+ 
          /* Have we seen this type before? */
          for (int j = 0; j < num_implementing_args; j++) {
-@@ -156,12 +155,11 @@
+@@ -156,12 +155,11 @@ NPY_NO_EXPORT PyObject *
  array_function_method_impl(PyObject *func, PyObject *types, PyObject *args,
                             PyObject *kwargs)
  {
 -    PyObject **items = PySequence_Fast_ITEMS(types);
      Py_ssize_t length = PySequence_Fast_GET_SIZE(types);
-
+ 
      for (Py_ssize_t j = 0; j < length; j++) {
          int is_subclass = PyObject_IsSubclass(
 -            items[j], (PyObject *)&PyArray_Type);
 +        		PySequence_Fast_GET_ITEM(types, j), (PyObject *)&PyArray_Type);
          if (is_subclass == -1) {
              return NULL;
          }
-diff -u -r a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarray/compiled_base.c
---- a/numpy/core/src/multiarray/compiled_base.c	2022-05-17 19:56:58.000000000 +0200
-+++ b/numpy/core/src/multiarray/compiled_base.c	2022-06-02 13:29:06.000000000 +0200
-@@ -1414,78 +1414,78 @@
+diff --git a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarray/compiled_base.c
+index 2b82aca..06edae2 100644
+--- a/numpy/core/src/multiarray/compiled_base.c
++++ b/numpy/core/src/multiarray/compiled_base.c
+@@ -1414,78 +1414,78 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
          return NULL;
      }
-
+ 
 -#define _ADDDOC(doc, name)                                              \
 -        if (!(doc)) {                                                   \
 -            doc = docstr;                                               \
@@ -134,7 +140,7 @@ diff -u -r a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarr
 -
 -    if (Py_TYPE(obj) == &PyCFunction_Type) {
 -        PyCFunctionObject *new = (PyCFunctionObject *)obj;
--        _ADDDOC(new->m_ml->ml_doc, new->m_ml->ml_name);
+-        _ADDDOC(PyObject_GetDoc((PyObject*)(new)), new->m_ml->ml_name);
 -    }
 -    else if (PyObject_TypeCheck(obj, &PyType_Type)) {
 -        /*
@@ -206,7 +212,7 @@ diff -u -r a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarr
 +//
 +//    if (Py_TYPE(obj) == &PyCFunction_Type) {
 +//        PyCFunctionObject *new = (PyCFunctionObject *)obj;
-+//        _ADDDOC(new->m_ml->ml_doc, new->m_ml->ml_name);
++//        _ADDDOC(PyObject_GetDoc((PyObject*)(new)), new->m_ml->ml_name);
 +//    }
 +//    else if (PyObject_TypeCheck(obj, &PyType_Type)) {
 +//        /*
@@ -266,13 +272,14 @@ diff -u -r a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarr
 +//    }
 +//
 +//#undef _ADDDOC
-
+ 
      Py_RETURN_NONE;
  }
-diff -u -r a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
---- a/numpy/core/src/multiarray/iterators.c	2022-05-17 19:56:58.000000000 +0200
-+++ b/numpy/core/src/multiarray/iterators.c	2022-06-02 13:29:06.000000000 +0200
-@@ -1400,7 +1400,11 @@
+diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
+index f959162..2ef579b 100644
+--- a/numpy/core/src/multiarray/iterators.c
++++ b/numpy/core/src/multiarray/iterators.c
+@@ -1400,7 +1400,11 @@ arraymultiter_new(PyTypeObject *NPY_UNUSED(subtype), PyObject *args,
          Py_DECREF(fast_seq);
          return multiiter_wrong_number_of_args();
      }
@@ -285,18 +292,19 @@ diff -u -r a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/i
      Py_DECREF(fast_seq);
      return ret;
  }
-diff -u -r a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
---- a/numpy/core/src/multiarray/methods.c	2022-05-20 07:46:10.000000000 +0200
-+++ b/numpy/core/src/multiarray/methods.c	2022-06-03 11:29:22.000000000 +0200
-@@ -1064,7 +1064,6 @@
+diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
+index a5670db..80ec749 100644
+--- a/numpy/core/src/multiarray/methods.c
++++ b/numpy/core/src/multiarray/methods.c
+@@ -1064,7 +1064,6 @@ any_array_ufunc_overrides(PyObject *args, PyObject *kwds)
      int nin, nout;
      PyObject *out_kwd_obj;
      PyObject *fast;
 -    PyObject **in_objs, **out_objs;
-
+ 
      /* check inputs */
      nin = PyTuple_Size(args);
-@@ -1075,21 +1074,20 @@
+@@ -1075,21 +1074,20 @@ any_array_ufunc_overrides(PyObject *args, PyObject *kwds)
      if (fast == NULL) {
          return -1;
      }
@@ -321,10 +329,11 @@ diff -u -r a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/met
              Py_DECREF(out_kwd_obj);
              return 1;
          }
-diff -u -r a/numpy/core/src/umath/extobj.c b/numpy/core/src/umath/extobj.c
---- a/numpy/core/src/umath/extobj.c	2022-05-17 19:56:58.000000000 +0200
-+++ b/numpy/core/src/umath/extobj.c	2022-06-03 11:29:22.000000000 +0200
-@@ -283,7 +283,7 @@
+diff --git a/numpy/core/src/umath/extobj.c b/numpy/core/src/umath/extobj.c
+index 6b9a27e..8de94fb 100644
+--- a/numpy/core/src/umath/extobj.c
++++ b/numpy/core/src/umath/extobj.c
+@@ -283,7 +283,7 @@ _check_ufunc_fperr(int errmask, PyObject *extobj, const char *ufunc_name) {
      if (!errmask) {
          return 0;
      }