Release/6.6.2 (#363)

CHANGELOG.md

@@ -1,5 +1,10 @@
 # SUNDIALS Changelog
 
+## Changes to SUNDIALS in release 6.6.2
+
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.

CITATIONS.md

@@ -66,7 +66,7 @@ they are using 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   = {2023},
-  note   = {v5.6.1}
+  note   = {v5.6.2}
 }
 ```
 
@@ -75,7 +75,7 @@ they are using 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   = {2023},
-  note   = {v6.6.1}
+  note   = {v6.6.2}
 }
 ```
 
@@ -84,7 +84,7 @@ they are using 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   = {2023},
-  note   = {v6.6.1}
+  note   = {v6.6.2}
 }
 ```
 
@@ -93,7 +93,7 @@ they are using 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   = {2023},
-  note   = {v6.6.1}
+  note   = {v6.6.2}
 }
 ```
 
@@ -102,7 +102,7 @@ they are using 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   = {2023},
-  note   = {v5.6.1}
+  note   = {v5.6.2}
 }
 ```
 
@@ -111,6 +111,6 @@ they are using 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   = {2023},
-  note   = {v6.6.1}
+  note   = {v6.6.2}
 }
 ```

CMakeLists.txt

@@ -42,7 +42,7 @@ include(FindPackageHandleStandardArgs)
 # Set some variables with info on the SUNDIALS project
 set(PACKAGE_BUGREPORT "[email protected]")
 set(PACKAGE_NAME "SUNDIALS")
-set(PACKAGE_STRING "SUNDIALS 6.6.1")
+set(PACKAGE_STRING "SUNDIALS 6.6.2")
 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 "6")
-set(PACKAGE_VERSION_PATCH "1")
+set(PACKAGE_VERSION_PATCH "2")
 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.6.1")
+set(arkodelib_VERSION "5.6.2")
 set(arkodelib_SOVERSION "5")
 
-set(cvodelib_VERSION "6.6.1")
+set(cvodelib_VERSION "6.6.2")
 set(cvodelib_SOVERSION "6")
 
-set(cvodeslib_VERSION "6.6.1")
+set(cvodeslib_VERSION "6.6.2")
 set(cvodeslib_SOVERSION "6")
 
-set(idalib_VERSION "6.6.1")
+set(idalib_VERSION "6.6.2")
 set(idalib_SOVERSION "6")
 
-set(idaslib_VERSION "5.6.1")
+set(idaslib_VERSION "5.6.2")
 set(idaslib_SOVERSION "5")
 
-set(kinsollib_VERSION "6.6.1")
+set(kinsollib_VERSION "6.6.2")
 set(kinsollib_SOVERSION "6")
 
 set(cpodeslib_VERSION "0.0.0")
 set(cpodeslib_SOVERSION "0")
 
-set(nveclib_VERSION "6.6.1")
+set(nveclib_VERSION "6.6.2")
 set(nveclib_SOVERSION "6")
 
-set(sunmatrixlib_VERSION "4.6.1")
+set(sunmatrixlib_VERSION "4.6.2")
 set(sunmatrixlib_SOVERSION "4")
 
-set(sunlinsollib_VERSION "4.6.1")
+set(sunlinsollib_VERSION "4.6.2")
 set(sunlinsollib_SOVERSION "4")
 
