Merge branch 'develop' into faster_drootdt_total

dweindl · May 2, 2024 · 1f64da1 · 1f64da1
2 parents 26acf85 + 304c23a
commit 1f64da1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 103 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
diff --git a/python/sdist/setup.cfg b/python/sdist/setup.cfg
diff --git a/python/tests/splines_utils.py b/python/tests/splines_utils.py
@@ -6,6 +6,7 @@
 
 import math
 import os
+import platform
 import uuid
 from tempfile import mkdtemp
 from typing import Any
@@ -716,13 +717,7 @@ def param_by_name(id):
             if sllh_atol is None:
                 sllh_atol = np.finfo(float).eps
             sllh_err_abs = abs(sllh).max()
-            if (
-                sllh_err_abs > sllh_atol and debug is not True
-            ) or debug == "print":
-                print(f"sllh_atol={sllh_atol}")
-                print(f"sllh_err_abs = {sllh_err_abs}")
-            if not debug:
-                assert sllh_err_abs <= sllh_atol
+            assert sllh_err_abs <= sllh_atol, f"{sllh_err_abs=} {sllh_atol=}"
     else:
         assert sllh is None
 
@@ -917,11 +912,11 @@ def example_spline_1(
         extrapolate=extrapolate,
     )
 
-    if os.name == "nt":
+    if os.name == "nt" or platform.system() == "Darwin":
         tols = (
             dict(llh_rtol=1e-15, x_rtol=1e-8, x_atol=1e-7),
             dict(llh_rtol=1e-15, x_rtol=1e-8, x_atol=1e-7),
-            dict(llh_rtol=1e-15, sllh_atol=5e-8, x_rtol=1e-8, x_atol=1e-7),
+            dict(llh_rtol=1e-15, sllh_atol=5e-7, x_rtol=1e-8, x_atol=1e-7),
         )
     else:
         tols = (

diff --git a/python/tests/test_sbml_import.py b/python/tests/test_sbml_import.py
@@ -759,7 +759,7 @@ def test_constraints():
         #  in practice
         assert np.any(rdata.x < 0)
 
-        amici_solver.setRelativeTolerance(1e-14)
+        amici_solver.setRelativeTolerance(1e-13)
         amici_solver.setConstraints(
             [Constraint.non_negative, Constraint.non_negative]
         )

diff --git a/tests/cpp/steadystate/tests1.cpp b/tests/cpp/steadystate/tests1.cpp
@@ -1,7 +1,6 @@
 #include "testfunctions.h"
 
 #include "wrapfunctions.h"
-#include <cstring>
 
 #include <gtest/gtest.h>
 
@@ -175,7 +174,8 @@ TEST(ExampleSteadystate, SensitivityForwardErrorNewt)
 
 TEST(ExampleSteadystate, SensitivityForwardDense)
 {
-    amici::simulateVerifyWrite("/model_steadystate/sensiforwarddense/");
+    amici::simulateVerifyWrite("/model_steadystate/sensiforwarddense/",
+                               1e-9, TEST_RTOL);
 }
 
 TEST(ExampleSteadystate, SensiFwdNewtonPreeq)