Release/6.4.0 (#215)

* replace non-ascii characters and remove tabs in bib files * Feature/findpetsc with pkgconf (#216) * Update output in ARKODE ADR example (#217) * bump version to 6.4.0 Co-authored-by: David J. Gardner <[email protected]>
LLNL · Oct 21, 2022 · b27bf8a · b27bf8a
1 parent 154e8ec
commit b27bf8a
Show file tree

Hide file tree

Showing 43 changed files with 635 additions and 1,405 deletions.
diff --git a/CITATIONS.md b/CITATIONS.md
@@ -62,7 +62,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 = {2022},
- note = {v5.3.0}
+ note = {v5.4.0}
 }
 ```
 
@@ -71,7 +71,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 = {2022},
- note = {v6.3.0}
+ note = {v6.4.0}
 }
 ```
 
@@ -80,7 +80,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 = {2022},
- note = {v6.3.0}
+ note = {v6.4.0}
 }
 ```
 
@@ -89,7 +89,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 = {2022},
- note = {v6.3.0}
+ note = {v6.4.0}
 }
 ```
 
@@ -98,7 +98,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 = {2022},
- note = {v5.3.0}
+ note = {v5.4.0}
 }
 ```
 
@@ -107,6 +107,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 = {2022},
- note = {v6.3.0}
+ note = {v6.4.0}
 }
 ```
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 "[email protected]")
 set(PACKAGE_NAME "SUNDIALS")
-set(PACKAGE_STRING "SUNDIALS 6.3.0")
+set(PACKAGE_STRING "SUNDIALS 6.4.0")
 set(PACKAGE_TARNAME "sundials")
 
 # Set SUNDIALS version numbers
@@ -51,7 +51,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 "3")
+set(PACKAGE_VERSION_MINOR "4")
 set(PACKAGE_VERSION_PATCH "0")
 set(PACKAGE_VERSION_LABEL "")
 
@@ -67,37 +67,37 @@ endif()
 
 # Specify the VERSION and SOVERSION for shared libraries
 
-set(arkodelib_VERSION "5.3.0")
+set(arkodelib_VERSION "5.4.0")
 set(arkodelib_SOVERSION "5")
 
-set(cvodelib_VERSION "6.3.0")
+set(cvodelib_VERSION "6.4.0")
 set(cvodelib_SOVERSION "6")
 
-set(cvodeslib_VERSION "6.3.0")
+set(cvodeslib_VERSION "6.4.0")
 set(cvodeslib_SOVERSION "6")
 
-set(idalib_VERSION "6.3.0")
+set(idalib_VERSION "6.4.0")
 set(idalib_SOVERSION "6")
 
-set(idaslib_VERSION "5.3.0")
+set(idaslib_VERSION "5.4.0")
 set(idaslib_SOVERSION "5")
 
-set(kinsollib_VERSION "6.3.0")
+set(kinsollib_VERSION "6.4.0")
 set(kinsollib_SOVERSION "6")
 
 set(cpodeslib_VERSION "0.0.0")
 set(cpodeslib_SOVERSION "0")
 
-set(nveclib_VERSION "6.3.0")
+set(nveclib_VERSION "6.4.0")
 set(nveclib_SOVERSION "6")
 
-set(sunmatrixlib_VERSION "4.3.0")
+set(sunmatrixlib_VERSION "4.4.0")
 set(sunmatrixlib_SOVERSION "4")
 
-set(sunlinsollib_VERSION "4.3.0")
+set(sunlinsollib_VERSION "4.4.0")
 set(sunlinsollib_SOVERSION "4")
 
-set(sunnonlinsollib_VERSION "3.3.0")
+set(sunnonlinsollib_VERSION "3.4.0")
 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.3.0 (Aug 2022) ###
+### Version 6.4.0 (Oct 2022) ###
 
 **Center for Applied Scientific Computing, Lawrence Livermore National Laboratory**
 

diff --git a/benchmarks/nvector/petsc/CMakeLists.txt b/benchmarks/nvector/petsc/CMakeLists.txt
@@ -19,6 +19,6 @@ message(STATUS "Added PETSc NVECTOR benchmark")
 sundials_add_nvector_benchmark(nvector_petsc_benchmark
  SOURCES test_nvector_performance_petsc.c
  SUNDIALS_TARGETS sundials_nvecpetsc
- LINK_LIBRARIES MPI::MPI_C PUBLIC SUNDIALS::PETSC_VEC
+ LINK_LIBRARIES MPI::MPI_C PUBLIC SUNDIALS::PETSC
  INSTALL_SUBDIR benchmarks/nvector/petsc
  )
