From c15a5be65d934798c166a8d6d79d7cc4fa1ce9a5 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Thu, 26 Jun 2025 18:33:53 -0700 Subject: [PATCH 1/2] Update to SUNDIALS 7.4.0 --- CMakeLists.txt | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7428b0468..64c924fba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ if(GRIDKIT_ENABLE_IPOPT) enable_language(Fortran) # Needed for linking to HSL endif() if(GRIDKIT_ENABLE_SUNDIALS) - find_package(SUNDIALS 7.0.0 REQUIRED CONFIG + find_package(SUNDIALS 7.4.0 REQUIRED CONFIG PATHS ${SUNDIALS_DIR} ${SUNDIALS_DIR}/lib/cmake/sundials) message(STATUS "SUNDIALS configuration found: ${SUNDIALS_CONFIG}") diff --git a/README.md b/README.md index 087e4a145..b899f8927 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Before installing GridKit™ make sure you have all needed dependencies. ### Dependencies You should have all of the following installed before installing GridKit™ - A version of - - [SUNDIALS](https://github.com/LLNL/sundials) `develop` branch at commit >= [`07d21c2`](https://github.com/LLNL/sundials/commit/07d21c2c5ae33211a9a2fafd8eac56de5582dce0) + - [SUNDIALS](https://github.com/LLNL/sundials) >= 7.4.0 - [Suitesparse](https://github.com/DrTimothyAldenDavis/SuiteSparse) >= 5.x (optional) - If using Suitesparse, SUNDIALS must also be built with [KLU support](https://sundials.readthedocs.io/en/latest/sundials/Install_link.html#cmakeoption-ENABLE_KLU) - [Ipopt](https://github.com/coin-or/Ipopt) >= 3.x (optional) From cae6a551ee29b790880f8527dfcca54217d93a82 Mon Sep 17 00:00:00 2001 From: Nicholson Koukpaizan <72402802+nkoukpaizan@users.noreply.github.com> Date: Fri, 27 Jun 2025 17:52:06 -0400 Subject: [PATCH 2/2] Updated Spack fork with sundials@7.4.0 and set CI to use that version. (#164) --- .github/workflows/spack_default_build.yaml | 2 +- buildsystem/spack/spack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/spack_default_build.yaml b/.github/workflows/spack_default_build.yaml index e0a09e4b2..60d9144aa 100644 --- a/.github/workflows/spack_default_build.yaml +++ b/.github/workflows/spack_default_build.yaml @@ -142,7 +142,7 @@ jobs: mumps: require: ~mpi~openmp sundials: - require: '@develop' + require: '@7.4.0' llvm: externals: - spec: llvm@${{ matrix.llvm }} diff --git a/buildsystem/spack/spack b/buildsystem/spack/spack index 4c05697f7..ba17e3f5f 160000 --- a/buildsystem/spack/spack +++ b/buildsystem/spack/spack @@ -1 +1 @@ -Subproject commit 4c05697f7518269c4fd8bdb9d85cb4d124c60d01 +Subproject commit ba17e3f5fde40fd3012f41929712b2d877c8cf56