From c365b7a933be1986110d021f59432019ea473fb7 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Wed, 21 Feb 2024 14:53:07 -0700 Subject: [PATCH 1/2] spack: remove OpenMP variant --- spack-repo/packages/singularity-eos/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spack-repo/packages/singularity-eos/package.py b/spack-repo/packages/singularity-eos/package.py index 2f3dd0e4f2c..9bc0436e741 100644 --- a/spack-repo/packages/singularity-eos/package.py +++ b/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") From 672597608b33e44ff142073ab2eea179db67a33e Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Mon, 18 Mar 2024 15:44:48 -0600 Subject: [PATCH 2/2] ci: add HDF5_USE_FILE_LOCKING=FALSE on roci --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52e640bb221..e5b98f0d389 100644 --- a/.gitlab-ci.yml +++ b/.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"