Merge pull request #49 from LLNL/bugfix/weiss27/uberenv-mac

Adds openmp variant to Axom's local umpire spack package
LLNL · May 30, 2019 · 1043eee · 1043eee
2 parents 6c21792 + 2e295dc
commit 1043eee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/scripts/uberenv/packages/uberenv-axom/package.py b/scripts/uberenv/packages/uberenv-axom/package.py
@@ -81,8 +81,10 @@ class UberenvAxom(Package):
     depends_on("raja~openmp+cuda", when="+raja~openmp+cuda")
     depends_on("raja+openmp+cuda", when="+raja+openmp+cuda")
 
-    depends_on("umpire", when="+umpire")
-    depends_on("umpire+cuda", when="+umpire+cuda")
+    depends_on("umpire~openmp", when="+umpire~openmp")
+    depends_on("umpire+openmp", when="+umpire+openmp")
+    depends_on("umpire~openmp+cuda", when="+umpire~openmp+cuda")
+    depends_on("umpire+openmp+cuda", when="+umpire+openmp+cuda")
 
     # builds serial version of mfem that does not depend on Sidre
     depends_on("mfem~hypre~metis~mpi~gzstream",   when="+mfem")

diff --git a/scripts/uberenv/packages/umpire/package.py b/scripts/uberenv/packages/umpire/package.py
@@ -18,6 +18,7 @@ class Umpire(CMakePackage):
 
     variant('cuda', default=False, description='Build with CUDA support')
     variant('fortran', default=False, description='Build C/Fortran API')
+    variant('openmp', default=True, description='Build with OpenMP support')
 
     depends_on('cuda', when='+cuda')
     depends_on('cmake@3.3:', type='build')
@@ -44,4 +45,9 @@ def cmake_args(self):
         if '+fortran' in spec:
             options.append('-DENABLE_FORTRAN=On')
 
+        if '+openmp' in spec:
+            options.append('-DENABLE_OPENMP=On')
+        else:
+            options.append('-DENABLE_OPENMP=Off')
+
         return options