From 1fb40c0e091eb7b103e1103b8990e1387bf78ccc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 23:59:16 -0800 Subject: [PATCH 1/3] Build(deps): Bump docker/build-push-action from 6.10.0 to 6.11.0 (#639) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.10.0 to 6.11.0.
Release notes

Sourced from docker/build-push-action's releases.

v6.11.0

Full Changelog: https://github.com/docker/build-push-action/compare/v6.10.0...v6.11.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=docker/build-push-action&package-manager=github_actions&previous-version=6.10.0&new-version=6.11.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-ci-containers-e4s.yml | 4 ++-- .github/workflows/build-ci-containers-nightly.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-ci-containers-e4s.yml b/.github/workflows/build-ci-containers-e4s.yml index ee7c931f8d..ed79b5b8b3 100644 --- a/.github/workflows/build-ci-containers-e4s.yml +++ b/.github/workflows/build-ci-containers-e4s.yml @@ -26,7 +26,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker images - uses: docker/build-push-action@v6.10.0 + uses: docker/build-push-action@v6.11.0 with: context: "./docker/sundials-ci/e4s-base" build-args: e4s_version=22.05 @@ -56,7 +56,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker images - uses: docker/build-push-action@v6.10.0 + uses: docker/build-push-action@v6.11.0 with: context: "./docker/sundials-ci/e4s-quarterly" build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml diff --git a/.github/workflows/build-ci-containers-nightly.yml b/.github/workflows/build-ci-containers-nightly.yml index 176b3a3d88..903af38179 100644 --- a/.github/workflows/build-ci-containers-nightly.yml +++ b/.github/workflows/build-ci-containers-nightly.yml @@ -32,7 +32,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker images - uses: docker/build-push-action@v6.10.0 + uses: docker/build-push-action@v6.11.0 with: context: "./docker/sundials-ci/spack-nightly" build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml From 517507bbf42af6eb5e190d9a77d3344942cbf7da Mon Sep 17 00:00:00 2001 From: David Gardner Date: Tue, 14 Jan 2025 08:31:19 -0800 Subject: [PATCH 2/3] Bugfix: SUNDIALS_ENABLE_ERROR_CHECKS default value (#638) Fix the behavior of `SUNDIALS_ENABLE_ERROR_CHECKS` so additional runtime error checks are disabled by default with all release build types. Previously, `MinSizeRel` builds enabled additional error checking by default. --- CHANGELOG.md | 4 ++++ cmake/SundialsBuildOptionsPre.cmake | 6 +++--- doc/shared/RecentChanges.rst | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce33fda21b..68d83b9c68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ ### Bug Fixes +Fixed the behavior of `SUNDIALS_ENABLE_ERROR_CHECKS` so additional runtime error +checks are disabled by default with all release build types. Previously, +`MinSizeRel` builds enabled additional error checking by default. + Fixed bug in the ARKODE SPRKStep `SPRKStepReInit` function and `ARKodeReset` function with SPRKStep that could cause a segmentation fault when compensated summation is not used. diff --git a/cmake/SundialsBuildOptionsPre.cmake b/cmake/SundialsBuildOptionsPre.cmake index 6b23028b13..8ea29370ad 100644 --- a/cmake/SundialsBuildOptionsPre.cmake +++ b/cmake/SundialsBuildOptionsPre.cmake @@ -76,10 +76,10 @@ endif() # Option to enable/disable error checking # --------------------------------------------------------------- -if(CMAKE_BUILD_TYPE MATCHES "Release|RelWithDebInfo") - set(_default_err_checks OFF) -else() +if(CMAKE_BUILD_TYPE MATCHES "Debug") set(_default_err_checks ON) +else() + set(_default_err_checks OFF) endif() set(DOCSTR diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst index 50278b737b..ff0980756f 100644 --- a/doc/shared/RecentChanges.rst +++ b/doc/shared/RecentChanges.rst @@ -4,6 +4,10 @@ **Bug Fixes** +Fixed the behavior of :cmakeop:`SUNDIALS_ENABLE_ERROR_CHECKS` so additional +runtime error checks are disabled by default with all release build types. +Previously, ``MinSizeRel`` builds enabled additional error checking by default. + Fixed bug in the ARKODE SPRKStep :c:func:`SPRKStepReInit` function and :c:func:`ARKodeReset` function with SPRKStep that could cause a segmentation fault when compensated summation is not used. From 87fef531fc3cc9da2b3e45ef345141151b573a54 Mon Sep 17 00:00:00 2001 From: "Daniel R. Reynolds" Date: Tue, 14 Jan 2025 12:40:36 -0600 Subject: [PATCH 3/3] Mustafa-contributor (#643) This PR rectifies an omission from our last release, where we forgot to update the lists of SUNDIALS contributors to include Mustafa Aggul (who contributed the ARKODE LSRKStep module). --- README.md | 2 +- doc/arkode/guide/source/Landing.rst | 2 +- doc/arkode/guide/source/conf.py | 9 +++++---- doc/shared/latex/cover_pages.tex.txt | 2 +- doc/superbuild/source/index.rst | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7d8c58712a..60f888884f 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ David J. Gardner, Alan C. Hindmarsh, Daniel R. Reynolds, Steven B. Roberts, and Carol S. Woodward. We thank Radu Serban for significant and critical past contributions. -Other contributors to SUNDIALS include: James Almgren-Bell, Lawrence E. Banks, +Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell, Lawrence E. Banks, Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier, Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer, Yu Pan, Slaven Peles, Cosmin Petra, H. Hunter Schwartz, Jean M. Sexton, diff --git a/doc/arkode/guide/source/Landing.rst b/doc/arkode/guide/source/Landing.rst index a58691747d..4073fdf8c0 100644 --- a/doc/arkode/guide/source/Landing.rst +++ b/doc/arkode/guide/source/Landing.rst @@ -20,7 +20,7 @@ Woodward. We thank Radu Serban for significant and critical past contributions. - Other contributors to SUNDIALS include: James Almgren-Bell, + Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell, Lawrence E. Banks, Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier, Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer, Yu Pan, Slaven Peles, diff --git a/doc/arkode/guide/source/conf.py b/doc/arkode/guide/source/conf.py index 2975c7bd36..1cb1e5eb4c 100644 --- a/doc/arkode/guide/source/conf.py +++ b/doc/arkode/guide/source/conf.py @@ -51,7 +51,7 @@ # General information about the project. project = u'User Documentation for ARKODE' -copyright = u"""2012-{year}, Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos""".format(year = year) +copyright = u"""2012-{year}, Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Cody J. Balos, Rujeko Chinomona, and Mustafa Aggul""".format(year = year) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -217,8 +217,9 @@ Daniel R. Reynolds$^1$, David J. Gardner$^2$, Carol S. Woodward$^2$, + Cody J. Balos$^2$ Rujeko Chinomona$^3$, and - Cody J. Balos$^2$ \\ + Mustafa Aggul$^1$ \\ \\ {\em $^1$Department of Mathematics, Southern Methodist University} \\ {\em $^2$Center for Applied Scientific Computing, Lawrence Livermore National Laboratory} \\ @@ -275,7 +276,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'ARKODE', u'ARKODE Documentation', - [u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos'], 1) + [u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Cody J. Balos, Rujeko Chinomona, and Mustafa Aggul'], 1) ] # If true, show URL addresses after external links. @@ -289,7 +290,7 @@ # dir menu entry, description, category) texinfo_documents = [ ('index', 'ARKODE', u'ARKODE Documentation', - u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos', 'ARKODE', + u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Cody J. Balos, Rujeko Chinomona, and Mustafa Aggul', 'ARKODE', 'Time integration package for multi-rate systems of ordinary differential equations.', 'Miscellaneous'), ] diff --git a/doc/shared/latex/cover_pages.tex.txt b/doc/shared/latex/cover_pages.tex.txt index 251764bdf2..1e61966eaa 100644 --- a/doc/shared/latex/cover_pages.tex.txt +++ b/doc/shared/latex/cover_pages.tex.txt @@ -80,7 +80,7 @@ Carol S. Woodward. We thank Radu Serban for significant and critical past contributions.\\ \vskip 2em% \noindent -Other contributors to SUNDIALS include: James Almgren-Bell, Lawrence E. Banks, +Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell, Lawrence E. Banks, Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier, Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer, Yu Pan, Slaven Peles, Cosmin Petra, Steven B. Roberts, H. Hunter Schwartz, diff --git a/doc/superbuild/source/index.rst b/doc/superbuild/source/index.rst index 4af642e5f2..179340e945 100644 --- a/doc/superbuild/source/index.rst +++ b/doc/superbuild/source/index.rst @@ -143,7 +143,7 @@ contributors. The current SUNDIALS team consists of Cody J. Balos, David J. Gardner, Alan C. Hindmarsh, Daniel R. Reynolds, and Carol S. Woodward. We thank Radu Serban for significant and critical past contributions. -Other contributors to SUNDIALS include: James Almgren-Bell, Lawrence E. Banks, +Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell, Lawrence E. Banks, Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier, Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer, Yu Pan, Slaven Peles, Cosmin Petra, Steven B. Roberts, H. Hunter Schwartz,