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

libceed 0.7 and occa 1.1.0 (#19055)

Browse source
This commit is contained in:
Jed Brown 2020-10-02 15:00:53 -06:00 committed by GitHub
parent 9644332a13
commit ba18675bd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,8 @@ class Libceed(Package):
maintainers = ['jedbrown', 'v-dobrev', 'tzanio'] maintainers = ['jedbrown', 'v-dobrev', 'tzanio']
version('develop', branch='master') version('develop', branch='main')
version('0.7', tag='v0.7')
version('0.6', commit='c7f533e01e2f3f6720fbf37aac2af2ffed225f60') # tag v0.6 + small portability fixes version('0.6', commit='c7f533e01e2f3f6720fbf37aac2af2ffed225f60') # tag v0.6 + small portability fixes
version('0.5', tag='v0.5') version('0.5', tag='v0.5')
version('0.4', tag='v0.4') version('0.4', tag='v0.4')
@ -23,16 +24,21 @@ class Libceed(Package):
variant('occa', default=True, description='Enable OCCA backends') variant('occa', default=True, description='Enable OCCA backends')
variant('cuda', default=False, description='Enable CUDA support') variant('cuda', default=False, description='Enable CUDA support')
variant('hip', default=False, description='Enable HIP support')
variant('debug', default=False, description='Enable debug build') variant('debug', default=False, description='Enable debug build')
variant('libxsmm', default=False, description='Enable LIBXSMM backend') variant('libxsmm', default=False, description='Enable LIBXSMM backend')
variant('magma', default=False, description='Enable MAGMA backend') variant('magma', default=False, description='Enable MAGMA backend')
conflicts('+libxsmm', when='@:0.2') conflicts('+libxsmm', when='@:0.2')
conflicts('+magma', when='@:0.5') conflicts('+magma', when='@:0.5')
conflicts('+hip', when='@:0.6')
depends_on('cuda', when='+cuda') depends_on('cuda', when='+cuda')
depends_on('hip@3.8.0', when='@0.7:0.7.99+hip')
depends_on('hip@3.8.0:', when='@0.8:+hip')
depends_on('occa@develop', when='@develop+occa') depends_on('occa@develop', when='@develop+occa')
depends_on('occa@1.1.0', when='@0.7:+occa')
depends_on('occa@1.0.8:', when='@0.4+occa') depends_on('occa@1.0.8:', when='@0.4+occa')
depends_on('occa@1.0.0-alpha.5,develop', when='@:0.2+occa') depends_on('occa@1.0.0-alpha.5,develop', when='@:0.2+occa')
depends_on('occa+cuda', when='+occa+cuda') depends_on('occa+cuda', when='+occa+cuda')
@ -99,6 +105,9 @@ def common_make_opts(self):
# Disable CUDA auto-detection: # Disable CUDA auto-detection:
makeopts += ['CUDA_DIR=/disable-cuda'] makeopts += ['CUDA_DIR=/disable-cuda']
if '+hip' in spec:
makeopts += ['HIP_DIR=%s' % spec['hip'].prefix]
if '+libxsmm' in spec: if '+libxsmm' in spec:
makeopts += ['XSMM_DIR=%s' % spec['libxsmm'].prefix] makeopts += ['XSMM_DIR=%s' % spec['libxsmm'].prefix]

1
var/spack/repos/builtin/packages/occa/package.py
View file

@ -22,6 +22,7 @@ class Occa(Package):
maintainers = ['v-dobrev', 'dmed256'] maintainers = ['v-dobrev', 'dmed256']
version('develop') version('develop')
version('1.1.0', tag='v1.1.0')
version('1.0.9', tag='v1.0.9') version('1.0.9', tag='v1.0.9')
version('1.0.8', tag='v1.0.8') version('1.0.8', tag='v1.0.8')
version('1.0.0-alpha.5', tag='v1.0.0-alpha.5') version('1.0.0-alpha.5', tag='v1.0.0-alpha.5')