Pull request #525: release v6.1.1

Merge in SUNDIALS/sunrepo from release/v6.1.1 to develop Squashed commit of the following: commit 0739c43 Author: Balos, Cody, J <balos1@llnl.gov> Date: Fri Feb 11 01:27:39 2022 -0500 address pr comments commit d6f51cc Author: Balos, Cody Joe <balos1@llnl.gov> Date: Thu Feb 10 22:17:49 2022 -0800 Revert "add install_all tests for nvectors" This reverts commit 902064b. commit b7087a7 Author: Balos, Cody Joe <balos1@llnl.gov> Date: Thu Feb 10 17:14:56 2022 -0800 only source files should be in dependencies commit 902064b Author: Balos, Cody Joe <balos1@llnl.gov> Date: Thu Feb 10 17:02:18 2022 -0800 add install_all tests for nvectors commit daba3ae Author: Balos, Cody Joe <balos1@llnl.gov> Date: Thu Feb 10 16:48:43 2022 -0800 separate example_dependencies and installation commit 9c8dcb9 Author: Balos, Cody, J <balos1@llnl.gov> Date: Thu Feb 10 19:34:12 2022 -0500 fix hip vector install tests commit f680d6d Author: David J. Gardner <gardner48@llnl.gov> Date: Thu Feb 10 23:54:36 2022 +0000 update cmake for sycl vector test commit c5efbb3 Author: David J. Gardner <gardner48@llnl.gov> Date: Thu Feb 10 23:21:00 2022 +0000 default to C++17 with SYCL commit 96b8ef2 Author: Balos, Cody Joe <balos1@llnl.gov> Date: Wed Feb 9 09:45:14 2022 -0800 bump version
LLNL · Feb 11, 2022 · 4d377ea · 4d377ea
1 parent 7e1a8a3
commit 4d377ea
Show file tree

Hide file tree

Showing 36 changed files with 242 additions and 325 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # SUNDIALS Changelog
 
-## Changes to SUNDIALS in release x.x.x
+## Changes to SUNDIALS in release 6.1.1
 
 Fixed exported `SUNDIALSConfig.cmake`.
 

diff --git a/CITATIONS.md b/CITATIONS.md
@@ -37,7 +37,7 @@ rather than the combined SUNDIALS online guide:
   author = {Daniel R. Reynolds and David J. Gardner and Carol S. Woodward and Cody J. Balos},
   title  = {User Documentation for ARKODE},
   year   = {2022},
-  note   = {v5.1.0}
+  note   = {v5.1.1}
 }
 ```
 
@@ -46,7 +46,7 @@ rather than the combined SUNDIALS online guide:
   author = {Alan C. Hindmarsh and Radu Serban and Cody J. Balos and David J. Gardner and Daniel R. Reynolds and Carol S. Woodward},
   title  = {User Documentation for CVODE},
   year   = {2022},
-  note   = {v6.1.0}
+  note   = {v6.1.1}
 }
 ```
 
@@ -55,7 +55,7 @@ rather than the combined SUNDIALS online guide:
   author = {Alan C. Hindmarsh and Radu Serban and Cody J. Balos and David J. Gardner and Daniel R. Reynolds and Carol S. Woodward},
   title  = {User Documentation for CVODES},
   year   = {2022},
-  note   = {v6.1.0}
+  note   = {v6.1.1}
 }
 ```
 
@@ -64,7 +64,7 @@ rather than the combined SUNDIALS online guide:
   author = {Alan C. Hindmarsh and Radu Serban and Cody J. Balos and David J. Gardner and Daniel R. Reynolds and Carol S. Woodward},
   title  = {User Documentation for IDA},
   year   = {2022},
-  note   = {v6.1.0}
+  note   = {v6.1.1}
 }
 ```
 
@@ -73,7 +73,7 @@ rather than the combined SUNDIALS online guide:
   author = {Radu Serban and Cosmin Petra and Alan C. Hindmarsh and Cody J. Balos and David J. Gardner and Daniel R. Reynolds and Carol S. Woodward},
   title  = {User Documentation for IDAS},
   year   = {2022},
-  note   = {v5.1.0}
+  note   = {v5.1.1}
 }
 ```
 
@@ -82,6 +82,6 @@ rather than the combined SUNDIALS online guide:
   author = {Alan C. Hindmarsh and Radu Serban and Cody J. Balos and David J. Gardner and Daniel R. Reynolds and Carol S. Woodward},
   title  = {User Documentation for KINSOL},
   year   = {2022},
-  note   = {v6.1.0}
+  note   = {v6.1.1}
 }
 ```
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@ include(FindPackageHandleStandardArgs)
 # Set some variables with info on the SUNDIALS project
 set(PACKAGE_BUGREPORT "sundials-users@llnl.gov")
 set(PACKAGE_NAME "SUNDIALS")
