diff options
| author | Jed Brown <jed@jedbrown.org> | 2020-10-02 15:00:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 14:00:53 -0700 |
| commit | ba18675bd12edfca22a59417be6ff8bd3670723a (patch) | |
| tree | 116aae479383f51212e7c4ab2b258560f98c4cd1 /var | |
| parent | 9644332a13d68957a74bb8163335a2b13dd2ab93 (diff) | |
| download | spack-ba18675bd12edfca22a59417be6ff8bd3670723a.tar.gz spack-ba18675bd12edfca22a59417be6ff8bd3670723a.tar.bz2 spack-ba18675bd12edfca22a59417be6ff8bd3670723a.tar.xz spack-ba18675bd12edfca22a59417be6ff8bd3670723a.zip | |
libceed 0.7 and occa 1.1.0 (#19055)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/libceed/package.py | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/occa/package.py | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py index a7ae5b21f8..c4f3cbd2b5 100644 --- a/var/spack/repos/builtin/packages/libceed/package.py +++ b/var/spack/repos/builtin/packages/libceed/package.py @@ -14,7 +14,8 @@ class Libceed(Package): 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.5', tag='v0.5') version('0.4', tag='v0.4') @@ -23,16 +24,21 @@ class Libceed(Package): variant('occa', default=True, description='Enable OCCA backends') 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('libxsmm', default=False, description='Enable LIBXSMM backend') variant('magma', default=False, description='Enable MAGMA backend') conflicts('+libxsmm', when='@:0.2') conflicts('+magma', when='@:0.5') + conflicts('+hip', when='@:0.6') 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@1.1.0', when='@0.7:+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+cuda', when='+occa+cuda') @@ -99,6 +105,9 @@ class Libceed(Package): # Disable CUDA auto-detection: makeopts += ['CUDA_DIR=/disable-cuda'] + if '+hip' in spec: + makeopts += ['HIP_DIR=%s' % spec['hip'].prefix] + if '+libxsmm' in spec: makeopts += ['XSMM_DIR=%s' % spec['libxsmm'].prefix] diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py index ec7e303a3e..5d72517b3d 100644 --- a/var/spack/repos/builtin/packages/occa/package.py +++ b/var/spack/repos/builtin/packages/occa/package.py @@ -22,6 +22,7 @@ class Occa(Package): maintainers = ['v-dobrev', 'dmed256'] version('develop') + version('1.1.0', tag='v1.1.0') version('1.0.9', tag='v1.0.9') version('1.0.8', tag='v1.0.8') version('1.0.0-alpha.5', tag='v1.0.0-alpha.5') |