From 866b9b5d13e5b2b709a457909b03fb423f1022e6 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Sat, 18 May 2019 21:04:13 -0700 Subject: [PATCH] Update Umpire package with new versions (#11441) * Update Umpire package with new versions * Fix version ordering --- .../repos/builtin/packages/umpire/package.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index 5ff585ddd2..61366135a1 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -16,14 +16,27 @@ class Umpire(CMakePackage): version('develop', branch='develop', submodules='True') version('master', branch='master', submodules='True') + version('0.3.3', tag='v0.3.3', submodules='True') + version('0.3.2', tag='v0.3.2', submodules='True') + version('0.3.1', tag='v0.3.1', submodules='True') + version('0.3.0', tag='v0.3.0', submodules='True') + version('0.2.4', tag='v0.2.4', submodules='True') + version('0.2.3', tag='v0.2.3', submodules='True') + version('0.2.2', tag='v0.2.2', submodules='True') + version('0.2.1', tag='v0.2.1', submodules='True') + version('0.2.0', tag='v0.2.0', submodules='True') version('0.1.4', tag='v0.1.4', submodules='True') version('0.1.3', tag='v0.1.3', submodules='True') variant('cuda', default=False, description='Build with CUDA support') variant('fortran', default=False, description='Build C/Fortran API') + variant('numa', default=False, description='Enable NUMA support') depends_on('cuda', when='+cuda') - depends_on('cmake@3.3:', type='build') + depends_on('cmake@3.8:', type='build') + depends_on('cmake@3.9:', when='+cuda', type='build') + + conflicts('+numa', when='@:0.3.2') def cmake_args(self): spec = self.spec @@ -40,4 +53,7 @@ def cmake_args(self): if '+fortran' in spec: options.append('-DENABLE_FORTRAN=On') + if '+numa' in spec: + options.append('-DENABLE_NUMA=On') + return options