From 5d2c9636ffd37b197fc04989371eeb7d0fa7af74 Mon Sep 17 00:00:00 2001
From: kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com>
Date: Wed, 23 Nov 2022 13:01:30 -0600
Subject: 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
---
 .../gitlab/cloud_pipelines/stacks/e4s/spack.yaml   | 28 +++++++---------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'share')

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
-- 
cgit v1.2.3-60-g2f50