diff options
author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2022-11-23 13:01:30 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-23 11:01:30 -0800 |
commit | 5d2c9636ffd37b197fc04989371eeb7d0fa7af74 (patch) | |
tree | 64a6de039b11e62900d2af5e42293725fb5e4db1 | |
parent | 63e440651436fdc30993ef58875279e71f4851d1 (diff) | |
download | spack-5d2c9636ffd37b197fc04989371eeb7d0fa7af74.tar.gz spack-5d2c9636ffd37b197fc04989371eeb7d0fa7af74.tar.bz2 spack-5d2c9636ffd37b197fc04989371eeb7d0fa7af74.tar.xz spack-5d2c9636ffd37b197fc04989371eeb7d0fa7af74.zip |
E4S: Conservatively add ecp-data-vis-sdk (#33621)
* E4S: Conservatively add ecp-data-vis-sdk
* Remove ascent from CUDA SDK stack to stop hanging on Dray
* Adios2: Newer FindPython uses Python_EXECUTABLE
-rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml | 28 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/adios2/package.py | 1 |
2 files changed, 10 insertions, 19 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 5d0e7b4697..56627426eb 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -57,14 +57,12 @@ spack: specs: # CPU - adios - - adios2 - alquimia - aml - amrex - arborx - archer - argobots - - ascent - axom - bolt - bricks @@ -74,12 +72,11 @@ spack: - chai ~benchmarks ~tests - charliecloud - conduit - - darshan-runtime - - darshan-util - datatransferkit - dyninst + - ecp-data-vis-sdk ~cuda ~rocm + +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc +visit +vtkm +zfp - exaworks - - faodel - flecsi - flit - flux-core @@ -91,8 +88,6 @@ spack: - gotcha - gptune - h5bench - - hdf5 +fortran +hl +shared - - hdf5-vol-async - heffte +fftw - hpctoolkit - hpx networking=mpi @@ -119,7 +114,6 @@ spack: - openpmd-api - papi - papyrus - - parallel-netcdf - parsec ~cuda - pdt - petsc @@ -128,7 +122,6 @@ spack: - plumed - precice - pumi - - py-cinemasci - py-jupyterhub - py-libensemble - py-petsc4py @@ -148,7 +141,6 @@ spack: - superlu-dist - swig - swig@4.0.2-fortran - - sz - tasmanian - tau +mpi +python - trilinos@13.0.1 +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack @@ -158,24 +150,22 @@ spack: - turbine - umap - umpire - - unifyfs - upcxx - variorum - - veloc - - vtk-m - wannier90 - - zfp # CUDA - - adios2 +cuda cuda_arch=80 - amrex +cuda cuda_arch=80 - arborx +cuda cuda_arch=80 ^kokkos@3.6.00 +wrapper - - ascent +cuda cuda_arch=80 - bricks +cuda - cabana +cuda ^kokkos@3.6.00 +wrapper +cuda_lambda +cuda cuda_arch=80 - caliper +cuda cuda_arch=80 - chai ~benchmarks ~tests +cuda cuda_arch=80 ^umpire@6.0.0 ~shared - dealii +cuda cuda_arch=80 + - ecp-data-vis-sdk +cuda cuda_arch=80 + +adios2 +hdf5 +vtkm +zfp + # Removing ascent because Dray is hung in CI. + # +ascent - flecsi +cuda cuda_arch=80 - flux-core +cuda - ginkgo +cuda cuda_arch=80 @@ -201,8 +191,6 @@ spack: - tau +mpi +cuda - trilinos@13.4.0 +cuda cuda_arch=80 - umpire ~shared +cuda cuda_arch=80 - - vtk-m +cuda cuda_arch=80 - - zfp +cuda cuda_arch=80 # ROCm - amrex +rocm amdgpu_target=gfx90a @@ -210,6 +198,8 @@ spack: - cabana +rocm - caliper +rocm amdgpu_target=gfx90a - chai ~benchmarks +rocm amdgpu_target=gfx90a + - ecp-data-vis-sdk +rocm amdgpu_target=gfx90a + +vtkm - gasnet +rocm amdgpu_target=gfx90a - ginkgo +rocm amdgpu_target=gfx90a - heffte +rocm amdgpu_target=gfx90a @@ -236,7 +226,6 @@ spack: +rocm amdgpu_target=gfx90a - umpire +rocm amdgpu_target=gfx90a - upcxx +rocm amdgpu_target=gfx90a - - vtk-m ~openmp +rocm amdgpu_target=gfx90a # CPU failures #- geopm # /usr/include/x86_64-linux-gnu/bits/string_fortified.h:95:10: error:'__builtin_strncpy' specified bound 512 equals destination size [-Werror=stringop-truncation] @@ -297,6 +286,7 @@ spack: - match: - cuda + - dray - dyninst - ginkgo - hpx diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index dd4708b841..5f567373f3 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -208,6 +208,7 @@ class Adios2(CMakePackage, CudaPackage): if "+python" in spec or self.run_tests: args.append("-DPYTHON_EXECUTABLE:FILEPATH=%s" % spec["python"].command.path) + args.append("-DPython_EXECUTABLE:FILEPATH=%s" % spec["python"].command.path) return args |