From 175e9afacf7679916d2306bd6c25f2a3ab21bedd Mon Sep 17 00:00:00 2001
From: Sebastian Achilles <s.achilles@fz-juelich.de>
Date: Sat, 5 Oct 2024 10:45:03 +0200
Subject: [PATCH] add patch to SciPy-bundle 2024.05 that fixes test failure on
 aarch64

---
 .../SciPy-bundle-2024.05-gfbf-2024a.eb        |  3 ++
 .../scipy-1.13.1_TestLinprogIPSparse.patch    | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 easybuild/easyconfigs/s/SciPy-bundle/scipy-1.13.1_TestLinprogIPSparse.patch

diff --git a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2024.05-gfbf-2024a.eb b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2024.05-gfbf-2024a.eb
index 2abab977add..5584d888f30 100644
--- a/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2024.05-gfbf-2024a.eb
+++ b/easybuild/easyconfigs/s/SciPy-bundle/SciPy-bundle-2024.05-gfbf-2024a.eb
@@ -64,12 +64,15 @@ exts_list = [
         'patches': [
             'scipy-1.11.1_disable-tests.patch',
             'scipy-1.11.1_xfail-aarch64_test_maxiter_worsening.patch',
+            'scipy-1.13.1_TestLinprogIPSparse.patch',
         ],
         'checksums': [
             {'scipy-1.13.1.tar.gz': '095a87a0312b08dfd6a6155cbbd310a8c51800fc931b8c0b84003014b874ed3c'},
             {'scipy-1.11.1_disable-tests.patch': '906bfb03397d94882ccdc1b93bc2c8e854e0e060c2d107c83042992394e6a4af'},
             {'scipy-1.11.1_xfail-aarch64_test_maxiter_worsening.patch':
              '918c8e6fa8215d459126f267764c961bde729ea4a116c7f6287cddfdc58ffcea'},
+            {'scipy-1.13.1_TestLinprogIPSparse.patch':
+             '7213c2690b76c69f7e7103529cea3fa2098c05fbea556f04325fab9ca8c065f5'},
         ],
     }),
     ('numexpr', '2.10.0', {
diff --git a/easybuild/easyconfigs/s/SciPy-bundle/scipy-1.13.1_TestLinprogIPSparse.patch b/easybuild/easyconfigs/s/SciPy-bundle/scipy-1.13.1_TestLinprogIPSparse.patch
new file mode 100644
index 00000000000..1b057319086
--- /dev/null
+++ b/easybuild/easyconfigs/s/SciPy-bundle/scipy-1.13.1_TestLinprogIPSparse.patch
@@ -0,0 +1,30 @@
+disable problematic tests
+TestLinprogIPSparse::test_bug_6139 + TestLinprogIPSparsePresolve::test_bug_6139 fail on Grace Hopper aarch64
+author: Sebastian Achilles (Juelich Supercomputing Centre)
+
+diff --git a/scipy/optimize/tests/test_linprog.py b/scipy/optimize/tests/test_linprog.py
+index 49a0f8de5..8ffbb0b47 100644
+--- a/scipy/optimize/tests/test_linprog.py
++++ b/scipy/optimize/tests/test_linprog.py
+@@ -1977,6 +1977,10 @@ if has_umfpack:
+ class TestLinprogIPSparse(LinprogIPTests):
+     options = {"sparse": True, "cholesky": False, "sym_pos": False}
+ 
++    @pytest.mark.skipif(
++        platform.machine() == 'aarch64',
++        reason="Fails on aarch64"
++    )
+     @pytest.mark.xfail_on_32bit("This test is sensitive to machine epsilon level "
+                                 "perturbations in linear system solution in "
+                                 "_linprog_ip._sym_solve.")
+@@ -2027,6 +2031,10 @@ class TestLinprogIPSparse(LinprogIPTests):
+ class TestLinprogIPSparsePresolve(LinprogIPTests):
+     options = {"sparse": True, "_sparse_presolve": True}
+ 
++    @pytest.mark.skipif(
++        platform.machine() == 'aarch64',
++        reason="Fails on aarch64"
++    )
+     @pytest.mark.xfail_on_32bit("This test is sensitive to machine epsilon level "
+                                 "perturbations in linear system solution in "
+                                 "_linprog_ip._sym_solve.")