From a60058d272c866b71b16889a1dae3b0dd08c1eec Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 16 Dec 2024 11:10:28 -0500 Subject: [PATCH 1/2] Test with SUNDIALS 7.2 --- .github/workflows/main.yml | 2 +- SConstruct | 2 +- doc/sphinx/develop/compiling/dependencies.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a61055c65e..3c5b6db7d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -571,7 +571,7 @@ jobs: fmt-ver: 10 - sundials-ver: 6.6 fmt-ver: 10 - - sundials-ver: 7.0 + - sundials-ver: 7.2 fmt-ver: 11 extra-build-args: cxx_flags='-std=c++20' fail-fast: false diff --git a/SConstruct b/SConstruct index bb2196ac7c..2172e2bde0 100644 --- a/SConstruct +++ b/SConstruct @@ -1468,7 +1468,7 @@ if env["system_sundials"] in ("n", "default"): if env['system_sundials'] == 'y': env['sundials_libs'] = ['sundials_cvodes', 'sundials_idas', 'sundials_nvecserial'] - if parse_version(env["sundials_version"]) >= parse_version("7.0.0"): + if parse_version(env["sundials_version"]) >= parse_version("7.2.0"): env['sundials_libs'].append('sundials_core') if env['use_lapack']: if env.get('has_sundials_lapack'): diff --git a/doc/sphinx/develop/compiling/dependencies.md b/doc/sphinx/develop/compiling/dependencies.md index 91c935e555..3bd5c438d6 100644 --- a/doc/sphinx/develop/compiling/dependencies.md +++ b/doc/sphinx/develop/compiling/dependencies.md @@ -63,7 +63,7 @@ compiler is required only if you plan to build the Fortran module. Git, SUNDIALS will be automatically downloaded and the necessary portions will be compiled and installed with Cantera. - - - Known to work with versions >= 3.0 and \<= 7.0. + - Known to work with versions >= 3.0 and \<= 7.2. - To use SUNDIALS with Cantera on a Linux/Unix system, it must be compiled with the `-fPIC` flag. You can specify this flag when configuring SUNDIALS as `cmake -DCMAKE_C_FLAGS=-fPIC ` From d86888e958f6d0c1bdf4f18dcc4cf8a444de55b0 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 16 Dec 2024 11:15:27 -0500 Subject: [PATCH 2/2] [CI] Enable debug logging from SCons --- .github/workflows/post-merge-tests.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/post-merge-tests.yml b/.github/workflows/post-merge-tests.yml index 9fb985326c..71e66cb215 100644 --- a/.github/workflows/post-merge-tests.yml +++ b/.github/workflows/post-merge-tests.yml @@ -98,7 +98,7 @@ jobs: pipenv install pytest-github-actions-annotate-failures - name: Build Cantera run: | - scons build env_vars=all -j4 debug=n --debug=time \ + scons build env_vars=all -j4 debug=n --debug=time logging=debug \ system_eigen=y system_fmt=y system_sundials=y system_yamlcpp=y \ system_blas_lapack=y hdf_support=y f90_interface=y \ cc_flags=-D_GLIBCXX_ASSERTIONS python_package=y @@ -141,8 +141,8 @@ jobs: highfive-devel python3-graphviz python3-packaging - name: Build Cantera run: | - scons build -j4 debug=n --debug=time python_package=y f90_interface=y \ - extra_inc_dirs=/usr/include/eigen3 libdirname=/usr/lib64 \ + scons build -j4 debug=n --debug=time logging=debug python_package=y \ + f90_interface=y extra_inc_dirs=/usr/include/eigen3 libdirname=/usr/lib64 \ system_eigen=y system_fmt=y system_blas_lapack=y system_sundials=y \ system_yamlcpp=y system_blas_lapack=y hdf_support=y # note: 'system_highfive=y' is omitted as the current packaged version is too old; @@ -192,7 +192,7 @@ jobs: python3 -m pip install --pre numpy cython pandas scipy - name: Build Cantera run: | - python3 `which scons` build env_vars=all -j4 debug=n --debug=time \ + python3 `which scons` build env_vars=all -j4 debug=n --debug=time logging=debug \ system_fmt=y system_blas_lapack=y hdf_support=y cc_flags=-D_GLIBCXX_ASSERTIONS \ python_package=y - name: Build Tests @@ -233,7 +233,9 @@ jobs: pytest-xdist pytest-github-actions-annotate-failures pint graphviz \ scons packaging - name: Build Cantera - run: ./.venv/bin/scons build env_vars=all -j3 debug=n --debug=time boost_inc_dir=${BOOST_INC_DIR} python_package=y + run: | + ./.venv/bin/scons build env_vars=all -j3 debug=n --debug=time logging=debug \ + boost_inc_dir=${BOOST_INC_DIR} python_package=y - name: Build Tests run: ./.venv/bin/scons -j3 build-tests - name: Run compiled tests