diff options
| author | Taillefumier Mathieu <29380261+mtaillefumier@users.noreply.github.com> | 2024-06-17 09:30:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-17 07:30:15 -0600 |
| commit | d9c6b40d8e7dacec9c6dee1c8942aace9717fe78 (patch) | |
| tree | 4fb90652dff54b3641c243108f3f9a62b120c23e /var | |
| parent | d792e1f0523f4dec49803ca5d0844cccb384b059 (diff) | |
| download | spack-d9c6b40d8e7dacec9c6dee1c8942aace9717fe78.tar.gz spack-d9c6b40d8e7dacec9c6dee1c8942aace9717fe78.tar.bz2 spack-d9c6b40d8e7dacec9c6dee1c8942aace9717fe78.tar.xz spack-d9c6b40d8e7dacec9c6dee1c8942aace9717fe78.zip | |
[cp2k] Enforce exclusion of libxsmm main (#44739)
Co-authored-by: Harmen Stoppels <me@harmenstoppels.nl>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cp2k/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/dbcsr/package.py | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index bc8a2c42c9..87aecc3496 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -169,14 +169,14 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): depends_on("cray-libsci+openmp", when="^[virtuals=blas] cray-libsci") with when("smm=libxsmm"): - depends_on("libxsmm@1.17:~header-only", when="@9.1:") + depends_on("libxsmm~header-only") # require libxsmm-1.11+ since 1.10 can leak file descriptors in Fortran - depends_on("libxsmm@1.11:~header-only", when="@:8.9") + depends_on("libxsmm@1.11:") + depends_on("libxsmm@1.17:", when="@9.1:") + # build needs to be fixed for libxsmm@2 once it is released + depends_on("libxsmm@:1") # use pkg-config (support added in libxsmm-1.10) to link to libxsmm depends_on("pkgconfig", type="build") - # please set variants: smm=blas by configuring packages.yaml or install - # cp2k with option smm=blas on aarch64 - conflicts("target=aarch64:", msg="libxsmm is not available on arm") with when("+libint"): depends_on("pkgconfig", type="build", when="@7.0:") @@ -288,6 +288,8 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): depends_on("dbcsr+mpi", when="+mpi") depends_on("dbcsr+cuda", when="+cuda") depends_on("dbcsr+rocm", when="+rocm") + depends_on("dbcsr smm=libxsmm", when="smm=libxsmm") + depends_on("dbcsr smm=blas", when="smm=blas") with when("@2022: +rocm"): depends_on("hipblas") diff --git a/var/spack/repos/builtin/packages/dbcsr/package.py b/var/spack/repos/builtin/packages/dbcsr/package.py index 8f207fb99b..a5298680d7 100644 --- a/var/spack/repos/builtin/packages/dbcsr/package.py +++ b/var/spack/repos/builtin/packages/dbcsr/package.py @@ -54,7 +54,10 @@ class Dbcsr(CMakePackage, CudaPackage, ROCmPackage): depends_on("blas") depends_on("lapack") depends_on("mpi", when="+mpi") - depends_on("libxsmm@1.11:~header-only", when="smm=libxsmm") + + with when("smm=libxsmm"): + depends_on("libxsmm~header-only") + depends_on("libxsmm@1.11:1") depends_on("cmake@3.10:", type="build") depends_on("cmake@3.12:", type="build", when="@2.1:") |