Skip to content

[GR-75861] Avoid NumPy maybe-uninitialized Werror #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
graalvmbot wants to merge 1 commit into from
+38 −0
Closed

[GR-75861] Avoid NumPy maybe-uninitialized Werror #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions graalpython/lib-graalpython/patches/numpy-2.0.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@ index 0462625..3625e34 100644
/*
* On PyPy, dictionary keys do not always preserve object identity.
* Fall back to comparison by value.
diff --git a/numpy/_core/meson.build b/numpy/_core/meson.build
index d32d71a..7767221 100644
--- a/numpy/_core/meson.build
+++ b/numpy/_core/meson.build
@@ -810,2 +810,5 @@ endforeach
# -----------------------------------
+# GraalPy change: GCC 12 can report a false positive maybe-uninitialized
+# warning in AVX512 intrinsics used by x86-simd-sort. Some CI builds use Werror.
+combined_cpp_args = cpp_args_common + max_opt + cpp.get_supported_arguments('-Wno-error=maybe-uninitialized')
foreach gen_mtargets : [
@@ -848,3 +851,3 @@ foreach gen_mtargets : [
c_args: c_args_common + max_opt,
- cpp_args: cpp_args_common + max_opt,
+ cpp_args: combined_cpp_args,
include_directories: [
diff --git a/numpy/_core/src/multiarray/compiled_base.c b/numpy/_core/src/multiarray/compiled_base.c
index 7913b18..9463852 100644
--- a/numpy/_core/src/multiarray/compiled_base.c
Expand Down
23 changes: 23 additions & 0 deletions graalpython/lib-graalpython/patches/numpy-2.4.4.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,29 @@ index 6bfc40f..046ff74 100644
/*
* On PyPy, dictionary keys do not always preserve object identity.
* Fall back to comparison by value.
diff --git a/numpy/_core/meson.build b/numpy/_core/meson.build
index 3a0b52c..1819ec6 100644
--- a/numpy/_core/meson.build
+++ b/numpy/_core/meson.build
@@ -854,6 +854,9 @@ endforeach

# Build npysort dispatch-able sources
# -----------------------------------
+# GraalPy change: GCC 12 can report a false positive maybe-uninitialized
+# warning in AVX512 intrinsics used by x86-simd-sort. Some CI builds use Werror.
+combined_cpp_args = cpp_args_common + max_opt + cpp.get_supported_arguments('-Wno-error=maybe-uninitialized')
foreach gen_mtargets : [
[
'x86_simd_argsort.dispatch.h',
@@ -897,7 +900,7 @@ foreach gen_mtargets : [
prefix: 'NPY_',
dependencies: [py_dep, np_core_dep, omp_dep],
c_args: c_args_common + max_opt,
- cpp_args: cpp_args_common + max_opt,
+ cpp_args: combined_cpp_args,
include_directories: [
'include',
'src/common',
diff --git a/numpy/_core/src/multiarray/compiled_base.c b/numpy/_core/src/multiarray/compiled_base.c
index 6e37968..010bd03 100644
--- a/numpy/_core/src/multiarray/compiled_base.c
Expand Down
Loading