zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix xsdk build broken by petsc and trilinos (#4893)

Browse Source 
* Fix xsdk build broken by petsc and trilinos

See #4891 for details

* Fix version conflict in trilinos package

Trilinos version 11 may conflict with superlu-dist.
The version "xsdk-0.2.0" was conflicting with superlu-dist,
even though it shouldn't.  I added a lower bound to the
comparison to fix this problem.

Thanks for the help @davydden!
This commit is contained in:
Alicia Klinvex 2017-08-01 13:05:15 -04:00 committed by Adam J. Stewart
parent 82735deafd
commit 44653fa488
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -171,7 +171,7 @@ class Trilinos(CMakePackage):
conflicts('+superlu-dist', when='+superlu')
# For Trilinos v11 we need to force SuperLUDist=OFF, since only the
# deprecated SuperLUDist v3.3 together with an Amesos patch is working.
conflicts('+superlu-dist', when='@:11.14.3')
conflicts('+superlu-dist', when='@11.4.1:11.14.3')
# PnetCDF was only added after v12.10.1
conflicts('+pnetcdf', when='@:12.10.1')

4
var/spack/repos/builtin/packages/xsdk/package.py
View File

@ -53,9 +53,9 @@ class Xsdk(Package):
depends_on('trilinos@develop+xsdkflags+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus',
when='@develop')
depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost',
depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64',
when='@xsdk-0.2.0')
depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost',
depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64',
when='@develop')
depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0')