diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2017-03-08 12:32:26 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-03-08 14:32:26 -0600 |
| commit | acf95c92a667e0861b3a55451717744ffffcd5b7 (patch) | |
| tree | 85b98436d0227c49142e348e3636a74b245be0d6 | |
| parent | bacb60457d0490f4fd4ab4132006e8099e65535e (diff) | |
| download | spack-acf95c92a667e0861b3a55451717744ffffcd5b7.tar.gz spack-acf95c92a667e0861b3a55451717744ffffcd5b7.tar.bz2 spack-acf95c92a667e0861b3a55451717744ffffcd5b7.tar.xz spack-acf95c92a667e0861b3a55451717744ffffcd5b7.zip | |
Fixes the Elemental and LBANN packages to conform to the new syntax (#3382)
introduced by PR https://github.com/LLNL/spack/pull/1875
| -rw-r--r-- | var/spack/repos/builtin/packages/elemental/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index ccc55092d0..f1cc77c33c 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -79,7 +79,7 @@ class Elemental(CMakePackage): depends_on('python@:2.8', when='+python') @property - def elemental_libs(self): + def libs(self): shared = True if '+shared' in self.spec else False return find_libraries( 'libEl', root=self.prefix, shared=shared, recurse=True diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 341487ca77..f0355fb96d 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -45,7 +45,7 @@ class Lbann(CMakePackage): depends_on('elemental +openmp_blas +scalapack +shared +int64 +debug', when='+debug') depends_on('cuda', when='+gpu') depends_on('mpi') - depends_on('opencv@2.4.13', when='+opencv') + depends_on('opencv@3.2.0', when='+opencv') depends_on('protobuf@3.0.2') def build_type(self): @@ -71,7 +71,7 @@ class Lbann(CMakePackage): '-DWITH_VTUNE=OFF', '-DElemental_DIR={0}'.format(self.spec['elemental'].prefix), '-DELEMENTAL_MATH_LIBS={0}'.format( - self.spec['elemental'].elemental_libs), + self.spec['elemental'].libs), '-DVERBOSE=0', '-DLBANN_HOME=.', '-DLBANN_VER=spack'] |