From 1e90160d681e80f212fd357128ca8af63ef576f0 Mon Sep 17 00:00:00 2001 From: Miguel Dias Costa Date: Mon, 25 Oct 2021 13:42:05 +0800 Subject: [PATCH] berkeleygw: force openmp propagation on some providers of blas / ffw-api (#26918) --- .../repos/builtin/packages/berkeleygw/package.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/berkeleygw/package.py b/var/spack/repos/builtin/packages/berkeleygw/package.py index b1cf9397f8..0995676515 100644 --- a/var/spack/repos/builtin/packages/berkeleygw/package.py +++ b/var/spack/repos/builtin/packages/berkeleygw/package.py @@ -14,6 +14,8 @@ class Berkeleygw(MakefilePackage): homepage = "https://berkeleygw.org" + maintainers = ['migueldiascosta'] + version('3.0.1', '7d8c2cc1ee679afb48efbdd676689d4d537226b50e13a049dbcb052aaaf3654f', url='https://berkeley.box.com/shared/static/m1dgnhiemo47lhxczrn6si71bwxoxor8.gz', @@ -67,13 +69,12 @@ class Berkeleygw(MakefilePackage): msg='elpa is a parallel library and needs MPI support' ) - # the concretizer is selecting non threaded versions of fftw and openblas - # even though +openmp is set... as a workaround, the conflicts below force - # the user to spec ^fftw+openmp ^openblas threads=openmp - # but this may also happen for other providers of fftw and blas... - conflicts('^fftw~openmp', when='+openmp') - conflicts('^openblas threads=none', when='+openmp') - conflicts('^openblas threads=pthreads', when='+openmp') + # Force openmp propagation on some providers of blas / fftw-api + with when('+openmp'): + depends_on('fftw+openmp', when='^fftw') + depends_on('amdfftw+openmp', when='^amdfftw') + depends_on('openblas threads=openmp', when='^openblas') + depends_on('amdblis threads=openmp', when='^amdblis') parallel = False