From 71c5b19464d1c0ad615af9509e8bb624dada7ec2 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Fri, 11 Aug 2017 06:29:24 -0700 Subject: 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 --- var/spack/repos/builtin/packages/elemental/package.py | 3 +++ var/spack/repos/builtin/packages/lbann/package.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'var') 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') -- cgit v1.2.3-60-g2f50