From 7cb70e3258dbdc1ba073bf27b22dc86ecd5abfad Mon Sep 17 00:00:00 2001 From: Rocco Meli Date: Mon, 27 Nov 2023 09:08:50 +0100 Subject: force cp2k cuda/rocm variant on elpa (#41241) --- var/spack/repos/builtin/packages/cp2k/package.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 0d90d0d123..5234f46f7a 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -229,6 +229,10 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): conflicts("~mpi", msg="elpa requires MPI") depends_on("elpa+openmp", when="+openmp") depends_on("elpa~openmp", when="~openmp") + depends_on("elpa+cuda", when="+cuda") + depends_on("elpa~cuda", when="~cuda") + depends_on("elpa+rocm", when="+rocm") + depends_on("elpa~rocm", when="~rocm") depends_on("elpa@2021.05:", when="@8.3:") depends_on("elpa@2021.11.001:", when="@9.1:") depends_on("elpa@2023.05.001:", when="@2023.2:") @@ -238,7 +242,8 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): "~mpi", msg="DLA-Future requires MPI. Only the distributed eigensolver is available." ) depends_on("dla-future@0.2.1: +scalapack") - depends_on("dla-future ~cuda~rocm", when="~cuda~rocm") + depends_on("dla-future ~cuda", when="~cuda") + depends_on("dla-future ~rocm", when="~rocm") depends_on("dla-future +cuda", when="+cuda") depends_on("dla-future +rocm", when="+rocm") -- cgit v1.2.3-60-g2f50