hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes the Elemental and LBANN packages to conform to the new syntax (#3382)

Browse source 
introduced by PR https://github.com/LLNL/spack/pull/1875
This commit is contained in:
Brian Van Essen 2017-03-08 12:32:26 -08:00 committed by Adam J. Stewart
parent bacb60457d
commit acf95c92a6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
var/spack/repos/builtin/packages/elemental/package.py
View file

@ -79,7 +79,7 @@ class Elemental(CMakePackage):
depends_on('python@:2.8', when='+python') depends_on('python@:2.8', when='+python')
@property @property
def elemental_libs(self): def libs(self):
shared = True if '+shared' in self.spec else False shared = True if '+shared' in self.spec else False
return find_libraries( return find_libraries(
'libEl', root=self.prefix, shared=shared, recurse=True 'libEl', root=self.prefix, shared=shared, recurse=True

4
var/spack/repos/builtin/packages/lbann/package.py
View file

@ -45,7 +45,7 @@ class Lbann(CMakePackage):
depends_on('elemental +openmp_blas +scalapack +shared +int64 +debug', when='+debug') depends_on('elemental +openmp_blas +scalapack +shared +int64 +debug', when='+debug')
depends_on('cuda', when='+gpu') depends_on('cuda', when='+gpu')
depends_on('mpi') 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') depends_on('protobuf@3.0.2')
def build_type(self): def build_type(self):
@ -71,7 +71,7 @@ def cmake_args(self):
'-DWITH_VTUNE=OFF', '-DWITH_VTUNE=OFF',
'-DElemental_DIR={0}'.format(self.spec['elemental'].prefix), '-DElemental_DIR={0}'.format(self.spec['elemental'].prefix),
'-DELEMENTAL_MATH_LIBS={0}'.format( '-DELEMENTAL_MATH_LIBS={0}'.format(
self.spec['elemental'].elemental_libs), self.spec['elemental'].libs),
'-DVERBOSE=0', '-DVERBOSE=0',
'-DLBANN_HOME=.', '-DLBANN_HOME=.',
'-DLBANN_VER=spack'] '-DLBANN_VER=spack']