From 98ecb27d2301a8464170615f619441a5c71bbde4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Sep 2023 22:53:24 +0100 Subject: python3-numpy: Fix reproducibility issue 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 --- .../python/python3-numpy/disable_blas.patch | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-numpy/disable_blas.patch (limited to 'meta/recipes-devtools/python/python3-numpy/disable_blas.patch') diff --git a/meta/recipes-devtools/python/python3-numpy/disable_blas.patch b/meta/recipes-devtools/python/python3-numpy/disable_blas.patch deleted file mode 100644 index 09d65e8419..0000000000 --- a/meta/recipes-devtools/python/python3-numpy/disable_blas.patch +++ /dev/null @@ -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 - -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 # -- cgit v1.2.3-54-g00ecf