mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-06 08:48:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

python3-numpy: Fix reproducibility issue

Browse Source 
Add a patch to fix the reproducibility issue being seen during testing. The issue
is from a poor choice of regex against the compiler flags, being triggered by
different path names.

Drop the previous attempt at fixing this as it wasn't that.

(From OE-Core rev: c4d1dc5e33734b94835e7f5e0e1746d4a6542b55)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2023-09-29 22:53:24 +01:00
parent ab127e266e
commit 98ecb27d23
3 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-devtools/python/python3-numpy/disable_blas.patch
View File

@@ -1,37 +0,0 @@
We've seen reproducibility failures where it appears an extra -O3 compiler flag ends
up in the multiarray library compilation. This can only really have come through
extra_info since it only affects just this library. Rather than try and track
down exactly where this came from in a rabbit warren of code, just disable
this since we don't have any of the dependencies.
Upstream-Status: Inappropriate [OE specific config hack]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Index: numpy-1.25.2/numpy/core/setup.py
===================================================================
--- numpy-1.25.2.orig/numpy/core/setup.py
+++ numpy-1.25.2/numpy/core/setup.py
@@ -755,22 +755,7 @@ def configuration(parent_package='',top_
join('src', 'common', 'npy_cpu_features.c'),
]
- if os.environ.get('NPY_USE_BLAS_ILP64', "0") != "0":
- blas_info = get_info('blas_ilp64_opt', 2)
- else:
- blas_info = get_info('blas_opt', 0)
-
- have_blas = blas_info and ('HAVE_CBLAS', None) in blas_info.get('define_macros', [])
-
- if have_blas:
- extra_info = blas_info
- # These files are also in MANIFEST.in so that they are always in
- # the source distribution independently of HAVE_CBLAS.
- common_src.extend([join('src', 'common', 'cblasfuncs.c'),
- join('src', 'common', 'python_xerbla.c'),
- ])
- else:
- extra_info = {}
+ extra_info = {}
#######################################################################
# _multiarray_umath module - multiarray part #

33
meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch Normal file
View File

@@ -0,0 +1,33 @@
This regex decides whether to use O3 opimisation on numpy or not.
It includes "od", which happens to be a substring of "reproducible"
but not "qemux86-world".
The regex will run against all compiler options including things like:
-fmacro-prefix-map=/XXX/build/tmp/work/core2-64-poky-linux/python3-numpy/1.26.0/numpy-1.26.0=/usr/src/debug/python3-numpy/1.26.0-r0
i.e. including build paths.
Reduce the regex to something deterministic for our builds, assuming
nobody builds in /home/debug:full/
The autobuilder race depended upon whether qemux86-world or the
reproducible target ran first and won the race to populate sstate.
Upstream-Status: Inappropriate [upstream have dropped distutils and switched to meson]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Index: numpy-1.26.0/numpy/distutils/ccompiler_opt.py
===================================================================
--- numpy-1.26.0.orig/numpy/distutils/ccompiler_opt.py
+++ numpy-1.26.0/numpy/distutils/ccompiler_opt.py
@@ -990,7 +990,7 @@ class _CCompiler:
("cc_is_nocc", "", ""),
)
detect_args = (
- ("cc_has_debug", ".*(O0|Od|ggdb|coverage|debug:full).*", ""),
+ ("cc_has_debug", ".*debug:full.*", ""),
("cc_has_native",
".*(-march=native|-xHost|/QxHost|-mcpu=a64fx).*", ""),
# in case if the class run with -DNPY_DISABLE_OPTIMIZATION