Merge branch 'develop' into fix_jax_test

AMICI-dev · Nov 26, 2024 · b8bce77 · b8bce77
2 parents 25aa00e + b210b01
commit b8bce77
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/test_valgrind.yml b/.github/workflows/test_valgrind.yml
@@ -89,5 +89,9 @@ jobs:
     - name: Install python package
       run: scripts/installAmiciSource.sh
 
+    - name: Remove jax
+      # avoid valgrind errors due to jax et al.
+      run: venv/bin/pip uninstall -y jax
+
     - name: Python tests / Valgrind
       run: scripts/run-valgrind-py.sh
diff --git a/python/tests/test_jax.py b/python/tests/test_jax.py
@@ -11,7 +11,7 @@
 from beartype import beartype
 
 from amici.pysb_import import pysb2amici
-from amici.testing import TemporaryDirectoryWinSafe
+from amici.testing import TemporaryDirectoryWinSafe, skip_on_valgrind
 from numpy.testing import assert_allclose
 
 pysb = pytest.importorskip("pysb")
@@ -23,6 +23,7 @@
 RTOL_SIM = 1e-12
 
 
+@skip_on_valgrind
 def test_conversion():
     pysb.SelfExporter.cleanup()  # reset pysb
     pysb.SelfExporter.do_export = True
@@ -46,6 +47,7 @@ def test_conversion():
         _test_model(model_module, ts, p, k)
 
 
+@skip_on_valgrind
 @pytest.mark.filterwarnings(
     "ignore:Model does not contain any initial conditions"
 )

diff --git a/python/tests/valgrind-python.supp b/python/tests/valgrind-python.supp
@@ -985,3 +985,12 @@
    fun:_PyTuple_Resize
    ...
 }
+
+{
+   Python
+   Memcheck:Cond
+   fun:PyObject_RichCompareBool
+   fun:tuplerichcompare
+   fun:do_richcompare
+   ...
+}