Merge branch 'develop' into fix_2491

dweindl · Oct 20, 2024 · cd20bf7 · cd20bf7
2 parents 84f8ef5 + fbe3840
commit cd20bf7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/test_python_ver_matrix.yml b/.github/workflows/test_python_ver_matrix.yml
@@ -25,8 +25,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11', '3.12', '3.13']
-        experimental: [false]
+        include:
+          - python-version: '3.10'
+            experimental: false
+          - python-version: '3.11'
+            experimental: false
+          - python-version: '3.12'
+            experimental: false
+          - python-version: '3.13'
+            experimental: true
 
     steps:
     - run: echo "AMICI_DIR=$(pwd)" >> $GITHUB_ENV

diff --git a/scripts/run-valgrind-cpp.sh b/scripts/run-valgrind-cpp.sh
@@ -10,4 +10,4 @@ set -eou pipefail
 # run tests
 cd "${AMICI_PATH}/build/"
 VALGRIND_OPTS="--leak-check=full --error-exitcode=1 --trace-children=yes --show-leak-kinds=definite"
-valgrind ${VALGRIND_OPTS} ctest
+CTEST_OUTPUT_ON_FAILURE=1 valgrind ${VALGRIND_OPTS} ctest
diff --git a/tests/cpp/unittests/testMisc.cpp b/tests/cpp/unittests/testMisc.cpp
@@ -360,10 +360,9 @@ TEST_F(SolverTest, SettersGettersWithSetup)
     ASSERT_EQ(static_cast<int>(solver.getSensitivityMethod()),
               static_cast<int>(sensi_meth));
 
-    sundials::Context sunctx;
     auto rdata = std::make_unique<ReturnData>(solver, testModel);
-    AmiVector x(nx, sunctx), dx(nx, sunctx);
-    AmiVectorArray sx(nx, 1, sunctx), sdx(nx, 1, sunctx);
+    AmiVector x(nx, solver.getSunContext()), dx(nx, solver.getSunContext());
+    AmiVectorArray sx(nx, 1, solver.getSunContext()), sdx(nx, 1, solver.getSunContext());
 
     testModel.setInitialStates(std::vector<realtype>{ 0 });