diff --git a/.github/workflows/test_valgrind.yml b/.github/workflows/test_valgrind.yml index b3f893647f..ef5ef9ba95 100644 --- 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 index d124a6e1be..40dbb27e47 100644 --- 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") @@ -19,6 +19,7 @@ jax.config.update("jax_enable_x64", True) +@skip_on_valgrind def test_conversion(): pysb.SelfExporter.cleanup() # reset pysb pysb.SelfExporter.do_export = True @@ -42,6 +43,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 index 16c92e3d1f..93fd8614de 100644 --- 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 + ... +}