diff options
| author | Rocco Meli <r.meli@bluemail.ch> | 2024-06-07 13:16:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 13:16:53 +0200 |
| commit | f87ee334c266319f00b246811e8b5817460d9a7d (patch) | |
| tree | 87dcaa892a1ca2ea9b036f60893d635cd0cf889e | |
| parent | e8f8cf8543b31ff6ba81a5ab0e515bc9a4856384 (diff) | |
| download | spack-f87ee334c266319f00b246811e8b5817460d9a7d.tar.gz spack-f87ee334c266319f00b246811e8b5817460d9a7d.tar.bz2 spack-f87ee334c266319f00b246811e8b5817460d9a7d.tar.xz spack-f87ee334c266319f00b246811e8b5817460d9a7d.zip | |
CP2K: use dla-future-fortran depencency (#44603)
* Spglib: add version 2.4.0
* DLA-Future: fix +test option
* cp2k: add dla-future-fortran dependency
* Update var/spack/repos/builtin/packages/cp2k/package.py
| -rw-r--r-- | var/spack/repos/builtin/packages/cp2k/package.py | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 8e62699904..6092aff656 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -224,11 +224,23 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): depends_on("elpa@2023.05.001:", when="@2023.2:") with when("+dlaf"): - depends_on("dla-future@0.2.1: +scalapack") - 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") + with when("@:2024.1"): + depends_on("dla-future@0.2.1: +scalapack") + 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") + + with when("@master"): + depends_on("dla-future-fortran@0.1.0:") + + # Use a direct dependency on dla-future so that constraints can be expressed + # WARN: In the concretizer output, dla-future will appear as dependency of CP2K + # instead of dla-future-fortran + 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") with when("+plumed"): depends_on("plumed+shared") |