Merge branch 'develop' into feature/real-format3

Author: Steven-Roberts

.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.3.0
+      uses: docker/build-push-action@v6.7.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.3.0
+      uses: docker/build-push-action@v6.7.0
       with:
           context: "./docker/sundials-ci/e4s-quarterly"
           build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

.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.3.0
+      uses: docker/build-push-action@v6.7.0
       with:
           context: "./docker/sundials-ci/spack-nightly"
           build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

CHANGELOG.md

@@ -12,13 +12,33 @@ Volta GPUs while the automatically selected value will vary across compilers and
 compiler versions. As such, users are encouraged to override this value with the
 architecture for their system.
 
+The Trilinos Teptra NVector interface has been updated to utilize CMake
+imported targets added in Trilinos 14 to improve support for different Kokkos
+backends with Trilinos.  As such, Trilinos 14 or newer is required and the
+`Trilinos_INTERFACE_*` CMake options have been removed.
+
+Example programs using *hypre* have been updated to support v2.20 and newer.
+
+The build system has been updated to utilize the CMake LAPACK imported target
+which should ease building SUNDIALS with LAPACK libraries that require setting
+specific linker flags e.g., MKL.
+
 ### Bug Fixes
 
+Fixed `ARKodeResize` not using the default `hscale` when an argument of `0` was
+provided.
+
 Fixed the loading of ARKStep's default first order explicit method.
 
 Fixed a CMake bug regarding usage of missing "print_warning" macro
 that was only triggered when the deprecated `CUDA_ARCH` option was used.
 
+Fixed a memory leak that could occur if ``ARKodeSetDefaults`` is called
+repeatedly.
+
+Fixed compilation errors when building the Trilinos Teptra NVector with CUDA
+support.
+
 ### Deprecation Notices
 
 ## Changes to SUNDIALS in release 7.1.1

benchmarks/CMakeLists.txt

@@ -24,8 +24,10 @@ sundials_option(BENCHMARK_NVECTOR BOOL "NVector benchmarks are on" ON)
 
 # Disable some warnings for benchmarks
 if(ENABLE_ALL_WARNINGS)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
+  set(CMAKE_C_FLAGS
+      "${CMAKE_C_FLAGS} -Wno-unused-parameter -Wno-unused-function")
+  set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-unused-function")
 endif()
 
 # ----------------------------------------

benchmarks/advection_reaction_3D/raja/backends.hpp

@@ -114,12 +114,23 @@ using XYZ_KERNEL_POL =
 
 #else
 #define NVECTOR_ID_STRING "Serial"
-using EXEC_POLICY           = RAJA::seq_exec;
-using XYZ_KERNEL_POL        = RAJA::KernelPolicy<RAJA::statement::For<
+
+#if RAJA_VERSION_MAJOR < 2024
+using EXEC_POLICY    = RAJA::seq_exec;
+using XYZ_KERNEL_POL = RAJA::KernelPolicy<RAJA::statement::For<
   2, RAJA::loop_exec,
   RAJA::statement::For<
     1, RAJA::loop_exec,
     RAJA::statement::For<0, RAJA::loop_exec, RAJA::statement::Lambda<0>>>>>;
+#else
+using EXEC_POLICY    = RAJA::seq_exec;
+using XYZ_KERNEL_POL = RAJA::KernelPolicy<RAJA::statement::For<
+  2, RAJA::seq_exec,
+  RAJA::statement::For<
+    1, RAJA::seq_exec,
+    RAJA::statement::For<0, RAJA::seq_exec, RAJA::statement::Lambda<0>>>>>;
+#endif
+
 constexpr auto LocalNvector = N_VNew_Serial;
 #define CopyVecFromDevice(v)
 

cmake/SUNDIALSConfig.cmake.in

@@ -108,6 +108,16 @@ if("@ENABLE_KOKKOS_KERNELS@" AND NOT TARGET Kokkos::kokkoskernels)
   find_dependency(KokkosKernels PATHS "@KokkosKernels_DIR@")
 endif()
 
