Merge pull request #353 from lanl/rberger_spackage_loosen_constraints

spack: remove variants

.gitlab-ci.yml

@@ -82,6 +82,7 @@ default:
     SINGULARITY_EOS_GCC_VERSION: "12.2.0"
     SINGULARITY_EOS_SPACK_SPEC: "singularity-eos@main+mpi+spiner+hdf5+python+tests%gcc@${SINGULARITY_EOS_GCC_VERSION} ^cray-mpich"
     SCHEDULER_PARAMETERS: "--nodes=1 --time 2:00:00 -L none@slurmdb --account=asc-ci --qos=ci --reservation=ci --partition=ci"
+    HDF5_USE_FILE_LOCKING: "FALSE"
 
 .skylake: &skylake
   SCHEDULER_PARAMETERS: "--nodes=1 -p skylake-gold,skylake-platinum"

spack-repo/packages/singularity-eos/package.py

@@ -49,8 +49,6 @@ class SingularityEos(CMakePackage, CudaPackage):
         "kokkos-kernels", default=False, description="Enable kokkos-kernals for linear algebra"
     )
 
-    variant("openmp", default=False, description="Enable openmp")
-
     # for compatibility with downstream projects
     variant("mpi", default=False, description="Build with MPI support")
 
@@ -141,7 +139,7 @@ class SingularityEos(CMakePackage, CudaPackage):
         depends_on("kokkos-kernels" + _kver, when=_myver + '+kokkos-kernels')
 
     # set up kokkos offloading dependencies
-    for _flag in ("~cuda", "+cuda", "~openmp", "+openmp"):
+    for _flag in ("~cuda", "+cuda"):
         depends_on("kokkos ~shared" + _flag, when="+kokkos" + _flag)
         depends_on("kokkos-kernels" + _flag, when="+kokkos-kernels" + _flag)
 
@@ -164,7 +162,6 @@ class SingularityEos(CMakePackage, CudaPackage):
 
     # these are mirrored in the cmake configuration
     conflicts("+cuda", when="~kokkos")
-    conflicts("+openmp", when="~kokkos")
     conflicts("+kokkos-kernels", when="~kokkos")
     conflicts("+hdf5", when="~spiner")