diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/cp2k/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cray-libsci/package.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index ddae41db19..f148db7f48 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -83,7 +83,12 @@ class Cp2k(MakefilePackage, CudaPackage): with when('+openmp'): depends_on('fftw+openmp', when='^fftw') depends_on('amdfftw+openmp', when='^amdfftw') + depends_on('cray-fftw+openmp', when='^cray-fftw') depends_on('openblas threads=openmp', when='^openblas') + # The Cray compiler wrappers will automatically add libsci_mp with + # -fopenmp. Since CP2K unconditionally links blas/lapack/scalapack + # we have to be consistent. + depends_on('cray-libsci+openmp', when='^cray-libsci') with when('smm=libxsmm'): depends_on('libxsmm@1.17:~header-only', when='@9.1:') diff --git a/var/spack/repos/builtin/packages/cray-libsci/package.py b/var/spack/repos/builtin/packages/cray-libsci/package.py index 9a85996199..f9ac97f0e8 100644 --- a/var/spack/repos/builtin/packages/cray-libsci/package.py +++ b/var/spack/repos/builtin/packages/cray-libsci/package.py @@ -30,7 +30,7 @@ class CrayLibsci(Package): provides("blas") provides("lapack") - provides("scalapack") + provides("scalapack", when="+mpi") canonical_names = { 'gcc': 'GNU', |