hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xsdk@develop fixes (#10521)

Browse source 
* xsdk@develop: switch trilinos from @master to @develop

* xsdk@develop: dtk - fix trilinos dependency on dtk.
 - dkt-3.0 should be used with trilinos-12.4*
 - dtk/master should be used with trilinos@develop
This commit is contained in:
Satish Balay 2019-02-07 09:05:14 -06:00 committed by GitHub
parent 09a884322f
commit 753fec39ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
var/spack/repos/builtin/packages/trilinos/package.py
View file

@ -180,7 +180,12 @@ class Trilinos(CMakePackage):
git='https://github.com/ornl-cees/DataTransferKit.git',
commit='4fe4d9d56cfd4f8a61f392b81d8efd0e389ee764', # branch dtk-3.0
placement='DataTransferKit',
when='+dtk')
when='+dtk @12.14.0:12.14.99')
resource(name='dtk',
git='https://github.com/ornl-cees/DataTransferKit.git',
branch='master',
placement='DataTransferKit',
when='+dtk @develop')
resource(name='fortrilinos',
git='https://github.com/trilinos/ForTrilinos.git',
tag='develop',
@ -239,8 +244,8 @@ class Trilinos(CMakePackage):
conflicts('+dtk', when='~kokkos')
conflicts('+dtk', when='~teuchos')
conflicts('+dtk', when='~tpetra')
# Only allow DTK-3.0 with Trilinos 12.14
conflicts('+dtk', when='@0:12.12.99,12.16.0:99,master,develop')
# Only allow DTK with Trilinos 12.14 and develop
conflicts('+dtk', when='@0:12.12.99,12.16.0:99,master')
conflicts('+fortrilinos', when='~fortran')
conflicts('+fortrilinos', when='@:99')
conflicts('+fortrilinos', when='@master')

2
var/spack/repos/builtin/packages/xsdk/package.py
View file

@ -44,7 +44,7 @@ class Xsdk(Package):
depends_on('superlu-dist@5.2.2', when='@0.3.0')
depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0')
depends_on('trilinos@master+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus+dtk+intrepid2+shards',
depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus+dtk+intrepid2+shards',
when='@develop')
depends_on('trilinos@12.14.0-rc1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus+dtk+intrepid2+shards',
when='@0.4.0')