From c76023d7accc53f40e49481179bdb26c8c18845a Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:35:40 -0500 Subject: [PATCH] e4s ci: add mgard (#36584) --- share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml | 2 ++ share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml | 2 ++ var/spack/repos/builtin/packages/mgard/package.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml index 6493e60613f..729f06ada03 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml @@ -90,6 +90,7 @@ spack: - mercury - metall - mfem + - mgard +serial +openmp +timing +unstructured ~cuda - mpark-variant - mpifileutils ~xattr - nccmp @@ -157,6 +158,7 @@ spack: - kokkos-kernels +cuda ^kokkos +wrapper +cuda - magma +cuda - mfem +cuda + - mgard +serial +openmp +timing +unstructured +cuda - omega-h +cuda - papi +cuda - petsc +cuda diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index f5b6d00f1ad..5b92e0c4090 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -94,6 +94,7 @@ spack: - mercury - metall - mfem + - mgard +serial +openmp +timing +unstructured ~cuda - mpark-variant - mpifileutils ~xattr - nccmp @@ -168,6 +169,7 @@ spack: - kokkos-kernels +cuda ^kokkos +wrapper +cuda - magma +cuda - mfem +cuda + - mgard +serial +openmp +timing +unstructured +cuda - omega-h +cuda - papi +cuda - petsc +cuda diff --git a/var/spack/repos/builtin/packages/mgard/package.py b/var/spack/repos/builtin/packages/mgard/package.py index dee7723e1b9..a54bc9fdd0b 100644 --- a/var/spack/repos/builtin/packages/mgard/package.py +++ b/var/spack/repos/builtin/packages/mgard/package.py @@ -36,7 +36,7 @@ class Mgard(CMakePackage, CudaPackage): depends_on("zlib") depends_on("pkgconf", type=("build",), when="@2022-11-18:") depends_on("zstd") - depends_on("protobuf", when="@2022-11-18:") + depends_on("protobuf@:3.21.12", when="@2022-11-18:") depends_on("libarchive", when="@2021-11-12:") depends_on("tclap", when="@2021-11-12") depends_on("yaml-cpp", when="@2021-11-12:")