-set(PACKAGE_STRING "SUNDIALS 6.1.0")
+set(PACKAGE_STRING "SUNDIALS 6.1.1")
 set(PACKAGE_TARNAME "sundials")
 
 # Set SUNDIALS version numbers
@@ -52,7 +52,7 @@ message(STATUS "SUNDIALS_GIT_VERSION: ${SUNDIALS_GIT_VERSION}")
 # (use "" for the version label if none is needed)
 set(PACKAGE_VERSION_MAJOR "6")
 set(PACKAGE_VERSION_MINOR "1")
-set(PACKAGE_VERSION_PATCH "0")
+set(PACKAGE_VERSION_PATCH "1")
 set(PACKAGE_VERSION_LABEL "")
 
 if(PACKAGE_VERSION_LABEL)
@@ -67,37 +67,37 @@ endif()
 
 # Specify the VERSION and SOVERSION for shared libraries
 
-set(arkodelib_VERSION "5.1.0")
+set(arkodelib_VERSION "5.1.1")
 set(arkodelib_SOVERSION "5")
 
-set(cvodelib_VERSION "6.1.0")
+set(cvodelib_VERSION "6.1.1")
 set(cvodelib_SOVERSION "6")
 
-set(cvodeslib_VERSION "6.1.0")
+set(cvodeslib_VERSION "6.1.1")
 set(cvodeslib_SOVERSION "6")
 
-set(idalib_VERSION "6.1.0")
+set(idalib_VERSION "6.1.1")
 set(idalib_SOVERSION "6")
 
-set(idaslib_VERSION "5.1.0")
+set(idaslib_VERSION "5.1.1")
 set(idaslib_SOVERSION "5")
 
-set(kinsollib_VERSION "6.1.0")
+set(kinsollib_VERSION "6.1.1")
 set(kinsollib_SOVERSION "6")
 
 set(cpodeslib_VERSION "0.0.0")
 set(cpodeslib_SOVERSION "0")
 
-set(nveclib_VERSION "6.1.0")
+set(nveclib_VERSION "6.1.1")
 set(nveclib_SOVERSION "6")
 
-set(sunmatrixlib_VERSION "4.1.0")
+set(sunmatrixlib_VERSION "4.1.1")
 set(sunmatrixlib_SOVERSION "4")
 
-set(sunlinsollib_VERSION "4.1.0")
+set(sunlinsollib_VERSION "4.1.1")
 set(sunlinsollib_SOVERSION "4")
 
-set(sunnonlinsollib_VERSION "3.1.0")
+set(sunnonlinsollib_VERSION "3.1.1")
 set(sunnonlinsollib_SOVERSION "3")
 
 set(sundialslib_VERSION

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # SUNDIALS: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers #
-### Version 6.1.0 (Jan 2022) ###
+### Version 6.1.1 (Feb 2022) ###
 
 **Center for Applied Scientific Computing, Lawrence Livermore National Laboratory**
 

diff --git a/cmake/SundialsSetupCXX.cmake b/cmake/SundialsSetupCXX.cmake
@@ -25,8 +25,14 @@ set(CXX_FOUND TRUE)
 # ---------------------------------------------------------------
 
 set(DOCSTR "The C++ standard to use if C++ is enabled (98, 11, 14, 17, 20)")
-sundials_option(CMAKE_CXX_STANDARD STRING "${DOCSTR}" "11"
-                OPTIONS "98;11;14;17;20")
+
+if(ENABLE_SYCL)
+  sundials_option(CMAKE_CXX_STANDARD STRING "${DOCSTR}" "17"
+                  OPTIONS "98;11;14;17;20")
+else()
+  sundials_option(CMAKE_CXX_STANDARD STRING "${DOCSTR}" "11"
+                  OPTIONS "98;11;14;17;20")
+endif()
 message(STATUS "CXX standard set to ${CMAKE_CXX_STANDARD}")
 
 set(DOCSTR "Enable C++ compiler specific extensions")

diff --git a/cmake/macros/SundialsInstallExamples.cmake b/cmake/macros/SundialsInstallExamples.cmake
@@ -26,7 +26,7 @@
 #     [EXTRA_INCLUDES includes]
 #   )
 #
-# adds an install target for examples in EXAMPLES_VAR that go with MOUDLE (e.g. arkode, nvecserial).
+# adds an install target for examples in EXAMPLES_VAR that go with MODULE (e.g. arkode, nvecserial).
 #
 # The DESTINATION option is the path *within* EXAMPLES_INSTALL_PATH that the files should be installed.
 #
@@ -42,7 +42,7 @@
 #
 # The OTHER_TARGETS option is a list of CMake targets that the examples need to be linked to.
 #
-# The EXAMPLE_DEPENDENCIES option is a list of additional source files that the examples are dependent on.
+# The EXAMPLES_DEPENDENCIES option is a list of additional source files that the examples are dependent on.
 #
 # The EXTRA_FILES option is a list of files to install that are not example source code.
 #
@@ -73,12 +73,6 @@ macro(sundials_install_examples MODULE EXAMPLES_VAR)
         DESTINATION ${EXAMPLES_INSTALL_PATH}/${sundials_install_examples_DESTINATION})
   endforeach()
 
