diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2018-01-25 13:10:37 -0700 |
|---|---|---|
| committer | scheibelp <scheibel1@llnl.gov> | 2018-01-25 12:10:37 -0800 |
| commit | 82d4d58ca70f4cbd112dbae257014439276925ef (patch) | |
| tree | cb96f9eaa38df15da992a473529290fae1f90496 /var | |
| parent | 85c887a93915e48d91f087e62d77de48a03d8324 (diff) | |
| download | spack-82d4d58ca70f4cbd112dbae257014439276925ef.tar.gz spack-82d4d58ca70f4cbd112dbae257014439276925ef.tar.bz2 spack-82d4d58ca70f4cbd112dbae257014439276925ef.tar.xz spack-82d4d58ca70f4cbd112dbae257014439276925ef.zip | |
Lbann package: bug fix (#7066)
Fixed a bug in the guard on cub functionality. Reduced the
requirements on hwloc to make it simpler to build on Power systems.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 6cc53ae2df..6a32a53d8b 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -56,7 +56,7 @@ class Lbann(CMakePackage): depends_on('cudnn', when='+gpu') depends_on('cub', when='+gpu') 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('protobuf@3.0.2:') depends_on('cnpy') @@ -148,7 +148,7 @@ class Lbann(CMakePackage): args.extend(['-DcuDNN_DIR={0}'.format( spec['cudnn'].prefix)]) - if '+cudnn' in spec: + if '+cub' in spec: args.extend(['-DCUB_DIR={0}'.format( spec['cub'].prefix)]) |