hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

amrex+sycl: restructure constraint on %oneapi (#39451)

Browse source
This commit is contained in:
eugeneswalker 2023-08-16 10:49:32 -07:00 committed by GitHub
parent 86485dea14
commit 4c7748e954
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
View file

@ -224,7 +224,7 @@ spack:
# GPU # GPU
- aml +ze - aml +ze
- amrex +sycl dimensions=3 - amrex +sycl
- arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples - arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples
- cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples - cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples
- kokkos +sycl +openmp cxxstd=17 +tests +examples - kokkos +sycl +openmp cxxstd=17 +tests +examples

3
var/spack/repos/builtin/packages/amrex/package.py
View file

@ -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.19.0:", type="link", when="@21.03: ~cuda +hypre")
depends_on("hypre@2.20.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("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") depends_on("intel-oneapi-mkl", type=("build", "link"), when="+sycl")
# these versions of gcc have lambda function issues # these versions of gcc have lambda function issues
@ -249,6 +248,8 @@ def get_cuda_arch_string(self, values):
# #
@when("@20.12:,develop") @when("@20.12:,develop")
def cmake_args(self): 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 = [ args = [
"-DUSE_XSDK_DEFAULTS=ON", "-DUSE_XSDK_DEFAULTS=ON",
self.define_from_variant("AMReX_SPACEDIM", "dimensions"), self.define_from_variant("AMReX_SPACEDIM", "dimensions"),