Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

### Bug Fixes

Fixed a CMake bug where the SuperLU_MT interface would not be built and
installed without setting the `SUPERLUMT_WORKS` option to `TRUE`.

### Deprecation Notices

## Changes to SUNDIALS in release 7.6.0
Expand Down
32 changes: 15 additions & 17 deletions cmake/SundialsBuildOptionsPost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_OPENMPDEV")
sundials_option(
BUILD_NVECTOR_PARHYP BOOL "Build the NVECTOR_PARHYP module (requires hypre)"
ON
DEPENDS_ON ENABLE_HYPRE HYPRE_WORKS
DEPENDS_ON ENABLE_HYPRE
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_PARHYP")

sundials_option(
BUILD_NVECTOR_PETSC BOOL "Build the NVECTOR_PETSC module (requires PETSc)" ON
DEPENDS_ON ENABLE_PETSC PETSC_WORKS
DEPENDS_ON ENABLE_PETSC
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_PETSC")

Expand All @@ -133,7 +133,7 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_TRILINOS")
sundials_option(
BUILD_NVECTOR_KOKKOS BOOL "Build the NVECTOR_KOKKOS module (requires Kokkos)"
ON
DEPENDS_ON ENABLE_KOKKOS KOKKOS_WORKS
DEPENDS_ON ENABLE_KOKKOS
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_KOKKOS")

Expand Down Expand Up @@ -164,35 +164,34 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNMATRIX_CUSPARSE")
sundials_option(
BUILD_SUNMATRIX_GINKGO BOOL
"Build the SUNMATRIX_GINKGO module (requires Ginkgo)" ON
DEPENDS_ON ENABLE_GINKGO GINKGO_WORKS
DEPENDS_ON ENABLE_GINKGO
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNMATRIX_GINKGO")

sundials_option(
BUILD_SUNMATRIX_KOKKOSDENSE BOOL "Build the SUNMATRIX_KOKKOSDENSE module" ON
DEPENDS_ON ENABLE_KOKKOS KOKKOS_WORKS ENABLE_KOKKOS_KERNELS
KOKKOS_KERNELS_WORKS
DEPENDS_ON ENABLE_KOKKOS ENABLE_KOKKOS_KERNELS
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNMATRIX_KOKKOSDENSE")

sundials_option(
BUILD_SUNMATRIX_MAGMADENSE BOOL
"Build the SUNMATRIX_MAGMADENSE module (requires MAGMA)" ON
DEPENDS_ON ENABLE_MAGMA MAGMA_WORKS
DEPENDS_ON ENABLE_MAGMA
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNMATRIX_MAGMADENSE")

sundials_option(
BUILD_SUNMATRIX_ONEMKLDENSE BOOL
"Build the SUNMATRIX_ONEMKLDENSE module (requires oneMKL)" ON
DEPENDS_ON ENABLE_ONEMKL ONEMKL_WORKS
DEPENDS_ON ENABLE_ONEMKL
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNMATRIX_ONEMKLDENSE")

sundials_option(
BUILD_SUNMATRIX_SLUNRLOC BOOL
"Build the SUNMATRIX_SLUNRLOC module (requires SuperLU_DIST)" ON
DEPENDS_ON ENABLE_SUPERLUDIST SUPERLUDIST_WORKS
DEPENDS_ON ENABLE_SUPERLUDIST
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNMATRIX_SLUNRLOC")

Expand Down Expand Up @@ -227,20 +226,19 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_CUSOLVERSP")
sundials_option(
BUILD_SUNLINSOL_GINKGO BOOL
"Build the SUNLINSOL_GINKGO module (requires Ginkgo)" ON
DEPENDS_ON ENABLE_GINKGO GINKGO_WORKS
DEPENDS_ON ENABLE_GINKGO
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_GINKGO")

sundials_option(
BUILD_SUNLINSOL_KLU BOOL "Build the SUNLINSOL_KLU module (requires KLU)" ON
DEPENDS_ON ENABLE_KLU KLU_WORKS
DEPENDS_ON ENABLE_KLU
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_KLU")

sundials_option(
BUILD_SUNLINSOL_KOKKOSDENSE BOOL "Build the SUNLINSOL_KOKKOSDENSE module" ON
DEPENDS_ON ENABLE_KOKKOS KOKKOS_WORKS ENABLE_KOKKOS_KERNELS
KOKKOS_KERNELS_WORKS
DEPENDS_ON ENABLE_KOKKOS ENABLE_KOKKOS_KERNELS
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_KOKKOSDENSE")

Expand All @@ -261,28 +259,28 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_LAPACKDENSE")
sundials_option(
BUILD_SUNLINSOL_MAGMADENSE BOOL
"Build the SUNLINSOL_MAGMADENSE module (requires MAGMA)" ON
DEPENDS_ON ENABLE_MAGMA MAGMA_WORKS
DEPENDS_ON ENABLE_MAGMA
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_MAGMADENSE")

sundials_option(
BUILD_SUNLINSOL_ONEMKLDENSE BOOL
"Build the SUNLINSOL_ONEMKLDENSE module (requires oneMKL)" ON
DEPENDS_ON ENABLE_ONEMKL ONEMKL_WORKS
DEPENDS_ON ENABLE_ONEMKL
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_ONEMKLDENSE")

sundials_option(
BUILD_SUNLINSOL_SUPERLUDIST BOOL
"Build the SUNLINSOL_SUPERLUDIST module (requires SUPERLUDIST)" ON
DEPENDS_ON ENABLE_SUPERLUDIST SUPERLUDIST_WORKS BUILD_SUNMATRIX_SLUNRLOC
DEPENDS_ON ENABLE_SUPERLUDIST BUILD_SUNMATRIX_SLUNRLOC
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_SUPERLUDIST")

sundials_option(
BUILD_SUNLINSOL_SUPERLUMT BOOL
"Build the SUNLINSOL_SUPERLUMT module (requires SUPERLUMT)" ON
DEPENDS_ON ENABLE_SUPERLUMT SUPERLUMT_WORKS
DEPENDS_ON ENABLE_SUPERLUMT
ADVANCED)
list(APPEND SUNDIALS_BUILD_LIST "BUILD_SUNLINSOL_SUPERLUMT")

Expand Down
3 changes: 3 additions & 0 deletions doc/shared/RecentChanges.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@

**Bug Fixes**

Fixed a CMake bug where the SuperLU_MT interface would not be built and
installed without setting the ``SUPERLUMT_WORKS`` option to ``TRUE``.

**Deprecation Notices**
3 changes: 2 additions & 1 deletion examples/templates/cmakelists_serial_C_ex.in
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ if(SUPERLUMT_LIBRARIES AND examples_slumt)

# directories to include
target_include_directories(${example} PRIVATE ${SUNDIALS_INCLUDE_DIR})
target_include_directories(${example} PRIVATE ${SUPERLUMT_INCLUDE_DIR})
# use SYSTEM to suppress warnings from slu_mt_util.h about MACH not defined
target_include_directories(${example} SYSTEM PRIVATE ${SUPERLUMT_INCLUDE_DIR})

# libraries to link against
target_link_libraries(${example} ${SUNDIALS_LIBRARIES})
Expand Down