diff options
| author | Denis Davydov <davydden@gmail.com> | 2018-09-07 02:22:17 +0200 |
|---|---|---|
| committer | Satish Balay <balay@mcs.anl.gov> | 2018-09-06 19:22:17 -0500 |
| commit | 18ca19675354508a7a8593c8baf9e98b33e302e1 (patch) | |
| tree | 8c50c6d7779c9907d34ce87a6d05592b52528685 /var | |
| parent | b6b8c7058a02e4e735901433c4b4e571a8b5906f (diff) | |
| download | spack-18ca19675354508a7a8593c8baf9e98b33e302e1.tar.gz spack-18ca19675354508a7a8593c8baf9e98b33e302e1.tar.bz2 spack-18ca19675354508a7a8593c8baf9e98b33e302e1.tar.xz spack-18ca19675354508a7a8593c8baf9e98b33e302e1.zip | |
xsdk: add dealii (#7529)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/xsdk/package.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index a3a46f132a..ec6b537a2f 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -160,8 +160,9 @@ class Dealii(CMakePackage, CudaPackage): depends_on('slepc@:3.6.3', when='@:8.4.1+slepc+petsc+mpi') depends_on('slepc~arpack', when='+slepc+petsc+mpi+int64') depends_on('sundials~pthread', when='@9.0:+sundials') - depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos', when='+trilinos+mpi~int64~cuda') - depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~hypre', when='+trilinos+mpi+int64~cuda') + # do not require +rol to make concretization of xsdk possible + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos', when='+trilinos+mpi~int64~cuda') + depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre', when='+trilinos+mpi+int64~cuda') # FIXME: temporary disable Tpetra when using CUDA due to # namespace "Kokkos::Impl" has no member "cuda_abort" depends_on('trilinos@master+amesos+aztec+epetra+ifpack+ml+muelu+rol+sacado+teuchos~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2', when='+trilinos+mpi~int64+cuda') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 6beee5a307..806ec638c5 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -71,6 +71,8 @@ class Xsdk(Package): depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@develop') + depends_on('dealii@develop~python~doc~slepc~gmsh+petsc+mpi+trilinos~int64+hdf5~netcdf+metis', when='@develop') + depends_on('pflotran@xsdk-0.3.0', when='@0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('pflotran@develop', when='@develop') |