diff options
| author | G-Ragghianti <33492707+G-Ragghianti@users.noreply.github.com> | 2020-07-30 05:21:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-30 11:21:49 +0200 |
| commit | 7b051df83ffb214983d8b5592214997ca5521e91 (patch) | |
| tree | 66e984cc9eed4d5ad1871ef3a8dc8b34a117bc9a /var | |
| parent | b96448269a3032904f202d9143b4487382000338 (diff) | |
| download | spack-7b051df83ffb214983d8b5592214997ca5521e91.tar.gz spack-7b051df83ffb214983d8b5592214997ca5521e91.tar.bz2 spack-7b051df83ffb214983d8b5592214997ca5521e91.tar.xz spack-7b051df83ffb214983d8b5592214997ca5521e91.zip | |
slate package: resolve issues with cuda version and fortran compiler name (#17759)
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/slate/package.py | 9 |
1 files changed, 6 insertions, 3 deletions
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) |