From 4e885b4358f2d7444c1959a92ed13b67a20d1c21 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Wed, 21 Jul 2021 05:20:53 -0700 Subject: lbann: update darwin build (#24998) * Updated the lbann package to not enabled OpenMP in BLAS package when working on Darwin systems. * Add the Sphinx RTD theme as an explicit dependency when building documentation --- var/spack/repos/builtin/packages/lbann/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 772b117a1d..2471850790 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +import sys from spack import * @@ -111,7 +112,8 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on('hydrogen@1.5.0:', when='@:0.90,0.102:') # Add Hydrogen variants - depends_on('hydrogen +openmp +openmp_blas +shared +int64') + depends_on('hydrogen +openmp +shared +int64') + depends_on('hydrogen +openmp_blas', when=sys.platform != 'darwin') depends_on('hydrogen ~al', when='~al') depends_on('hydrogen +al', when='+al') depends_on('hydrogen ~cuda', when='~cuda') @@ -138,6 +140,7 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on('dihydrogen@0.2.0:', when='@:0.90,0.102:') depends_on('dihydrogen +openmp', when='+dihydrogen') + depends_on('dihydrogen +openmp_blas', when=sys.platform != 'darwin') depends_on('dihydrogen ~cuda', when='+dihydrogen ~cuda') depends_on('dihydrogen +cuda', when='+dihydrogen +cuda') depends_on('dihydrogen ~al', when='+dihydrogen ~al') @@ -222,6 +225,7 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on('protobuf+shared@3.10.0', when='@:0.90,0.99:') depends_on('py-breathe', type='build', when='+docs') + depends_on('py-sphinx-rtd-theme', type='build', when='+docs') depends_on('doxygen', type='build', when='+docs') depends_on('py-m2r', type='build', when='+docs') -- cgit v1.2.3-70-g09d2