From 82d4d58ca70f4cbd112dbae257014439276925ef Mon Sep 17 00:00:00 2001
From: Brian Van Essen <vanessen1@llnl.gov>
Date: Thu, 25 Jan 2018 13:10:37 -0700
Subject: [PATCH] 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.
---
var/spack/repos/builtin/packages/lbann/package.py | 4 ++--
1 file 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 @@ def cmake_args(self):
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)])
--
GitLab