-  # Install the example dependencies
-  if(DEFINED sundials_install_examples_EXAMPLES_DEPENDENCIES)
-    install(FILES ${sundials_install_examples_EXAMPLES_DEPENDENCIES}
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/${sundials_install_examples_DESTINATION})
-  endif()
-
   # Prepare substitution variables for Makefile and/or CMakeLists templates
   string(TOUPPER "${MODULE}" SOLVER)
   set(SOLVER_LIB "${sundials_install_examples_SOLVER_LIBRARY}")

diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
@@ -118,7 +118,7 @@ provided with SUNDIALS, or again may utilize a user-supplied module.
 Changes from previous versions
 ==============================
 
-Changes in vx.x.x
+Changes in v5.1.1
 -----------------
 
 Fixed exported ``SUNDIALSConfig.cmake``.

diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
@@ -111,7 +111,7 @@ implementations.
 Changes from previous versions
 ==============================
 
-Changes in vx.x.x
+Changes in v6.1.1
 -----------------
 
 Fixed exported ``SUNDIALSConfig.cmake``.

diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
@@ -111,7 +111,7 @@ Fortran.
 Changes from previous versions
 ==============================
 
-Changes in vx.x.x
+Changes in v6.1.1
 -----------------
 
 Fixed exported ``SUNDIALSConfig.cmake``.

diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
@@ -72,7 +72,7 @@ systems.
 Changes from previous versions
 ==============================
 
-Changes in vx.x.x
+Changes in v6.1.1
 -----------------
 
 Fixed exported ``SUNDIALSConfig.cmake``.

diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
@@ -86,7 +86,7 @@ integrate any final-condition ODE dependent on the solution of the original IVP
 Changes from previous versions
 ==============================
 
-Changes in vx.x.x
+Changes in v5.1.1
 -----------------
 
 Fixed exported ``SUNDIALSConfig.cmake``.

diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
@@ -88,7 +88,7 @@ applications written in Fortran.
 Changes from previous versions
 ==============================
 
-Changes in vx.x.x
+Changes in v6.1.1
 -----------------
 
 Fixed exported ``SUNDIALSConfig.cmake``.

diff --git a/doc/shared/History.rst b/doc/shared/History.rst
@@ -21,6 +21,8 @@ Appendix: SUNDIALS Release History
 +----------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
 | Date     | SUNDIALS          | ARKODE            | CVODE             | CVODES            | IDA               | IDAS              | KINSOL            |
 +==========+===================+===================+===================+===================+===================+===================+===================+
+| Feb 2022 | 6.1.1             | 5.1.1             | 6.1.1             | 6.1.1             | 6.1.1             | 5.1.1             | 6.1.1             |
++----------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
 | Jan 2022 | 6.1.0             | 5.1.0             | 6.1.0             | 6.1.0             | 6.1.0             | 5.1.0             | 6.1.0             |
 +----------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
 | Dec 2021 | 6.0.0             | 5.0.0             | 6.0.0             | 6.0.0             | 6.0.0             | 5.0.0             | 6.0.0             |