+if("@ENABLE_LAPACK@" AND NOT TARGET LAPACK::LAPACK)
+  # For some reason find_dependency does not find the libraries if the variables
+  # below are internal rather than CACHE variables
+  set(BLAS_LIBRARIES "@BLAS_LIBRARIES@" CACHE "FILEPATH" "BLAS libraries")
+  set(BLAS_LINKER_FLAGS "@BLAS_LINKER_FLAGS@" CACHE "STRING" "BLAS linker flags")
+  set(LAPACK_LIBRARIES "@LAPACK_LIBRARIES@" CACHE "FILEPATH" "LAPACK libraries")
+  set(LAPACK_LINKER_FLAGS "@LAPACK_LINKER_FLAGS@" CACHE "STRING" "LAPACK linker flags")
+  find_dependency(LAPACK)
+endif()
+
 if("@ENABLE_PETSC@" AND NOT TARGET SUNDIALS::PETSC)
   add_library(SUNDIALS::PETSC INTERFACE IMPORTED)
   target_link_libraries(SUNDIALS::PETSC INTERFACE "@PETSC_LIBRARIES@")
@@ -161,10 +171,8 @@ if("@ENABLE_RAJA@" AND NOT TARGET RAJA)
   find_dependency(RAJA PATHS "@RAJA_DIR@")
 endif()
 
