From c7938df85599d8b059884296fad0c2a2fbe52828 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 7 Nov 2024 17:35:46 +0100 Subject: [PATCH 1/2] add patch to fix vectorization bug in scipy 1.11.1 also to SciPy-bundle 2023.07 w/ iimkl/2023a --- .../s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb index 25fa6ff36f77..09154f9d8304 100644 --- a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb +++ b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb @@ -79,6 +79,7 @@ exts_list = [ 'patches': [ 'scipy-1.11.1_disable-tests.patch', 'scipy-1.11.1_xfail-aarch64_test_maxiter_worsening.patch', + 'scipy-1.11.1_vectorization_error.patch', 'scipy-1.11.1_disable-tests-iimkl.patch', 'scipy-1.11.1_relaxed_test_accuracy.patch', ], @@ -87,6 +88,8 @@ exts_list = [ {'scipy-1.11.1_disable-tests.patch': '906bfb03397d94882ccdc1b93bc2c8e854e0e060c2d107c83042992394e6a4af'}, {'scipy-1.11.1_xfail-aarch64_test_maxiter_worsening.patch': '918c8e6fa8215d459126f267764c961bde729ea4a116c7f6287cddfdc58ffcea'}, + {'scipy-1.11.1_vectorization_error.patch': + 'bfba00ab84d7d6d73b87e4e94ea2487058d155f845c12212552c095fea9e5cae'}, {'scipy-1.11.1_disable-tests-iimkl.patch': 'e85cf95d343fa4fd9e0045df3a030209a8d7b32a47d6da64ae1efd7b8ef827e3'}, {'scipy-1.11.1_relaxed_test_accuracy.patch': From a305f965dce92b9b39849be3daa2e632a403454b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 7 Nov 2024 17:48:11 +0100 Subject: [PATCH 2/2] add newer Cython as build dependency to SciPy-bundle 2023.07, required for scipy 1.11.1 --- .../s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb index 09154f9d8304..a41da775912f 100644 --- a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb +++ b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2023.07-iimkl-2023a.eb @@ -16,6 +16,7 @@ builddependencies = [ ('Meson', '1.1.1'), ('Ninja', '1.11.1'), ('pkgconf', '1.9.5'), # required by scipy + ('Cython', '3.0.8'), ] dependencies = [ @@ -79,7 +80,6 @@ exts_list = [ 'patches': [ 'scipy-1.11.1_disable-tests.patch', 'scipy-1.11.1_xfail-aarch64_test_maxiter_worsening.patch', - 'scipy-1.11.1_vectorization_error.patch', 'scipy-1.11.1_disable-tests-iimkl.patch', 'scipy-1.11.1_relaxed_test_accuracy.patch', ], @@ -88,8 +88,6 @@ exts_list = [ {'scipy-1.11.1_disable-tests.patch': '906bfb03397d94882ccdc1b93bc2c8e854e0e060c2d107c83042992394e6a4af'}, {'scipy-1.11.1_xfail-aarch64_test_maxiter_worsening.patch': '918c8e6fa8215d459126f267764c961bde729ea4a116c7f6287cddfdc58ffcea'}, - {'scipy-1.11.1_vectorization_error.patch': - 'bfba00ab84d7d6d73b87e4e94ea2487058d155f845c12212552c095fea9e5cae'}, {'scipy-1.11.1_disable-tests-iimkl.patch': 'e85cf95d343fa4fd9e0045df3a030209a8d7b32a47d6da64ae1efd7b8ef827e3'}, {'scipy-1.11.1_relaxed_test_accuracy.patch':