diff options
author | alalazo <massimiliano.culpo@googlemail.com> | 2016-02-11 18:18:05 +0100 |
---|---|---|
committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-02-11 18:18:05 +0100 |
commit | b272a8881becf205c09ac11228dd035b99fa0fcd (patch) | |
tree | 4def31dce36a85698304f71c32843c0ed4e3073c /var | |
parent | ca3cdb445825126776c5269481540d3afac02c9f (diff) | |
download | spack-b272a8881becf205c09ac11228dd035b99fa0fcd.tar.gz spack-b272a8881becf205c09ac11228dd035b99fa0fcd.tar.bz2 spack-b272a8881becf205c09ac11228dd035b99fa0fcd.tar.xz spack-b272a8881becf205c09ac11228dd035b99fa0fcd.zip |
espresso : fixed dependency handling
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/espresso/package.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/espresso/package.py b/var/spack/repos/builtin/packages/espresso/package.py index 56b8c056b8..df37bb0d71 100644 --- a/var/spack/repos/builtin/packages/espresso/package.py +++ b/var/spack/repos/builtin/packages/espresso/package.py @@ -1,5 +1,3 @@ -import llnl.util.tty as tty - from spack import * @@ -15,21 +13,21 @@ class Espresso(Package): variant('mpi', default=True, description='Build Quantum-ESPRESSO with mpi support') variant('openmp', default=False, description='Enables openMP support') - variant('scalapack', default=False, description='Enables scalapack support') + variant('scalapack', default=True, description='Enables scalapack support') variant('elpa', default=True, description='Use elpa as an eigenvalue solver') depends_on('blas') depends_on('lapack') depends_on('mpi', when='+mpi') - depends_on('elpa', when='+elpa') - depends_on('scalapack', when='+scalapack') + depends_on('elpa', when='+elpa+scalapack+mpi') # TODO : + mpi needed to avoid false dependencies installation + depends_on('scalapack', when='+scalapack+mpi') # TODO : + mpi needed to avoid false dependencies installation def check_variants(self, spec): error = 'you cannot ask for \'+{variant}\' when \'+mpi\' is not active' if '+scalapack' in spec and '~mpi' in spec: raise RuntimeError(error.format(variant='scalapack')) - if '+elpa' in spec and '~mpi' in spec: + if '+elpa' in spec and ('~mpi' in spec or '~scalapack' in spec): raise RuntimeError(error.format(variant='elpa')) def install(self, spec, prefix): |