diff options
| author | psakievich <psakievich@gmail.com> | 2021-10-08 15:08:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-08 21:08:54 +0000 |
| commit | 8ebb705871440b4841b34f4c1e44e178c56acb8a (patch) | |
| tree | 5c53fe66958527e22db59ef01bbe6afca1592758 /var | |
| parent | 7e8f2e0c11c6aedb82593525dfc297d1de2740c8 (diff) | |
| download | spack-8ebb705871440b4841b34f4c1e44e178c56acb8a.tar.gz spack-8ebb705871440b4841b34f4c1e44e178c56acb8a.tar.bz2 spack-8ebb705871440b4841b34f4c1e44e178c56acb8a.tar.xz spack-8ebb705871440b4841b34f4c1e44e178c56acb8a.zip | |
Trilinos: update for CUDA and Nalu-Wind (#26614)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/nalu-wind/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index 70e77ac765..5739579dcd 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -52,16 +52,16 @@ class NaluWind(CMakePackage, CudaPackage): depends_on('mpi') depends_on('yaml-cpp@0.5.3:') - depends_on('trilinos@master,develop ~cuda~wrapper+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+zlib+shards~hypre cxxstd=14', when='~cuda') + depends_on('trilinos@master,develop ~cuda~wrapper+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+shards~hypre cxxstd=14', when='~cuda') # Cannot build Trilinos as a shared library with STK on Darwin # https://github.com/trilinos/Trilinos/issues/2994 - depends_on('trilinos@master,develop ~cuda~wrapper+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+zlib+shards~hypre~shared cxxstd=14', when=(sys.platform == 'darwin')) + depends_on('trilinos@master,develop ~cuda~wrapper+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+shards~hypre~shared cxxstd=14', when=(sys.platform == 'darwin')) depends_on('openfast@2.6.0 +cxx', when='+openfast') depends_on('tioga@master,develop', when='+tioga') depends_on('hypre@develop,2.18.2: ~int64+mpi~superlu-dist', when='+hypre') depends_on('kokkos-nvcc-wrapper', type='build', when='+cuda') for _arch in CudaPackage.cuda_arch_values: - depends_on('trilinos@master,develop ~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+zlib+shards~hypre+cuda+cuda_rdc+wrapper cxxstd=14 cuda_arch={0}'.format(_arch), + depends_on('trilinos@master,develop ~shared+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+shards~hypre+cuda+cuda_rdc+wrapper cxxstd=14 cuda_arch={0}'.format(_arch), when='+cuda cuda_arch={0}'.format(_arch)) depends_on('hypre@develop +mpi+cuda~int64~superlu-dist cuda_arch={0}'.format(_arch), when='+hypre+cuda cuda_arch={0}'.format(_arch)) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index fc58595224..17f02aca77 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -233,7 +233,7 @@ class Trilinos(CMakePackage, CudaPackage): # Installed FindTrilinos are broken in SEACAS if Fortran is disabled # see https://github.com/trilinos/Trilinos/issues/3346 - conflicts('+exodus', when='~fortran') + conflicts('+exodus', when='@:13.0.1 ~fortran') # Only allow Mesquite with Trilinos 12.12 and up, and master conflicts('+mesquite', when='@:12.10,master') # Strumpack is only available as of mid-2021 @@ -677,6 +677,7 @@ class Trilinos(CMakePackage, CudaPackage): ]) if '+cuda' in spec: options.extend([ + define_tpl_enable('CUDA', True), define_kok_enable('CUDA_UVM', True), define_kok_enable('CUDA_LAMBDA', True), define_kok_enable('CUDA_RELOCATABLE_DEVICE_CODE', 'cuda_rdc') |