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

trilinos: add version 12.18.1 with dtk-3.1 (#13690)

Browse source
This commit is contained in:
Satish Balay 2019-11-12 07:52:24 -06:00 committed by GitHub
parent 9e12b4e95a
commit cbfdc85d26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ class Trilinos(CMakePackage):
version('xsdk-0.2.0', tag='xsdk-0.2.0') version('xsdk-0.2.0', tag='xsdk-0.2.0')
version('develop', branch='develop') version('develop', branch='develop')
version('master', branch='master') version('master', branch='master')
version('12.18.1', commit='55a75997332636a28afc9db1aee4ae46fe8d93e7') # tag trilinos-release-12-8-1
version('12.14.1', sha256='52a4406cca2241f5eea8e166c2950471dd9478ad6741cbb2a7fc8225814616f0') version('12.14.1', sha256='52a4406cca2241f5eea8e166c2950471dd9478ad6741cbb2a7fc8225814616f0')
version('12.12.1', sha256='5474c5329c6309224a7e1726cf6f0d855025b2042959e4e2be2748bd6bb49e18') version('12.12.1', sha256='5474c5329c6309224a7e1726cf6f0d855025b2042959e4e2be2748bd6bb49e18')
version('12.10.1', sha256='ab81d917196ffbc21c4927d42df079dd94c83c1a08bda43fef2dd34d0c1a5512') version('12.10.1', sha256='ab81d917196ffbc21c4927d42df079dd94c83c1a08bda43fef2dd34d0c1a5512')
@ -190,6 +191,12 @@ class Trilinos(CMakePackage):
commit='4fe4d9d56cfd4f8a61f392b81d8efd0e389ee764', # branch dtk-3.0 commit='4fe4d9d56cfd4f8a61f392b81d8efd0e389ee764', # branch dtk-3.0
placement='DataTransferKit', placement='DataTransferKit',
when='+dtk @12.14.0:12.14.99') when='+dtk @12.14.0:12.14.99')
resource(name='dtk',
git='https://github.com/ornl-cees/DataTransferKit.git',
commit='edfa050cd46e2274ab0a0b7558caca0079c2e4ca', # tag 3.1-rc1
placement='DataTransferKit',
submodules=True,
when='+dtk @12.18:12.18.99')
resource(name='dtk', resource(name='dtk',
git='https://github.com/ornl-cees/DataTransferKit.git', git='https://github.com/ornl-cees/DataTransferKit.git',
branch='master', branch='master',
@ -255,7 +262,7 @@ class Trilinos(CMakePackage):
conflicts('+dtk', when='~teuchos') conflicts('+dtk', when='~teuchos')
conflicts('+dtk', when='~tpetra') conflicts('+dtk', when='~tpetra')
# Only allow DTK with Trilinos 12.14 and develop # Only allow DTK with Trilinos 12.14 and develop
conflicts('+dtk', when='@0:12.12.99,12.16.0:99,master') conflicts('+dtk', when='@0:12.12.99,master')
conflicts('+fortrilinos', when='~fortran') conflicts('+fortrilinos', when='~fortran')
conflicts('+fortrilinos', when='@:99') conflicts('+fortrilinos', when='@:99')
conflicts('+fortrilinos', when='@master') conflicts('+fortrilinos', when='@master')