diff --git a/doc/shared/sundials.bib b/doc/shared/sundials.bib
@@ -28,7 +28,7 @@
 @techreport{arkode_ug,
 author={Daniel R. Reynolds and David J. Gardner and Alan C. Hindmarsh
 and Carol S. Woodward and Jean M. Sexton},
-title       = {{User Documentation for ARKODE v5.1.0}},
+title       = {{User Documentation for ARKODE v5.1.1}},
 institution = {LLNL},
 number      = {LLNL-SM-668082},
 year        = 2022
@@ -38,7 +38,7 @@ @techreport{arkode_ug
 %
 @techreport{arkode_ex,
 author      = {Daniel R. Reynolds},
-title       = {{Example Programs for ARKODE v5.1.0}},
+title       = {{Example Programs for ARKODE v5.1.1}},
 institution = {Southern Methodist University},
 year        = 2022
 }
@@ -47,7 +47,7 @@ @techreport{arkode_ex
 %
 @techreport{cvode_ug,
 author      = {A. C. Hindmarsh and R. Serban},
-title       = {{User Documentation for CVODE v6.1.0}},
+title       = {{User Documentation for CVODE v6.1.1}},
 institution = {LLNL},
 number      = {UCRL-SM-208108},
 year        = 2022
@@ -57,7 +57,7 @@ @techreport{cvode_ug
 %
 @techreport{cvode_ex,
 author      = {A. C. Hindmarsh and R. Serban and D. R. Reynolds},
-title       = {{Example Programs for CVODE v6.1.0}},
+title       = {{Example Programs for CVODE v6.1.1}},
 institution = {LLNL},
 note        = {UCRL-SM-208110},
 year        = 2022
@@ -67,7 +67,7 @@ @techreport{cvode_ex
 %
 @techreport{cvodes_ug,
 author      = {A. C. Hindmarsh and R. Serban},
-title       = {{User Documentation for CVODES v6.1.0}},
+title       = {{User Documentation for CVODES v6.1.1}},
 institution = {LLNL},
 note        = {UCRL-SM-208111},
 year        = 2022
@@ -77,7 +77,7 @@ @techreport{cvodes_ug
 %
 @techreport{cvodes_ex,
 author      = {R. Serban and A. C. Hindmarsh},
-title       = {{Example Programs for CVODES v6.1.0}},
+title       = {{Example Programs for CVODES v6.1.1}},
 institution = {LLNL},
 number      = {UCRL-SM-208115},
 year        = 2022
@@ -87,7 +87,7 @@ @techreport{cvodes_ex
 %
 @techreport{ida_ug,
 author      = {A. C. Hindmarsh and R. Serban and A. Collier},
-title       = {{User Documentation for IDA v6.1.0}},
+title       = {{User Documentation for IDA v6.1.1}},
 institution = {LLNL},
 number      = {UCRL-SM-208112},
 year        = 2022
@@ -97,7 +97,7 @@ @techreport{ida_ug
 %
 @techreport{ida_ex,
 author      = {A. C. Hindmarsh and R. Serban and A. Collier},
-title       = {{Example Programs for IDA v6.1.0}},
+title       = {{Example Programs for IDA v6.1.1}},
 institution = {LLNL},
 number      = {UCRL-SM-208113},
 year        = 2022
@@ -107,7 +107,7 @@ @techreport{ida_ex
 %
 @techreport{idas_ug,
 author      = {R. Serban and C. Petra and A. C. Hindmarsh},
-title       = {{User Documentation for IDAS v5.1.0}},
+title       = {{User Documentation for IDAS v5.1.1}},
 institution = {LLNL},
 number      = {UCRL-SM-234051},
 year        = 2022
@@ -117,7 +117,7 @@ @techreport{idas_ug
 %
 @techreport{idas_ex,
 author      = {R. Serban and A. C. Hindmarsh},
-title       = {{Example Programs for IDAS v5.1.0}},
+title       = {{Example Programs for IDAS v5.1.1}},
 institution = {LLNL},
 number      = {LLNL-TR-437091},
 year        = 2022
@@ -127,7 +127,7 @@ @techreport{idas_ex
 %
 @techreport{kinsol_ug,
 author      = {A. M. Collier and A. C. Hindmarsh and R. Serban and C.S. Woodward},
-title       = {{User Documentation for KINSOL v6.1.0}},
+title       = {{User Documentation for KINSOL v6.1.1}},
 institution = {LLNL},
 number      = {UCRL-SM-208116},
 year        = 2022
@@ -137,7 +137,7 @@ @techreport{kinsol_ug
 %
 @techreport{kinsol_ex,
 author      = {A. M. Collier and R. Serban},
-title       = {{Example Programs for KINSOL v6.1.0}},
+title       = {{Example Programs for KINSOL v6.1.1}},
 institution = {LLNL},
 number      = {UCRL-SM-208114},
 year        = 2022

diff --git a/doc/shared/versions.py b/doc/shared/versions.py
@@ -9,10 +9,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # SUNDIALS Copyright End
 # ----------------------------------------------------------------
-sundials_version = 'v6.1.0'
-arkode_version = 'v5.1.0'
-cvode_version = 'v6.1.0'
-cvodes_version = 'v6.1.0'
-ida_version = 'v6.1.0'
-idas_version = 'v5.1.0'
-kinsol_version = 'v6.1.0'
+sundials_version = 'v6.1.1'
+arkode_version = 'v5.1.1'
+cvode_version = 'v6.1.1'
+cvodes_version = 'v6.1.1'
+ida_version = 'v6.1.1'
+idas_version = 'v5.1.1'
+kinsol_version = 'v6.1.1'