zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Expand E4S ROCm stack to include missing DaV packages (#36843)

Browse Source 
* 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
This commit is contained in:
kwryankrattiger 2023-05-16 09:34:52 -05:00 committed by GitHub
parent badaaf7092
commit 4627438373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
View File

@ -71,7 +71,7 @@ spack:
- conduit - conduit
- datatransferkit - datatransferkit
- dyninst - dyninst
- ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc +visit +vtkm +zfp - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc ~visit +vtkm +zfp ^hdf5@1.14
- exaworks - exaworks
- flecsi - flecsi
- flit - flit
@ -165,7 +165,7 @@ spack:
- chai ~benchmarks ~tests +cuda ^umpire ~shared - chai ~benchmarks ~tests +cuda ^umpire ~shared
- cusz +cuda - cusz +cuda
- dealii +cuda - dealii +cuda
- ecp-data-vis-sdk +cuda +adios2 +hdf5 +paraview +vtkm +zfp # Removing ascent because Dray is hung in CI. +ascent - ecp-data-vis-sdk +cuda ~ascent +adios2 +hdf5 +paraview +sz +vtkm +zfp ^hdf5@1.14 # Removing ascent because RAJA build failure
- flecsi +cuda - flecsi +cuda
- flux-core +cuda - flux-core +cuda
- ginkgo +cuda - ginkgo +cuda
@ -199,7 +199,7 @@ spack:
- cabana +rocm - cabana +rocm
- caliper +rocm - caliper +rocm
- chai ~benchmarks +rocm - chai ~benchmarks +rocm
- ecp-data-vis-sdk +paraview +vtkm +rocm - ecp-data-vis-sdk +adios2 +hdf5 +paraview +pnetcdf +sz +vtkm +zfp +rocm ^hdf5@1.14 # Excludes ascent for now due to C++ standard issues
- gasnet +rocm - gasnet +rocm
- ginkgo +rocm - ginkgo +rocm
- heffte +rocm - heffte +rocm

2
var/spack/repos/builtin/packages/ascent/package.py
View File

@ -183,6 +183,8 @@ class Ascent(CMakePackage, CudaPackage):
depends_on("vtk-m+cuda", when="@0.9.0: +vtkh+cuda") 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+fpic", when="@0.8.0: +vtkh")
depends_on("vtk-m~shared+fpic", when="@0.8.0: +vtkh~shared") 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 # VTK-h

2
var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py
View File

@ -152,7 +152,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage):
# Fortran support with ascent is problematic on some Cray platforms so the # Fortran support with ascent is problematic on some Cray platforms so the
# SDK is explicitly disabling it until the issues are resolved. # SDK is explicitly disabling it until the issues are resolved.
dav_sdk_depends_on( dav_sdk_depends_on(
"ascent+mpi~fortran+openmp+python+shared+vtkh+dray~test", "ascent+mpi~fortran+python+shared+vtkh+dray~test",
when="+ascent", when="+ascent",
propagate=["adios2", "cuda"] + cuda_arch_variants, propagate=["adios2", "cuda"] + cuda_arch_variants,
) )

2
var/spack/repos/builtin/packages/kokkos/package.py
View File

@ -207,6 +207,8 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
variant("std", default="17", values=stds, multi=False) variant("std", default="17", values=stds, multi=False)
variant("pic", default=False, description="Build position independent code") 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=17 ^cuda@:10")
conflicts("+cuda", when="std=20 ^cuda@:12") conflicts("+cuda", when="std=20 ^cuda@:12")