diff options
| author | Chris White <white238@llnl.gov> | 2020-09-22 06:40:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 15:40:16 +0200 |
| commit | 30d24db116456a9fd041b644a8d5a2a31d9bd8dc (patch) | |
| tree | 0b79cf09b81663ecf78e4387da155176634439b2 /var | |
| parent | a1e19de8e11ca3d543d3b7ecf34c741400c2e5f0 (diff) | |
| download | spack-30d24db116456a9fd041b644a8d5a2a31d9bd8dc.tar.gz spack-30d24db116456a9fd041b644a8d5a2a31d9bd8dc.tar.bz2 spack-30d24db116456a9fd041b644a8d5a2a31d9bd8dc.tar.xz spack-30d24db116456a9fd041b644a8d5a2a31d9bd8dc.zip | |
Added RAJA v0.12.1`and Umpire v4.0.1 (#18756)
Also renamed 'master' to 'main'
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/raja/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/umpire/package.py | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 0f0df14282..6f2eb9624f 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -13,7 +13,9 @@ class Raja(CMakePackage, CudaPackage): git = "https://github.com/LLNL/RAJA.git" version('develop', branch='develop', submodules='True') - version('master', branch='main', submodules='True') + version('main', branch='main', submodules='True') + version('0.12.1', tag='v0.12.1', submodules="True") + version('0.12.0', tag='v0.12.0', submodules="True") version('0.11.0', tag='v0.11.0', submodules="True") version('0.10.1', tag='v0.10.1', submodules="True") version('0.10.0', tag='v0.10.0', submodules="True") diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index a1e954f290..afb3d28d4b 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -15,7 +15,9 @@ class Umpire(CMakePackage, CudaPackage): git = 'https://github.com/LLNL/Umpire.git' version('develop', branch='develop', submodules='True') - version('master', branch='main', submodules='True') + version('main', branch='main', submodules='True') + version('4.0.1', tag='v4.0.1', submodules='True') + version('4.0.0', tag='v4.0.0', submodules='True') version('3.0.0', tag='v3.0.0', submodules='True') version('2.1.0', tag='v2.1.0', submodules='True') version('2.0.0', tag='v2.0.0', submodules='True') @@ -45,6 +47,7 @@ class Umpire(CMakePackage, CudaPackage): variant('openmp', default=False, description='Build with OpenMP support') variant('deviceconst', default=False, description='Enables support for constant device memory') + variant('examples', default=True, description='Build Umpire Examples') variant('tests', default='none', values=('none', 'basic', 'benchmarks'), multi=False, description='Tests to run') @@ -93,6 +96,9 @@ class Umpire(CMakePackage, CudaPackage): options.append('-DENABLE_BENCHMARKS={0}'.format( 'On' if 'tests=benchmarks' in spec else 'Off')) + options.append('-DENABLE_EXAMPLES={0}'.format( + 'On' if '+examples' in spec else 'Off')) + options.append('-DENABLE_TESTS={0}'.format( 'Off' if 'tests=none' in spec else 'On')) |