diff options
| -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'] |