From d670f3aa409353510591eaba7a55555f37f6d732 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 21 Apr 2021 19:28:33 +0200 Subject: lbann: remove deprecated variants in opencv (#23176) --- var/spack/repos/builtin/packages/lbann/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 548da7b22a..790cb2a200 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -10,7 +10,8 @@ from spack import * class Lbann(CMakePackage, CudaPackage, ROCmPackage): """LBANN: Livermore Big Artificial Neural Network Toolkit. A distributed memory, HPC-optimized, model and data parallel training toolkit for deep - neural networks.""" + neural networks. + """ homepage = "http://software.llnl.gov/lbann/" url = "https://github.com/LLNL/lbann/archive/v0.91.tar.gz" @@ -164,11 +165,11 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): # Additionally disable video related options, they incorrectly link in a # bad OpenMP library when building with clang or Intel compilers depends_on('opencv@4.1.0: build_type=RelWithDebInfo +core +highgui ' - '+imgcodecs +imgproc +jpeg +png +tiff +zlib +fast-math ~cuda', + '+imgcodecs +imgproc +jpeg +png +tiff +fast-math ~cuda', when='+vision') - # Note that for Power systems we want the environment to add +powerpc +vsx - depends_on('opencv@4.1.0: +powerpc +vsx', when='+vision arch=ppc64le:') + # Note that for Power systems we want the environment to add +powerpc + depends_on('opencv@4.1.0: +powerpc', when='+vision arch=ppc64le:') depends_on('cnpy', when='+numpy') depends_on('nccl', when='@0.94:0.98.2 +cuda') -- cgit v1.2.3-70-g09d2