Fix some ci/test issues, test sundials 7.x in CI (#108)

modelon-community · Aug 7, 2024 · cafecd9 · cafecd9
1 parent 2f63c90
commit cafecd9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,11 +9,12 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        sundials_version: [2.7.0, 3.2.0]
+        sundials_version: [2.7.0, 3.2.0, 7.1.1]
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.9.x'
     - name: Setup Python
@@ -26,18 +27,18 @@ jobs:
     - name: Install superlu
       run: |
         cd /tmp
-        curl -fSsL https://portal.nersc.gov/project/sparse/superlu/superlu_mt_3.1.tar.gz | tar xz
-        cd SuperLU_MT_3.1
-        make CFLAGS="-O2 -fPIC -fopenmp" BLASLIB="-lblas" PLAT="_OPENMP" MPLIB="-fopenmp" lib -j1
-        sudo cp -v ./lib/libsuperlu_mt_OPENMP.a /usr/lib
-        sudo cp -v ./SRC/*.h /usr/include
+        curl -fSsL https://github.com/xiaoyeli/superlu_mt/archive/refs/tags/v4.0.1.tar.gz | tar xz
+        cd superlu_mt-4.0.1
+        cmake -Denable_examples=OFF -Denable_tests=OFF -DPLAT="_OPENMP" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DSUPERLUMT_INSTALL_INCLUDEDIR=include .
+        make -j4
+        sudo make install
     - name: Install sundials
       run: |
         git clone --depth 1 -b v${{ matrix.sundials_version }} https://github.com/LLNL/sundials /tmp/sundials
         cd /tmp/sundials
         if test "${{ matrix.sundials_version }}" = "2.7.0"; then echo "target_link_libraries(sundials_idas_shared lapack blas superlu_mt_OPENMP)" >> src/idas/CMakeLists.txt; echo "target_link_libraries(sundials_kinsol_shared lapack blas superlu_mt_OPENMP)" >> src/kinsol/CMakeLists.txt; fi
         mkdir build && cd build
-        cmake -LAH -DSUPERLUMT_BLAS_LIBRARIES=blas -DSUPERLUMT_LIBRARIES=blas -DSUPERLUMT_INCLUDE_DIR=/usr/include -DSUPERLUMT_LIBRARY=/usr/lib/libsuperlu_mt_OPENMP.a -DSUPERLUMT_THREAD_TYPE=OpenMP -DCMAKE_INSTALL_PREFIX=/usr -DSUPERLUMT_ENABLE=ON -DLAPACK_ENABLE=ON -DEXAMPLES_ENABLE=OFF -DEXAMPLES_ENABLE_C=OFF -DBUILD_STATIC_LIBS=OFF ..
+        cmake -LAH -DSUPERLUMT_BLAS_LIBRARIES=blas -DSUPERLUMT_LIBRARIES=blas -DSUPERLUMT_INCLUDE_DIR=/usr/include -DSUPERLUMT_LIBRARY=/usr/lib/libsuperlu_mt_OPENMP.a -DSUPERLUMT_THREAD_TYPE=OpenMP -DCMAKE_INSTALL_PREFIX=/usr -DSUPERLUMT_ENABLE=ON -DLAPACK_ENABLE=ON -DEXAMPLES_ENABLE=OFF -DEXAMPLES_ENABLE_C=OFF -DBUILD_STATIC_LIBS=OFF -DSUNDIALS_INDEX_SIZE=32 ..
         make -j4
         sudo make install
     - name: Build

diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -18,6 +18,7 @@
 from assimulo import testattr
 from assimulo.exception import AssimuloException
 from assimulo.examples import *
+from assimulo.solvers.sundials import get_sundials_version
 
 class Test_Examples:
     @testattr(stddist = True)
@@ -195,7 +196,8 @@ def test_mech_system_pendulum3(self):
         """
         This tests the class Mechanical_system together with ind3 and ida
         """
-        mech_system_pendulum.run_example('ind3',with_plots=False,with_test=True)
+        if get_sundials_version() < (4,):
+            mech_system_pendulum.run_example('ind3',with_plots=False,with_test=True)
 
     @testattr(stddist = True)
     def test_mech_system_pendulum_ggl2(self):