diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2017-08-11 06:29:24 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-08-11 08:29:24 -0500 |
| commit | 71c5b19464d1c0ad615af9509e8bb624dada7ec2 (patch) | |
| tree | 4a29bac1e112da99536b5b6119968730e9b726e5 /var | |
| parent | 038efc623df52dc4e9fc581fcddf81bb8d7b2f9a (diff) | |
| download | spack-71c5b19464d1c0ad615af9509e8bb624dada7ec2.tar.gz spack-71c5b19464d1c0ad615af9509e8bb624dada7ec2.tar.bz2 spack-71c5b19464d1c0ad615af9509e8bb624dada7ec2.tar.xz spack-71c5b19464d1c0ad615af9509e8bb624dada7ec2.zip | |
Elemental fix (#5067)
* Added a package for the MDAnalysis toolkit.
* Added additional packages that Elemental depends on.
* Changed LBANN to not ask for the scalapack variant in Elemental.
* Removed variant control on scalapack
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/elemental/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index 50fb4f9829..87317bd909 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -87,6 +87,9 @@ class Elemental(CMakePackage): depends_on('scalapack', when='+scalapack ~int64_blas') extends('python', when='+python') depends_on('python@:2.8', when='+python') + depends_on('gmp') + depends_on('mpc') + depends_on('mpfr') patch('elemental_cublas.patch', when='+cublas') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index a93b9b5b66..f717b02df0 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -44,8 +44,8 @@ class Lbann(CMakePackage): description='The build type to build', values=('Debug', 'Release')) - depends_on('elemental +openmp_blas +scalapack +shared +int64') - depends_on('elemental +openmp_blas +scalapack +shared +int64 build_type=Debug', + depends_on('elemental +openmp_blas +shared +int64') + depends_on('elemental +openmp_blas +shared +int64 build_type=Debug', when=('build_type=Debug')) depends_on('cuda', when='+gpu') depends_on('mpi') |