diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2024-09-09 00:19:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 07:19:31 +0200 |
| commit | 1d9c8a90344237a9b0a8e87cbb1a0272df7a3f42 (patch) | |
| tree | ea4b5ec2a9fc68cd7e1b2d82de5009662f21f276 | |
| parent | 216619bb531f966e6cb08607f4fdd2addbfbdde9 (diff) | |
| download | spack-1d9c8a90344237a9b0a8e87cbb1a0272df7a3f42.tar.gz spack-1d9c8a90344237a9b0a8e87cbb1a0272df7a3f42.tar.bz2 spack-1d9c8a90344237a9b0a8e87cbb1a0272df7a3f42.tar.xz spack-1d9c8a90344237a9b0a8e87cbb1a0272df7a3f42.zip | |
xsdk: add amrex variant (#46190)
and remove compiler conditionals [as amrex conflict with clang no longer exists since #22967]
| -rw-r--r-- | var/spack/repos/builtin/packages/xsdk/package.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 14967eb6e6..85bf27ae2b 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -90,6 +90,7 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): variant("sycl", default=False, sticky=True, description="Enable sycl variant of xsdk packages") variant("trilinos", default=True, sticky=True, description="Enable trilinos package build") variant("datatransferkit", default=True, description="Enable datatransferkit package build") + variant("amrex", default=True, description="Enable amrex package build") variant("omega-h", default=True, description="Enable omega-h package build") variant("strumpack", default=True, description="Enable strumpack package build") variant("dealii", default=True, description="Enable dealii package build") @@ -207,12 +208,8 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): xsdk_depends_on("magma@2.7.0", when="@0.8.0", cuda_var="?cuda", rocm_var="?rocm") xsdk_depends_on("amrex +sycl", when="@1.0.0: +sycl") - xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %intel", cuda_var="cuda", rocm_var="rocm") - xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %gcc", cuda_var="cuda", rocm_var="rocm") - xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %cce", cuda_var="cuda", rocm_var="rocm") - xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %intel", cuda_var="cuda", rocm_var="rocm") - xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %gcc", cuda_var="cuda", rocm_var="rocm") - xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %cce", cuda_var="cuda", rocm_var="rocm") + xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 +amrex", cuda_var="cuda", rocm_var="rocm") + xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 +amrex", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("slepc@3.20.0", when="@1.0.0", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("slepc@3.18.1", when="@0.8.0", cuda_var="cuda", rocm_var="rocm") |