-if("@ENABLE_TRILINOS@" AND NOT TARGET SUNDIALS::TRILINOS)
-  add_library(SUNDIALS::TRILINOS INTERFACE IMPORTED)
-  target_link_libraries(SUNDIALS::TRILINOS INTERFACE "@Trilinos_LIBRARIES@")
-  set_target_properties(SUNDIALS::TRILINOS PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@Trilinos_INCLUDE_DIRS@")
+if("@ENABLE_TRILINOS@" AND NOT TARGET Tpetra::all_libs)
+  find_dependency(Trilinos COMPONENTS Tpetra PATHS "@Trilinos_DIR@")
 endif()
 
 if("@ENABLE_XBRAID@" AND NOT TARGET SUNDIALS::XBRAID)

cmake/SundialsBuildOptionsPost.cmake

@@ -123,7 +123,7 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_RAJA")
 sundials_option(
   BUILD_NVECTOR_TRILINOS BOOL
   "Build the NVECTOR_TRILINOS module (requires Trilinos)" ON
-  DEPENDS_ON ENABLE_TRILINOS Trilinos_WORKS
+  DEPENDS_ON ENABLE_TRILINOS
   ADVANCED)
 list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_TRILINOS")
 
@@ -244,14 +244,14 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_KOKKOSDENSE")
 sundials_option(
   BUILD_SUNLINSOL_LAPACKBAND BOOL
   "Build the SUNLINSOL_LAPACKBAND module (requires LAPACK)" ON
-  DEPENDS_ON ENABLE_LAPACK LAPACK_WORKS
+  DEPENDS_ON ENABLE_LAPACK
   ADVANCED)
 list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_LAPACKBAND")
 
 sundials_option(
   BUILD_SUNLINSOL_LAPACKDENSE BOOL
   "Build the SUNLINSOL_LAPACKDENSE module (requires LAPACK)" ON
-  DEPENDS_ON ENABLE_LAPACK LAPACK_WORKS
+  DEPENDS_ON ENABLE_LAPACK
   ADVANCED)
 list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_LAPACKDENSE")
 

cmake/SundialsSetupConfig.cmake

@@ -65,7 +65,7 @@ foreach(tpl ${SUNDIALS_TPL_LIST})
 endforeach()
 
 # prepare substitution variable SUNDIALS_TRILINOS_HAVE_MPI for sundials_config.h
-if(Trilinos_MPI)
+if(ENABLE_MPI)
   set(SUNDIALS_TRILINOS_HAVE_MPI TRUE)
 endif()
 

cmake/SundialsTPLOptions.cmake

@@ -269,42 +269,6 @@ sundials_option(ENABLE_TRILINOS BOOL "Enable Trilinos support" OFF)
 sundials_option(Trilinos_DIR PATH "Path to root of Trilinos installation"
                 "${Trilinos_DIR}" DEPENDS_ON ENABLE_TRILINOS)
 
-sundials_option(
-  Trilinos_INTERFACE_CXX_COMPILER STRING "C++ compiler for Trilinos interface"
-  "${Trilinos_CXX_COMPILER}"
-  DEPENDS_ON ENABLE_TRILINOS
-  ADVANCED)
-
-sundials_option(
-  Trilinos_INTERFACE_C_COMPILER STRING "C compiler for Trilinos interface"
-  "${Trilinos_C_COMPILER}"
-  DEPENDS_ON ENABLE_TRILINOS
-  ADVANCED)
-
-sundials_option(
-  Trilinos_INTERFACE_CXX_COMPILER_FLAGS STRING
-  "C++ compiler flags for Trilinos interface" "${Trilinos_CXX_COMPILER_FLAGS}"
-  DEPENDS_ON ENABLE_TRILINOS
-  ADVANCED)
-
-sundials_option(
-  Trilinos_INTERFACE_C_COMPILER_FLAGS STRING
-  "C compiler flags for Trilinos interface" "${Trilinos_C_COMPILER_FLAGS}"
-  DEPENDS_ON ENABLE_TRILINOS
-  ADVANCED)
-
-sundials_option(
-  Trilinos_INTERFACE_MPIEXEC STRING "MPI executable for Trilinos interface"
-  "${Trilinos_MPI_EXEC}"
-  DEPENDS_ON ENABLE_TRILINOS
-  ADVANCED)
-
-sundials_option(
-  Trilinos_WORKS BOOL
-  "Set to ON to force CMake to accept a given Trilinos configuration" OFF
-  DEPENDS_ON ENABLE_TRILINOS
-  ADVANCED)
-
 # ---------------------------------------------------------------
 # Enable XBraid support?
 # ---------------------------------------------------------------

cmake/macros/SundialsAddTest.cmake

@@ -89,6 +89,21 @@ macro(SUNDIALS_ADD_TEST NAME EXECUTABLE)
   cmake_parse_arguments(SUNDIALS_ADD_TEST "${options}" "${oneValueArgs}"
                         "${multiValueArgs}" ${ARGN})
 
+  # check if any options for setting command line args have been provided by
+  # comparing them against an empty string -- this is needed to avoid missing
+  # single args that are a false constant in CMake e.g., 0, FALSE, OFF, etc.
+  if("${SUNDIALS_ADD_TEST_TEST_ARGS}" STREQUAL "")
+    set(_have_test_args FALSE)
+  else()
+    set(_have_test_args TRUE)
+  endif()
+
+  if("${SUNDIALS_ADD_TEST_EXTRA_ARGS}" STREQUAL "")
+    set(_have_extra_test_args FALSE)
+  else()
+    set(_have_extra_test_args TRUE)
+  endif()
+
   # check that the test is not excluded
   string(TOLOWER "exclude-${SUNDIALS_PRECISION}" _exclude_precision)
   if(("${SUNDIALS_ADD_TEST_EXAMPLE_TYPE}" STREQUAL "exclude")
@@ -186,17 +201,17 @@ macro(SUNDIALS_ADD_TEST NAME EXECUTABLE)
       endif()
 
       # set the test input args
-      if(SUNDIALS_ADD_TEST_TEST_ARGS)
+      if(_have_test_args)
         string(REPLACE ";" " " _user_args "${SUNDIALS_ADD_TEST_TEST_ARGS}")
         set(_run_args "${_user_args}")
         unset(_user_args)
       endif()
-      if(SUNDIALS_ADD_TEST_EXTRA_ARGS)
+      if(_have_extra_test_args)
         string(REPLACE ";" " " _extra_args "${SUNDIALS_ADD_TEST_EXTRA_ARGS}")
         set(_run_args "${_run_args} ${_extra_args}")
         unset(_extra_args)
       endif()
-      if(_run_args)
+      if(_have_test_args OR _have_extra_test_args)
         string(STRIP "${_run_args}" _run_args)
         list(APPEND TEST_ARGS "--runargs=\"${_run_args}\"")
         unset(_run_args)
@@ -214,7 +229,7 @@ macro(SUNDIALS_ADD_TEST NAME EXECUTABLE)
       # pass/fail
 
       # convert string to list
-      if(SUNDIALS_ADD_TEST_TEST_ARGS)
+      if(_have_test_args)
         string(REPLACE " " ";" TEST_ARGS "${SUNDIALS_ADD_TEST_TEST_ARGS}")
       endif()