diff --git a/cmake/SUNDIALSConfig.cmake.in b/cmake/SUNDIALSConfig.cmake.in
@@ -56,11 +56,11 @@ endforeach()
 ### ------- Create TPL imported targets
 
 if("@ENABLE_OPENMP@" AND NOT TARGET OpenMP::OpenMP_C)
- find_package(OpenMP)
+ find_dependency(OpenMP)
 endif()
 
 if("@ENABLE_CALIPER@" AND NOT TARGET caliper)
- find_package(CALIPER PATHS "@CALIPER_DIR@")
+ find_dependency(CALIPER PATHS "@CALIPER_DIR@")
 endif()
 
 if("@ENABLE_CUDA@" AND NOT (TARGET CUDA::cudart AND TARGET CUDA::cublas
@@ -95,55 +95,27 @@ if("@ENABLE_KOKKOS_KERNELS@" AND NOT TARGET Kokkos::kokkoskernels)
  find_dependency(KokkosKernels PATHS "@KokkosKernels_DIR@")
 endif()
 
-if("@ENABLE_PETSC@")
- set(_petsc_library_single "@PETSC_LIBRARY_SINGLE@")
- if("@PETSC_VERSION@" VERSION_LESS 3.1)
- set(_petsc_definitions "-D__SDIR__=\"\"")
- else()
- set(_petsc_definitions "-D__INSDIR__=\"\"")
- endif()
- if(${_petsc_library_single})
- foreach(suffix SYS VEC MAT DM KSP SNES TS ALL)
- if(NOT TARGET SUNDIALS::PETSC_${suffix})
- add_library(SUNDIALS::PETSC_${suffix} INTERFACE IMPORTED)
- set_target_properties(SUNDIALS::PETSC_${suffix} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "@PETSC_INCLUDES_@")
- set_target_properties(SUNDIALS::PETSC_${suffix} PROPERTIES
- INTERFACE_LINK_LIBRARIES "@PETSC_LIBRARIES_@")
- set_target_properties(SUNDIALS::PETSC_${suffix} PROPERTIES
- INTERFACE_COMPILE_OPTIONS ${_petsc_definitions})
- endif()
- endforeach()
- else()
- set(PESTC_LIBRARY_SYS "@PETSC_LIBRARY_SYS@")
- set(PESTC_LIBRARY_VEC "@PETSC_LIBRARY_VEC@")
- set(PESTC_LIBRARY_MAT "@PETSC_LIBRARY_MAT@")
- set(PESTC_LIBRARY_DM "@PETSC_LIBRARY_DM@")
- set(PESTC_LIBRARY_KSP "@PETSC_LIBRARY_KSP@")
- set(PESTC_LIBRARY_SNES "@PETSC_LIBRARY_SNES@")
- set(PESTC_LIBRARY_TS "@PETSC_LIBRARY_TS@")
- set(PESTC_LIBRARY_ALL "@PETSC_LIBRARY_ALL@")
-
- set(PESTC_LIBRARIES_SYS "@PETSC_LIBRARIES_SYS@")
- set(PESTC_LIBRARIES_VEC "@PETSC_LIBRARIES_VEC@")
- set(PESTC_LIBRARIES_MAT "@PETSC_LIBRARIES_MAT@")
- set(PESTC_LIBRARIES_DM "@PETSC_LIBRARIES_DM@")
- set(PESTC_LIBRARIES_KSP "@PETSC_LIBRARIES_KSP@")
- set(PESTC_LIBRARIES_SNES "@PETSC_LIBRARIES_SNES@")
- set(PESTC_LIBRARIES_TS "@PETSC_LIBRARIES_TS@")
- set(PESTC_LIBRARIES_ALL "@PETSC_LIBRARIES_ALL@")
-
- foreach(suffix SYS VEC MAT DM KSP SNES TS ALL)
- if(NOT TARGET SUNDIALS::PETSC_${suffix})
- add_library(SUNDIALS::PETSC_${suffix} INTERFACE IMPORTED)
- set_target_properties (SUNDIALS::PETSC_${suffix} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "@PETSC_INCLUDES_@")
- set_target_properties (SUNDIALS::PETSC_${suffix} PROPERTIES
- INTERFACE_LINK_LIBRARIES "${PETSC_LIBRARIES_${suffix}}")
- set_target_properties (SUNDIALS::PETSC_${suffix} PROPERTIES
- INTERFACE_COMPILE_OPTIONS ${_petsc_definitions})
- endif()
- endforeach()
+if("@ENABLE_PETSC@" AND NOT TARGET SUNDIALS::PETSC)
+ add_library(SUNDIALS::PETSC INTERFACE IMPORTED)
+ target_link_libraries(SUNDIALS::PETSC INTERFACE "@PETSC_LIBRARIES@")
+ set_target_properties(SUNDIALS::PETSC PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@PETSC_INCLUDE_DIRS@")
+
+ # for backwards compatibility
+ foreach(suffix SYS VEC MAT DM KSP SNES TS ALL)
+ if(NOT TARGET SUNDIALS::PETSC_${suffix})
+ add_library(SUNDIALS::PETSC_${suffix} INTERFACE IMPORTED)
+ set_target_properties (SUNDIALS::PETSC_${suffix} PROPERTIES
+ INTERFACE_LINK_LIBRARIES "SUNDIALS::PETSC")
+ endif()
+ endforeach()
+
+ if("@PETSC_LIBRARIES@" MATCHES "Kokkos::kokkos")
+ if(NOT TARGET Kokkos::kokkoskernels)
+ find_dependency(KokkosKernels PATHS "@KokkosKernels_DIR@")
+ endif()
+ if(NOT TARGET Kokkos::kokkos)
+ find_dependency(Kokkos PATHS "@Kokkos_DIR@")
+ endif()
  endif()
 endif()
 
@@ -154,7 +126,7 @@ if("@ENABLE_MAGMA@" AND NOT TARGET SUNDIALS::MAGMA)
 endif()
 
 if("@ENABLE_ONEMKL@" AND NOT TARGET MKL)
- find_package(MKL PATHS "@ONEMKL_DIR@")
+ find_dependency(MKL PATHS "@ONEMKL_DIR@")
 endif()
 
 if("@ENABLE_SUPERLUDIST@" AND NOT TARGET SUNDIALS::SUPERLUDIST)
@@ -173,7 +145,7 @@ if("@ENABLE_RAJA@" AND NOT TARGET RAJA)
  if(NOT TARGET camp AND NOT camp_DIR)
  set(camp_DIR "@camp_DIR@")
  endif()
- find_package(RAJA PATHS "@RAJA_DIR@")
+ find_dependency(RAJA PATHS "@RAJA_DIR@")
 endif()
 
 if("@ENABLE_TRILINOS@" AND NOT TARGET SUNDIALS::TRILINOS)

diff --git a/cmake/SundialsTPLOptions.cmake b/cmake/SundialsTPLOptions.cmake
@@ -309,8 +309,7 @@ sundials_option(CALIPER_WORKS BOOL "Set to ON to force CMake to accept a given C
 
 sundials_option(ENABLE_KOKKOS BOOL "Enable Kokkos support" OFF)
 
-sundials_option(Kokkos_DIR PATH "Path to the root of a Kokkos installation" "${Kokkos_DIR}"
- DEPENDS_ON ENABLE_KOKKOS)
+sundials_option(Kokkos_DIR PATH "Path to the root of a Kokkos installation" "${Kokkos_DIR}")
 
 sundials_option(KOKKOS_WORKS BOOL "Set to ON to force CMake to accept a given Kokkos configuration" OFF
  DEPENDS_ON ENABLE_KOKKOS
@@ -322,8 +321,7 @@ sundials_option(KOKKOS_WORKS BOOL "Set to ON to force CMake to accept a given Ko
 
 sundials_option(ENABLE_KOKKOS_KERNELS BOOL "Enable Kokkos Kernels support" OFF)
 
-sundials_option(KokkosKernels_DIR PATH "Path to the root of a Kokkos Kernels installation" "${KokkosKernels_DIR}"
- DEPENDS_ON ENABLE_KOKKOS ENABLE_KOKKOS_KERNELS)
+sundials_option(KokkosKernels_DIR PATH "Path to the root of a Kokkos Kernels installation" "${KokkosKernels_DIR}")
 
 sundials_option(KOKKOS_KERNELS_WORKS BOOL "Set to ON to force CMake to accept a given Kokkos configuration" OFF
  DEPENDS_ON ENABLE_KOKKOS ENABLE_KOKKOS_KERNELS

diff --git a/cmake/macros/CorrectWindowsPaths.cmake b/cmake/macros/CorrectWindowsPaths.cmake