Dataviz sdk update dep variants (#19327)

* ecp-io-sdk: Add preferred variants to all dependencies

* ecp-viz-sdk: Add preferred variants to all dependencies

2 files changed, 18 insertions, 31 deletions

diff --git a/var/spack/repos/builtin/packages/ecp-io-sdk/package.py b/var/spack/repos/builtin/packages/ecp-io-sdk/package.py
index a34ea99e27..6a43b77ffa 100644
--- a/var/spack/repos/builtin/packages/ecp-io-sdk/package.py
+++ b/var/spack/repos/builtin/packages/ecp-io-sdk/package.py
@@ -6,7 +6,7 @@
 from spack import *
 
 
-class EcpIoSdk(CMakePackage):
+class EcpIoSdk(BundlePackage):
     """ECP I/O Services SDK"""
 
     homepage = "https://github.com/chuckatkins/ecp-data-viz-sdk"
@@ -20,23 +20,15 @@ class EcpIoSdk(CMakePackage):
     variant('darshan', default=True, description="Enable Darshan")
     variant('faodel', default=False, description="Enable FAODEL")
     variant('hdf5', default=True, description="Enable HDF5")
-    variant('mercury', default=True, description="Enable Mercury")
     variant('pnetcdf', default=True, description="Enable PNetCDF")
     variant('unifyfs', default=True, description="Enable UnifyFS")
     variant('veloc', default=True, description="Enable VeloC")
 
-    # Currently no spack packages
-    # variant('romio', default=False, description="Enable ROMIO")
-
-    depends_on('adios2+mpi+fortran+zfp+hdf5', when='+adios2')
-    depends_on('darshan-runtime', when='+darshan')
+    depends_on('adios2+shared+mpi+fortran+python+zfp+sz+blosc+hdf5+sst+ssc+dataman', when='+adios2')
+    depends_on('darshan-runtime+mpi', when='+darshan')
     depends_on('darshan-util', when='+darshan')
-    depends_on('faodel+mpi+hdf5', when='+faodel')
-    depends_on('hdf5+mpi+fortran', when='+hdf5')
-    depends_on('mercury+mpi+ofi+sm', when='+mercury')
-    depends_on('parallel-netcdf+fortran+pic', when='+pnetcdf')
-    depends_on('unifyfs+fortran', when='+unifyfs')
+    depends_on('faodel+shared+mpi+hdf5 network=libfabric', when='+faodel')
+    depends_on('hdf5+shared+mpi+fortran', when='+hdf5')
+    depends_on('parallel-netcdf+shared+fortran', when='+pnetcdf')
+    depends_on('unifyfs+fortran+hdf5', when='+unifyfs')
     depends_on('veloc', when='+veloc')
-
-    def cmake_args(self):
-        return ['-DIO=ON']
diff --git a/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py b/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py
index 505121e0e9..337ca17237 100644
--- a/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py
+++ b/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py
@@ -6,7 +6,7 @@
 from spack import *
 
 
-class EcpVizSdk(CMakePackage):
+class EcpVizSdk(BundlePackage):
     """ECP Viz & Analysis SDK"""
 
     homepage = "https://github.com/chuckatkins/ecp-data-viz-sdk"
@@ -16,14 +16,12 @@ class EcpVizSdk(CMakePackage):
 
     version('1.0', branch='master')
 
-    variant('catalyst', default=True, description="Enable Catalyst")
-    variant('paraview', default=True, description="Enable ParaView")
-    variant('sz', default=True, description="Enable SZ")
-    variant('vtkm', default=True, description="Enable VTK-m")
-    variant('zfp', default=True, description="Enable ZFP")
-
-    # Broken dependency: vtk-h
-    # variant('ascent', default=False, description="Enable Ascent")
+    variant('ascent', default=False, description="Enable Ascent")
+    # variant('catalyst', default=False, description="Enable Catalyst")
+    variant('paraview', default=False, description="Enable ParaView")
+    variant('sz', default=False, description="Enable SZ")
+    variant('vtkm', default=False, description="Enable VTK-m")
+    variant('zfp', default=False, description="Enable ZFP")
 
     # Outstanding build issues
     # variant('visit', default=False, description="Enable VisIt")
@@ -32,13 +30,10 @@ class EcpVizSdk(CMakePackage):
     # variant('cinema', default=False, description="Enable Cinema")
     # variant('rover', default=False, description="Enable ROVER")
 
-    depends_on('ascent', when='+ascent')
+    depends_on('ascent+shared+mpi+fortran+openmp+python+vtkh+dray', when='+ascent')
     depends_on('catalyst', when='+catalyst')
-    depends_on('paraview', when='+paraview')
-    depends_on('sz', when='+sz')
+    depends_on('paraview+shared+mpi+python3+hdf5+kits', when='+paraview')
     depends_on('visit', when='+visit')
-    depends_on('vtk-m', when='+vtkm')
+    depends_on('vtk-m+shared+mpi+openmp+rendering', when='+vtkm')
+    depends_on('sz+shared+fortran+hdf5+python+random_access', when='+sz')
     depends_on('zfp', when='+zfp')
-
-    def cmake_args(self):
-        return ['-DVIZ=ON']