-set(sunnonlinsollib_VERSION "3.6.1")
+set(sunnonlinsollib_VERSION "3.6.2")
 set(sunnonlinsollib_SOVERSION "3")
 
 set(sundialslib_VERSION

README.md

@@ -1,5 +1,5 @@
 # SUNDIALS: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers #
-### Version 6.6.1 (Sep 2023) ###
+### Version 6.6.2 (Nov 2023) ###
 
 **Center for Applied Scientific Computing, Lawrence Livermore National Laboratory**
 

cmake/tpl/FindMAGMA.cmake

@@ -66,24 +66,42 @@ if(MAGMA_LIBRARY AND MAGMA_INCLUDE_DIR)
     list(SUBLIST _libraries_list 1 -1 _libraries_list) # remove 'Libs:' part
 
     set(_interface_libraires )
+
+    if(SUNDIALS_MAGMA_BACKENDS MATCHES "HIP")
+      if(NOT TARGET roc::hipblas)
+        find_package(hipblas REQUIRED)
+      endif()
+      if(NOT TARGET roc::hipsparse)
+        find_package(hipsparse REQUIRED)
+      endif()
+      # MAGMA does not reliably include these in the pkgconfig file
+      list(APPEND _interface_libraires "roc::hipblas;roc::hipsparse")
+    endif()
+
+    if(SUNDIALS_MAGMA_BACKENDS MATCHES "CUDA")
+      if (NOT TARGET CUDA::cudart)
+        find_package(CUDAToolkit REQUIRED)
+      endif() 
+    endif()
+
     foreach(lib ${_libraries_list})
       if(NOT (lib STREQUAL "-lmagma" OR lib STREQUAL "-lmagma_sparse"
             OR lib STREQUAL "-L\${libdir}" OR lib STREQUAL "") )
-
-        # Remove -l only from the beginning of the string
-        string(REPLACE "^-l" "" lib ${lib})
-        list(APPEND _interface_libraires ${lib})
-
-        # Check if we need to find roc::hipblas or roc::hipsparse
-        if(SUNDIALS_MAGMA_BACKENDS MATCHES "HIP")
-          if((lib STREQUAL "roc::hipblas") AND (NOT TARGET roc::hipblas))
-            find_package(hipblas REQUIRED)
+
+        # Check if we need to find cusparse or cublas
+        if(SUNDIALS_MAGMA_BACKENDS MATCHES "CUDA")
+          # Replace cublas, cusparse with the CMake targets because the library path in
+          # the magma pkgconfig is not reliable. Sepcifically, the path is wrong on systems
+          # like Perlmutter where the NVIDIA HPC SDK is used.
+          if(lib STREQUAL "-lcublas")
+            set(lib CUDA::cublas)
           endif()
-          if((lib STREQUAL "roc::hipsparse") AND (NOT TARGET roc::hipsparse))
-            find_package(hipsparse REQUIRED)
+          if(lib STREQUAL "-lcusparse")
+            set(lib CUDA::cusparse)
           endif()
         endif()
-
+
+        list(APPEND _interface_libraires ${lib})
       endif()
     endforeach()
 

doc/arkode/guide/source/Introduction.rst

@@ -130,6 +130,12 @@ provided with SUNDIALS, or again may utilize a user-supplied module.
 Changes from previous versions
 ==============================
 
+Changes in v5.6.2
+-----------------
+
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Changes in v5.6.1
 -----------------
 

doc/cvode/guide/source/Introduction.rst

@@ -111,6 +111,12 @@ implementations.
 Changes from previous versions
 ==============================
 
+Changes in v6.6.2
+-----------------
+
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Changes in v6.6.1
 -----------------
 

doc/cvodes/guide/source/Introduction.rst

@@ -111,6 +111,12 @@ Fortran.
 Changes from previous versions
 ==============================
 
+Changes in v6.6.2
+-----------------
+
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Changes in v6.6.1
 -----------------
 

doc/ida/guide/source/Introduction.rst

@@ -72,6 +72,12 @@ systems.
 Changes from previous versions
 ==============================
 
+Changes in v6.6.2
+-----------------
+
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Changes in v6.6.1
 -----------------
 

doc/idas/guide/source/Introduction.rst

@@ -86,6 +86,12 @@ integrate any final-condition ODE dependent on the solution of the original IVP
 Changes from previous versions
 ==============================
 
+Changes in v5.6.2
+-----------------
+
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Changes in v5.6.1
 -----------------
 

doc/kinsol/guide/source/Introduction.rst

@@ -88,6 +88,12 @@ applications written in Fortran.
 Changes from previous versions
 ==============================
 
+Changes in v6.6.2
+-----------------
+
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Changes in v6.6.1
 -----------------
 

doc/shared/History.rst

@@ -21,6 +21,8 @@ Appendix: SUNDIALS Release History
 +----------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
 | Date     | SUNDIALS          | ARKODE            | CVODE             | CVODES            | IDA               | IDAS              | KINSOL            |
 +==========+===================+===================+===================+===================+===================+===================+===================+
+| Nov 2023 | 6.6.2             | 5.6.2             | 6.6.2             | 6.6.2             | 6.6.2             | 5.6.2             | 6.6.2             |
++----------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
 | Sep 2023 | 6.6.1             | 5.6.1             | 6.6.1             | 6.6.1             | 6.6.1             | 5.6.1             | 6.6.1             |
 +----------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
 | Jul 2023 | 6.6.0             | 5.6.0             | 6.6.0             | 6.6.0             | 6.6.0             | 5.6.0             | 6.6.0             |

doc/shared/sundials.bib

@@ -27,7 +27,7 @@
 %
 @techreport{arkode_ug,
 author      = {Daniel R. Reynolds and David J. Gardner and Carol S. Woodward and Rujeko Chinomona and Cody J. Balos},
-title       = {{User Documentation for ARKODE v5.6.1}},
+title       = {{User Documentation for ARKODE v5.6.2}},
 institution = {LLNL},
 number      = {LLNL-SM-668082},
 year        = 2023
@@ -37,7 +37,7 @@ @techreport{arkode_ug
 %
 @techreport{arkode_ex,
 author      = {Daniel R. Reynolds},
-title       = {{Example Programs for ARKODE v5.6.1}},
+title       = {{Example Programs for ARKODE v5.6.2}},
 institution = {Southern Methodist University},
 year        = 2023
 }
@@ -46,7 +46,7 @@ @techreport{arkode_ex
 %
 @techreport{cvode_ug,
 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 v6.6.1}},
+title       = {{User Documentation for CVODE v6.6.2}},
 institution = {LLNL},
 number      = {UCRL-SM-208108},
 year        = 2023
@@ -56,7 +56,7 @@ @techreport{cvode_ug
 %
 @techreport{cvode_ex,
 author      = {Alan C. Hindmarsh and Radu Serban},
-title       = {{Example Programs for CVODE v6.6.1}},
+title       = {{Example Programs for CVODE v6.6.2}},
 institution = {LLNL},
 note        = {UCRL-SM-208110},
 year        = 2023
@@ -66,7 +66,7 @@ @techreport{cvode_ex
 %
 @techreport{cvodes_ug,
 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 v6.6.1}},
+title       = {{User Documentation for CVODES v6.6.2}},
 institution = {LLNL},
 note        = {UCRL-SM-208111},
 year        = 2023
@@ -76,7 +76,7 @@ @techreport{cvodes_ug
 %
 @techreport{cvodes_ex,
 author      = {Radu Serban and Alan C. Hindmarsh},
-title       = {{Example Programs for CVODES v6.6.1}},
+title       = {{Example Programs for CVODES v6.6.2}},
 institution = {LLNL},
 number      = {UCRL-SM-208115},
 year        = 2023
@@ -86,7 +86,7 @@ @techreport{cvodes_ex
 %
 @techreport{ida_ug,
 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 v6.6.1}},
+title       = {{User Documentation for IDA v6.6.2}},
 institution = {LLNL},
 number      = {UCRL-SM-208112},
 year        = 2023
@@ -96,7 +96,7 @@ @techreport{ida_ug
 %
 @techreport{ida_ex,
 author      = {Alan C. Hindmarsh and Radu Serban and Aaron Collier},
-title       = {{Example Programs for IDA v6.6.1}},
+title       = {{Example Programs for IDA v6.6.2}},
 institution = {LLNL},
 number      = {UCRL-SM-208113},
 year        = 2023
@@ -106,7 +106,7 @@ @techreport{ida_ex
 %
 @techreport{idas_ug,
 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 v5.6.1}},
+title       = {{User Documentation for IDAS v5.6.2}},
 institution = {LLNL},
 number      = {UCRL-SM-234051},
 year        = 2023
@@ -116,7 +116,7 @@ @techreport{idas_ug
 %
 @techreport{idas_ex,
 author      = {Radu Serban and Alan C. Hindmarsh},
-title       = {{Example Programs for IDAS v5.6.1}},
+title       = {{Example Programs for IDAS v5.6.2}},
 institution = {LLNL},
 number      = {LLNL-TR-437091},
 year        = 2023
@@ -126,7 +126,7 @@ @techreport{idas_ex
 %
 @techreport{kinsol_ug,
 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 v6.6.1}},
+title       = {{User Documentation for KINSOL v6.6.2}},
 institution = {LLNL},
 number      = {UCRL-SM-208116},
 year        = 2023
@@ -136,7 +136,7 @@ @techreport{kinsol_ug
 %
 @techreport{kinsol_ex,
 author      = {Aaron M. Collier and Radu Serban},
-title       = {{Example Programs for KINSOL v6.6.1}},
+title       = {{Example Programs for KINSOL v6.6.2}},
 institution = {LLNL},
 number      = {UCRL-SM-208114},
 year        = 2023