diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2023-05-16 09:34:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-16 09:34:52 -0500 |
| commit | 4627438373732dff7ce269b1afe5390a9046dd1c (patch) | |
| tree | e13c28b0c52ed7c10c97775fe3d820684ae51d6c /var | |
| parent | badaaf7092b04713a24bb246eaafbb1567d32e0b (diff) | |
| download | spack-4627438373732dff7ce269b1afe5390a9046dd1c.tar.gz spack-4627438373732dff7ce269b1afe5390a9046dd1c.tar.bz2 spack-4627438373732dff7ce269b1afe5390a9046dd1c.tar.xz spack-4627438373732dff7ce269b1afe5390a9046dd1c.zip | |
CI: Expand E4S ROCm stack to include missing DaV packages (#36843)
* CI: Expand E4S ROCm stack to include missing DaV packages
Ascent: Fixup for VTK-m with Kokkos backend
* DaV SDK: Removed duplicated openmp variant for ascent
* Drop visit and add conflict for Kokkos
* E4S: Drop ascent from CUDA builds
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/ascent/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/kokkos/package.py | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 46ec9107ac..3eac326132 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -183,6 +183,8 @@ class Ascent(CMakePackage, CudaPackage): depends_on("vtk-m+cuda", when="@0.9.0: +vtkh+cuda") depends_on("vtk-m+fpic", when="@0.8.0: +vtkh") depends_on("vtk-m~shared+fpic", when="@0.8.0: +vtkh~shared") + # Ascent defaults to C++11 + depends_on("kokkos std=11", when="+vtkh ^vtk-m +kokkos") ####################### # VTK-h diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index 27adceba3e..a9e29c8904 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -152,7 +152,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): # Fortran support with ascent is problematic on some Cray platforms so the # SDK is explicitly disabling it until the issues are resolved. dav_sdk_depends_on( - "ascent+mpi~fortran+openmp+python+shared+vtkh+dray~test", + "ascent+mpi~fortran+python+shared+vtkh+dray~test", when="+ascent", propagate=["adios2", "cuda"] + cuda_arch_variants, ) diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index d3fad74a15..6ab804203d 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -207,6 +207,8 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): variant("std", default="17", values=stds, multi=False) variant("pic", default=False, description="Build position independent code") + conflicts("std=11", when="@3.7:") + conflicts("+cuda", when="std=17 ^cuda@:10") conflicts("+cuda", when="std=20 ^cuda@:12") |