Skip to content
Snippets Groups Projects
Unverified Commit 7b051df8 authored by G-Ragghianti's avatar G-Ragghianti Committed by GitHub
Browse files

slate package: resolve issues with cuda version and fortran compiler name (#17759)

parent b9644826
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ class Slate(Package): ...@@ -25,7 +25,7 @@ class Slate(Package):
variant('mpi', default=True, description='Build with MPI support.') variant('mpi', default=True, description='Build with MPI support.')
variant('openmp', default=True, description='Build with OpenMP 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('intel-mkl')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
...@@ -41,10 +41,13 @@ def install(self, spec, prefix): ...@@ -41,10 +41,13 @@ def install(self, spec, prefix):
f_mpi = "1" if spec.variants['mpi'].value else "0" f_mpi = "1" if spec.variants['mpi'].value else "0"
f_openmp = "1" if spec.variants['openmp'].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, 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('lib', prefix.lib)
install_tree('test', prefix.test) install_tree('test', prefix.test)
mkdirp(prefix.include) mkdirp(prefix.include)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment