From 4c7748e9544764ad8a78a9a42c9056f94e20dc2e Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Wed, 16 Aug 2023 10:49:32 -0700 Subject: amrex+sycl: restructure constraint on %oneapi (#39451) --- share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml | 2 +- var/spack/repos/builtin/packages/amrex/package.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 715c182729..0ae044968c 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 dimensions=3 + - amrex +sycl - arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples - cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples - kokkos +sycl +openmp cxxstd=17 +tests +examples diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index e414155446..86e48df9f2 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -159,7 +159,6 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): depends_on("hypre@2.19.0:", type="link", when="@21.03: ~cuda +hypre") depends_on("hypre@2.20.0:", type="link", when="@21.03: +cuda +hypre") depends_on("petsc", type="link", when="+petsc") - depends_on("intel-oneapi-compilers@2023.0.0:", type="build", when="@23.01: +sycl") depends_on("intel-oneapi-mkl", type=("build", "link"), when="+sycl") # these versions of gcc have lambda function issues @@ -249,6 +248,8 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): # @when("@20.12:,develop") def cmake_args(self): + if self.spec.satisfies("@23.01: +sycl") and not self.spec.satisfies("%oneapi@2023.0.0:"): + raise InstallError("amrex +sycl requires %oneapi@2023.0.0:") args = [ "-DUSE_XSDK_DEFAULTS=ON", self.define_from_variant("AMReX_SPACEDIM", "dimensions"), -- cgit v1.2.3-60-g2f50