From 2dd93ed5fafa794805594908ec8e800360ad60e4 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 22 Feb 2018 10:54:46 -0700 Subject: ECP-CANDLE benchmark script (#7271) * Added a package for the MDAnalysis toolkit. * Added a variant to the candle benchmark to make MPI support optional. * Added py-requests package. --- .../repos/builtin/packages/candle-benchmarks/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index e2ba9bc310..4d86e18dd4 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -35,16 +35,20 @@ class CandleBenchmarks(Package): version('1.0', '6eced30dc15374bc9f90a86d0396e470') - depends_on('python@2.7:') + variant('mpi', default=True, description='Build with MPI support') + + extends('python@2.7:') depends_on('py-theano +gpu', type=('build', 'run')) depends_on('py-keras', type=('build', 'run')) depends_on('py-matplotlib +image', 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') + depends_on('opencv@3.2.0: +core +highgui +imgproc +jpeg +png +tiff +zlib +python -dnn ~eigen') depends_on('py-mdanalysis', type=('build', 'run')) - depends_on('py-mpi4py', type=('build', 'run')) - depends_on('py-h5py', type=('build', 'run')) + depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) + depends_on('py-h5py~mpi', when='~mpi', type=('build', 'run')) + depends_on('py-h5py+mpi', when='+mpi', type=('build', 'run')) + depends_on('py-requests', type=('build', 'run')) # see #3244, but use external for now # depends_on('tensorflow') -- cgit v1.2.3-70-g09d2