From 5967a104326dde45801f08d87d9468347ddb4c8a Mon Sep 17 00:00:00 2001
From: bernhardkaindl <43588962+bernhardkaindl@users.noreply.github.com>
Date: Sun, 26 Sep 2021 10:37:01 +0200
Subject: candle-benchmarks: depend_on()s: Fix obsoleted and renamed variants
(#26250)
Fix solving/concretizing candle-benchmarks:
py-theano: The requested variant +gpu us now named +cuda
opencv: The requested variants +python and +zlib are now fixed deps
---
var/spack/repos/builtin/packages/candle-benchmarks/package.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py
index 8593e141cd..db7164a2fa 100644
--- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py
+++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py
@@ -20,12 +20,12 @@ class CandleBenchmarks(Package):
extends('python')
depends_on('python@2.7:')
- depends_on('py-theano +gpu', type=('build', 'run'))
+ depends_on('py-theano +cuda', type=('build', 'run'))
depends_on('py-keras', type=('build', 'run'))
depends_on('py-matplotlib +image@:2.2.3', type=('build', 'run'))
depends_on('py-tqdm', type=('build', 'run'))
depends_on('py-scikit-learn', type=('build', 'run'))
- depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn ~eigen ~gtk')
+ depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff -dnn ~eigen ~gtk')
depends_on('py-mdanalysis', type=('build', 'run'))
depends_on('py-mpi4py', when='+mpi', type=('build', 'run'))
depends_on('py-h5py~mpi', when='~mpi', type=('build', 'run'))
--
cgit v1.2.3-70-g09d2