diff options
3 files changed, 20 insertions, 4 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml index aa756a6e6a..8983073c82 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml @@ -42,7 +42,6 @@ spack: specs: - adios2 - - amrex - butterflypack - conduit - flux-core @@ -62,6 +61,8 @@ spack: - superlu-dist - tau + # - amrex # disabled temporarily pending resolution of unreproducible CI failure + mirrors: { "mirror": "s3://spack-binaries-cray/develop/e4s-cray-rhel" } cdash: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml index 738500cb12..07291c2ca1 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml @@ -224,7 +224,7 @@ spack: # GPU - aml +ze - - amrex +sycl + - amrex +sycl dimensions=3 - arborx +sycl ^kokkos +sycl +openmp std=17 +tests +examples - cabana +sycl ^kokkos +sycl +openmp std=17 +tests +examples - kokkos +sycl +openmp std=17 +tests +examples @@ -248,4 +248,4 @@ spack: image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2023.07.21 cdash: - build-group: E4S OneAPI
\ No newline at end of file + build-group: E4S OneAPI diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index c5be2d51f2..e414155446 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -75,7 +75,22 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): version("18.09.1", sha256="a065ee4d1d98324b6c492ae20ea63ba12a4a4e23432bf5b3fe9788d44aa4398e") # Config options - variant("dimensions", default="3", description="Dimensionality", values=("1", "2", "3")) + variant( + "dimensions", + default="3", + values=("1", "2", "3"), + multi=False, + description="Dimensionality", + when="@:23.05", + ) + variant( + "dimensions", + default="1,2,3", + values=("1", "2", "3"), + multi=True, + description="Dimensionality", + when="@23.06:", + ) variant("shared", default=False, description="Build shared library") variant("mpi", default=True, description="Build with MPI support") variant("openmp", default=False, description="Build with OpenMP support") |