Work around missing AttributeError kwargs

msimacek · msimacek · commit 0ba7a7f2384c · 2025-05-21T17:54:34.000+02:00
diff --git a/graalpython/lib-graalpython/patches/metadata.toml b/graalpython/lib-graalpython/patches/metadata.toml
@@ -296,7 +296,13 @@ patch = 'numba-0.59.1.patch'
 license = 'BSD-2-Clause'
 
 [[numpy.rules]]
-version = '>= 2.0.0rc1, < 2.3'
+version = '== 2.2.4'
+patch = 'numpy-2.2.4.patch'
+license = 'BSD-3-Clause'
+dist-type = 'sdist'
+
+[[numpy.rules]]
+version = '>= 2.0.0rc1, < 2.1'
 patch = 'numpy-2.0.0.patch'
 license = 'BSD-3-Clause'
 dist-type = 'sdist'
diff --git a/graalpython/lib-graalpython/patches/numpy-2.2.4.patch b/graalpython/lib-graalpython/patches/numpy-2.2.4.patch
@@ -0,0 +1,182 @@
+diff --git a/numpy/__init__.py b/numpy/__init__.py
+index 2a4fd03..4df4f2d 100644
+--- a/numpy/__init__.py
++++ b/numpy/__init__.py
+@@ -371,7 +371,7 @@ def __getattr__(attr):
+             return char
+         elif attr == "array_api":
+             raise AttributeError("`numpy.array_api` is not available from "
+-                                 "numpy 2.0 onwards", name=None)
++                                 "numpy 2.0 onwards")
+         elif attr == "core":
+             import numpy.core as core
+             return core
+@@ -384,7 +384,7 @@ def __getattr__(attr):
+                 return distutils
+             else:
+                 raise AttributeError("`numpy.distutils` is not available from "
+-                                     "Python 3.12 onwards", name=None)
++                                     "Python 3.12 onwards")
+ 
+         if attr in __future_scalars__:
+             # And future warnings for those that will change, but also give
+@@ -394,13 +394,12 @@ def __getattr__(attr):
+                 "corresponding NumPy scalar.", FutureWarning, stacklevel=2)
+ 
+         if attr in __former_attrs__:
+-            raise AttributeError(__former_attrs__[attr], name=None)
++            raise AttributeError(__former_attrs__[attr])
+ 
+         if attr in __expired_attributes__:
+             raise AttributeError(
+                 f"`np.{attr}` was removed in the NumPy 2.0 release. "
+                 f"{__expired_attributes__[attr]}",
+-                name=None
+             )
+ 
+         if attr == "chararray":
+diff --git a/numpy/_core/include/numpy/ndarrayobject.h b/numpy/_core/include/numpy/ndarrayobject.h
+index 0462625..3625e34 100644
+--- a/numpy/_core/include/numpy/ndarrayobject.h
++++ b/numpy/_core/include/numpy/ndarrayobject.h
+@@ -220,7 +220,7 @@ NPY_TITLE_KEY_check(PyObject *key, PyObject *value)
+     if (key == title) {
+         return 1;
+     }
+-#ifdef PYPY_VERSION
++#if defined(PYPY_VERSION) || defined(GRAALVM_PYTHON)
+     /*
+      * On PyPy, dictionary keys do not always preserve object identity.
+      * Fall back to comparison by value.
+diff --git a/numpy/_core/src/multiarray/compiled_base.c b/numpy/_core/src/multiarray/compiled_base.c
+index e3af951..48a7030 100644
+--- a/numpy/_core/src/multiarray/compiled_base.c
++++ b/numpy/_core/src/multiarray/compiled_base.c
+@@ -1465,6 +1465,7 @@ fail:
+ NPY_NO_EXPORT PyObject *
+ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *const *args, Py_ssize_t len_args)
+ {
++#if 0 // GraalPy change
+     PyObject *obj;
+     PyObject *str;
+     const char *docstr;
+@@ -1569,6 +1570,7 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *const *args, Py_ssize_t
+     }
+ 
+ #undef _ADDDOC
++#endif // GraalPy change
+ 
+     Py_RETURN_NONE;
+ }
+diff --git a/numpy/_core/src/multiarray/shape.c b/numpy/_core/src/multiarray/shape.c
+index 340fe72..8f13674 100644
+--- a/numpy/_core/src/multiarray/shape.c
++++ b/numpy/_core/src/multiarray/shape.c
+@@ -97,6 +97,11 @@ PyArray_Resize(PyArrayObject *self, PyArray_Dims *newshape, int refcheck,
+                     "cannot resize an array with refcheck=True on PyPy.\n"
+                     "Use the np.resize function or refcheck=False");
+             return NULL;
++#elif defined(GRAALVM_PYTHON)
++            PyErr_SetString(PyExc_ValueError,
++                    "cannot resize an array with refcheck=True on GraalPy.\n"
++                    "Use the np.resize function or refcheck=False");
++            return NULL;
+ #else
+             refcnt = Py_REFCNT(self);
+ #endif /* PYPY_VERSION */
+diff --git a/numpy/_core/src/multiarray/stringdtype/dtype.c b/numpy/_core/src/multiarray/stringdtype/dtype.c
+index 0350375..8b254cb 100644
+--- a/numpy/_core/src/multiarray/stringdtype/dtype.c
++++ b/numpy/_core/src/multiarray/stringdtype/dtype.c
+@@ -841,7 +841,7 @@ init_string_dtype(void)
+     };
+ 
+     /* Loaded dynamically, so needs to be set here: */
+-    Py_TYPE(((PyObject *)&PyArray_StringDType)) = &PyArrayDTypeMeta_Type;
++    Py_SET_TYPE(((PyObject *)&PyArray_StringDType), &PyArrayDTypeMeta_Type);
+     ((PyTypeObject *)&PyArray_StringDType)->tp_base = &PyArrayDescr_Type;
+     if (PyType_Ready((PyTypeObject *)&PyArray_StringDType) < 0) {
+         return -1;
+diff --git a/numpy/_core/src/multiarray/temp_elide.c b/numpy/_core/src/multiarray/temp_elide.c
+index 662a2fa..791ede8 100644
+--- a/numpy/_core/src/multiarray/temp_elide.c
++++ b/numpy/_core/src/multiarray/temp_elide.c
+@@ -58,7 +58,7 @@
+  * supported too by using the appropriate Windows APIs.
+  */
+ 
+-#if defined HAVE_BACKTRACE && defined HAVE_DLFCN_H && ! defined PYPY_VERSION
++#if defined HAVE_BACKTRACE && defined HAVE_DLFCN_H && ! defined PYPY_VERSION && !defined(GRAALVM_PYTHON)
+ 
+ #include <feature_detection_misc.h>
+ 
+diff --git a/numpy/_core/src/npymath/ieee754.c.src b/numpy/_core/src/npymath/ieee754.c.src
+index 8fccc9a..3bb9cf0 100644
+--- a/numpy/_core/src/npymath/ieee754.c.src
++++ b/numpy/_core/src/npymath/ieee754.c.src
+@@ -362,6 +362,11 @@ int npy_get_floatstatus_barrier(char* param)
+      * By using a volatile, the compiler cannot reorder this call
+      */
+     if (param != NULL) {
++        // GraalPy change: the pointer needs to be dereferenced to establish
++        // a data dependency to to ensure the compiler won't reorder the call
++        if (points_to_py_handle_space(param)) {
++            param = (char*)pointer_to_stub(param);
++        }
+         volatile char NPY_UNUSED(c) = *(char*)param;
+     }
+ 
+diff --git a/numpy/_core/src/npymath/ieee754.cpp b/numpy/_core/src/npymath/ieee754.cpp
+index 1c59bf3..519fabc 100644
+--- a/numpy/_core/src/npymath/ieee754.cpp
++++ b/numpy/_core/src/npymath/ieee754.cpp
+@@ -428,6 +428,11 @@ npy_get_floatstatus_barrier(char *param)
+      * By using a volatile, the compiler cannot reorder this call
+      */
+     if (param != NULL) {
++        // GraalPy change: the pointer needs to be dereferenced to establish
++        // a data dependency to to ensure the compiler won't reorder the call
++        if (points_to_py_handle_space(param)) {
++            param = (char*)pointer_to_stub(param);
++        }
+         volatile char NPY_UNUSED(c) = *(char *)param;
+     }
+ 
+diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py
+index 928121c..bbe6a7e 100644
+--- a/numpy/lib/__init__.py
++++ b/numpy/lib/__init__.py
+@@ -70,7 +70,6 @@ def __getattr__(attr):
+             "numpy.lib.emath was an alias for emath module that was removed "
+             "in NumPy 2.0. Replace usages of numpy.lib.emath with "
+             "numpy.emath.",
+-            name=None
+         )
+     elif attr in (
+         "histograms", "type_check", "nanfunctions", "function_base",
+@@ -81,13 +80,11 @@ def __getattr__(attr):
+             f"numpy.lib.{attr} is now private. If you are using a public "
+             "function, it should be available in the main numpy namespace, "
+             "otherwise check the NumPy 2.0 migration guide.",
+-            name=None
+         )
+     elif attr == "arrayterator":
+         raise AttributeError(
+             "numpy.lib.arrayterator submodule is now private. To access "
+             "Arrayterator class use numpy.lib.Arrayterator.",
+-            name=None
+         )
+     else:
+         raise AttributeError("module {!r} has no attribute "
+diff --git a/vendored-meson/meson/mesonbuild/utils/universal.py b/vendored-meson/meson/mesonbuild/utils/universal.py
+index 6aee268..539be8b 100644
+--- a/vendored-meson/meson/mesonbuild/utils/universal.py
++++ b/vendored-meson/meson/mesonbuild/utils/universal.py
+@@ -728,6 +728,7 @@ def windows_detect_native_arch() -> str:
+     """
+     if sys.platform != 'win32':
+         return ''
++    return 'amd64'  # Workaround for GraalPy bug on Windows with kernel32.GetCurrentProcess()
+     try:
+         import ctypes
+         process_arch = ctypes.c_ushort()
