Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test SUNDIALS 7.2 support #1827

Merged
merged 2 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/post-merge-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/develop/compiling/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
- <https://computing.llnl.gov/projects/sundials>
- 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 <other command-line options>`
Expand Down
Loading