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

xsdk: add slepc and amrex [and handle clang conflict wrt amrex] (#8932)

Browse Source
This commit is contained in:
Satish Balay 2018-08-14 00:17:17 -05:00 committed by Todd Gamblin
parent 2b727796da
commit 783435c1de
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/amrex/package.py
View File

@ -65,6 +65,7 @@ class Amrex(CMakePackage):
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
depends_on('python@2.7:', type='build') depends_on('python@2.7:', type='build')
depends_on('cmake@3.5:', type='build') depends_on('cmake@3.5:', type='build')
conflicts('%clang')
def cmake_is_on(self, option): def cmake_is_on(self, option):
return 'ON' if option in self.spec else 'OFF' return 'ON' if option in self.spec else 'OFF'

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

@ -87,6 +87,11 @@ class Xsdk(Package):
depends_on('magma@2.2.0', when='@0.3.0 +cuda') depends_on('magma@2.2.0', when='@0.3.0 +cuda')
depends_on('magma@2.2.0', when='@develop +cuda') depends_on('magma@2.2.0', when='@develop +cuda')
depends_on('amrex@develop', when='@develop %gcc')
depends_on('amrex@develop', when='@develop %intel')
depends_on('slepc@develop', when='@develop')
# xSDKTrilinos depends on the version of Trilinos built with # xSDKTrilinos depends on the version of Trilinos built with
# +tpetra which is turned off for faster xSDK # +tpetra which is turned off for faster xSDK
# depends_on('xsdktrilinos@xsdk-0.2.0', when='@xsdk-0.2.0') # depends_on('xsdktrilinos@xsdk-0.2.0', when='@xsdk-0.2.0')