Merge branch 'develop' into fix_2231

dweindl · Dec 13, 2023 · a8d382c · a8d382c
2 parents c854930 + eba9557
commit a8d382c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/python/examples/example_splines_swameye/ExampleSplinesSwameye2003.ipynb b/python/examples/example_splines_swameye/ExampleSplinesSwameye2003.ipynb
@@ -101,11 +101,11 @@
    "source": [
     "# If running as a GitHub action, just do the minimal amount of work required to check whether the code is working\n",
     "if os.getenv(\"GITHUB_ACTIONS\") is not None:\n",
-    "    n_starts = 15\n",
+    "    n_starts = 25\n",
     "    pypesto_optimizer = pypesto.optimize.FidesOptimizer(\n",
     "        verbose=logging.WARNING, options=dict(maxiter=10)\n",
     "    )\n",
-    "    pypesto_engine = pypesto.engine.SingleCoreEngine()"
+    "    pypesto_engine = pypesto.engine.MultiProcessEngine()"
    ]
   },
   {

diff --git a/tests/benchmark-models/test_petab_benchmark.py b/tests/benchmark-models/test_petab_benchmark.py
@@ -1,5 +1,5 @@
 """Tests for simulate_petab on PEtab benchmark problems."""
-
+import os
 from pathlib import Path
 
 import amici
@@ -13,13 +13,13 @@
 ATOL: float = 1e-3
 RTOL: float = 1e-2
 
-benchmark_path = (
-    Path(__file__).parent.parent.parent
-    / "Benchmark-Models-PEtab"
-    / "Benchmark-Models"
-)
+repo_root = Path(__file__).parent.parent.parent
+benchmark_path = repo_root / "Benchmark-Models-PEtab" / "Benchmark-Models"
+if not benchmark_path.exists():
+    benchmark_path = Path(os.environ["BENCHMARK_COLLECTION"])
+
 # reuse compiled models from test_benchmark_collection.sh
-benchmark_outdir = Path(__file__).parent.parent.parent / "test_bmc"
+benchmark_outdir = repo_root / "test_bmc"
 models = [
     str(petab_path.stem)
     for petab_path in benchmark_path.glob("*")