diff options
| author | Veselin Dobrev <v-dobrev@users.noreply.github.com> | 2022-11-13 07:50:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-13 09:50:57 -0600 |
| commit | a5d35c3077cbf66993ce48b4486cf9955b896385 (patch) | |
| tree | 71378f544d2d95443db719c87497da24b04d9c89 | |
| parent | 3d811617e6b10c822ba8ede6549f5c65d9d8cd1c (diff) | |
| download | spack-a5d35c3077cbf66993ce48b4486cf9955b896385.tar.gz spack-a5d35c3077cbf66993ce48b4486cf9955b896385.tar.bz2 spack-a5d35c3077cbf66993ce48b4486cf9955b896385.tar.xz spack-a5d35c3077cbf66993ce48b4486cf9955b896385.zip | |
[sundials] fix cmake argument generation for '+magma' (#33858)
[dealii] force cmake to accept Scalapack settings from Spack
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sundials/package.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 902e310be6..b4cade21df 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -591,6 +591,9 @@ class Dealii(CMakePackage, CudaPackage): self.define("SCALAPACK_FOUND", True), self.define("SCALAPACK_INCLUDE_DIRS", spec["scalapack"].prefix.include), self.define("SCALAPACK_LIBRARIES", scalapack_libs.joined(";")), + # If SCALAPACK_LIBRARY is not set, deal.II still searches + # for SCALAPACK despite the above settings: + self.define("SCALAPACK_LIBRARY", scalapack_libs.joined(";")), ] ) diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index d345bb793b..4b22721a41 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -452,9 +452,9 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): if "+magma" in spec: args.extend([define("ENABLE_MAGMA", True), define("MAGMA_DIR", spec["magma"].prefix)]) if "+cuda" in spec: - define("SUNDIALS_MAGMA_BACKENDS", "CUDA") + args.extend([define("SUNDIALS_MAGMA_BACKENDS", "CUDA")]) if "+rocm" in spec: - define("SUNDIALS_MAGMA_BACKENDS", "HIP") + args.extend([define("SUNDIALS_MAGMA_BACKENDS", "HIP")]) # Building with PETSc if "+petsc" in spec: |