diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2022-01-25 12:22:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 12:22:21 -0500 |
| commit | edb99a2b05865aca685c1401c90710428170c424 (patch) | |
| tree | 7f32b8f0aeec4bc2d0598d615a7ad4fd6bd9da8e | |
| parent | fe76d6563aab0e6095a06f5317be7c57ee6fc694 (diff) | |
| download | spack-edb99a2b05865aca685c1401c90710428170c424.tar.gz spack-edb99a2b05865aca685c1401c90710428170c424.tar.bz2 spack-edb99a2b05865aca685c1401c90710428170c424.tar.xz spack-edb99a2b05865aca685c1401c90710428170c424.zip | |
Nalu wind: simplify version dependencies with trilinos (#28588)
* nalu-wind: simplify trilinos variant requirements
* nalu-wind: simplify version dependencies
With spack versioning, 'master' < 'develop' and 'develop' > 2.18.2.
| -rw-r--r-- | var/spack/repos/builtin/packages/nalu-wind/package.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index cd9a880054..a236c22cc2 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -52,16 +52,17 @@ 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+shards~hypre+gtest', when='~cuda') + depends_on('trilinos@master: +exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+shards~hypre+gtest') + depends_on('trilinos~cuda~wrapper', 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+shards~hypre~shared+gtest', when=(sys.platform == 'darwin')) + depends_on('trilinos~shared', 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('tioga@master:', when='+tioga') + depends_on('hypre@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+shards~hypre+gtest+cuda+cuda_rdc+wrapper cuda_arch={0}'.format(_arch), + depends_on('trilinos~shared+cuda+cuda_rdc+wrapper 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)) |