zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lbann package: bug fix (#7066)

Browse Source 
Fixed a bug in the guard on cub functionality.  Reduced the
requirements on hwloc to make it simpler to build on Power systems.
This commit is contained in:
Brian Van Essen 2018-01-25 13:10:37 -07:00 committed by scheibelp
parent 85c887a939
commit 82d4d58ca7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class Lbann(CMakePackage):
depends_on('cudnn', when='+gpu') depends_on('cudnn', when='+gpu')
depends_on('cub', when='+gpu') depends_on('cub', when='+gpu')
depends_on('mpi') depends_on('mpi')
depends_on('hwloc') depends_on('hwloc ~pci ~libxml2')
depends_on('opencv@3.2.0: +openmp +core +highgui +imgproc +jpeg +png +tiff +zlib ~eigen', when='+opencv') depends_on('opencv@3.2.0: +openmp +core +highgui +imgproc +jpeg +png +tiff +zlib ~eigen', when='+opencv')
depends_on('protobuf@3.0.2:') depends_on('protobuf@3.0.2:')
depends_on('cnpy') depends_on('cnpy')
@ -148,7 +148,7 @@ def cmake_args(self):
args.extend(['-DcuDNN_DIR={0}'.format( args.extend(['-DcuDNN_DIR={0}'.format(
spec['cudnn'].prefix)]) spec['cudnn'].prefix)])
if '+cudnn' in spec: if '+cub' in spec:
args.extend(['-DCUB_DIR={0}'.format( args.extend(['-DCUB_DIR={0}'.format(
spec['cub'].prefix)]) spec['cub'].prefix)])