From 7b051df83ffb214983d8b5592214997ca5521e91 Mon Sep 17 00:00:00 2001 From: G-Ragghianti <33492707+G-Ragghianti@users.noreply.github.com> Date: Thu, 30 Jul 2020 05:21:49 -0400 Subject: slate package: resolve issues with cuda version and fortran compiler name (#17759) Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/slate/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/slate/package.py b/var/spack/repos/builtin/packages/slate/package.py index cae0a0e8df..5d78b2e34c 100644 --- a/var/spack/repos/builtin/packages/slate/package.py +++ b/var/spack/repos/builtin/packages/slate/package.py @@ -25,7 +25,7 @@ class Slate(Package): variant('mpi', default=True, description='Build with MPI support.') variant('openmp', default=True, description='Build with OpenMP support.') - depends_on('cuda@9:', when='+cuda') + depends_on('cuda@9:10', when='+cuda') depends_on('intel-mkl') depends_on('mpi', when='+mpi') @@ -41,10 +41,13 @@ class Slate(Package): f_mpi = "1" if spec.variants['mpi'].value else "0" f_openmp = "1" if spec.variants['openmp'].value else "0" - compiler = 'mpicxx' if spec.variants['mpi'].value else '' + comp_cxx = comp_for = '' + if '+mpi' in spec: + comp_cxx = 'mpicxx' + comp_for = 'mpif90' make('mpi=' + f_mpi, 'mkl=1', 'cuda=' + f_cuda, 'openmp=' + f_openmp, - 'CXX=' + compiler) + 'CXX=' + comp_cxx, 'FC=' + comp_for) install_tree('lib', prefix.lib) install_tree('test', prefix.test) mkdirp(prefix.include) -- cgit v1.2.3-60-g2f50