Ascent: add dependency on adios2, remove deprecated variant (#28876)

Also update specs to be less complicated for dray/mfem/vtk-h.
Removed deprecated adios variant.

1 files changed, 33 insertions, 32 deletions

diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py
index d4784cc1d6..c2fb928f31 100644
--- a/var/spack/repos/builtin/packages/ascent/package.py
+++ b/var/spack/repos/builtin/packages/ascent/package.py
@@ -78,7 +78,6 @@ class Ascent(CMakePackage, CudaPackage):
     variant("openmp", default=(sys.platform != 'darwin'),
             description="build openmp support")
     variant("mfem", default=False, description="Build MFEM filter support")
-    variant("adios", default=False, description="Build Adios filter support")
     variant("dray", default=False, description="Build with Devil Ray support")
     variant("adios2", default=False, description="Build Adios2 filter support")
     variant("fides", default=False, description="Build Fides filter support")
@@ -103,8 +102,8 @@ class Ascent(CMakePackage, CudaPackage):
     # Certain CMake versions have been found to break for our use cases
     depends_on("cmake@3.14.1:3.14,3.18.2:", type='build')
     depends_on("conduit@:0.7.2", when="@:0.7.1")
-    depends_on("conduit~python", when="~python")
     depends_on("conduit+python", when="+python")
+    depends_on("conduit~python", when="~python")
     depends_on("conduit+mpi", when="+mpi")
     depends_on("conduit~mpi", when="~mpi")
 
@@ -135,44 +134,46 @@ class Ascent(CMakePackage, CudaPackage):
     # TPLs for Runtime Features
     #############################
 
-    depends_on("vtk-h",             when="+vtkh")
-    depends_on("vtk-h~openmp",      when="+vtkh~openmp")
-    depends_on("vtk-h+cuda+openmp", when="+vtkh+cuda+openmp")
-    depends_on("vtk-h+cuda~openmp", when="+vtkh+cuda~openmp")
-
-    depends_on("vtk-h~shared",             when="~shared+vtkh")
-    depends_on("vtk-h~shared~openmp",      when="~shared+vtkh~openmp")
-    depends_on("vtk-h~shared+cuda",        when="~shared+vtkh+cuda")
-    depends_on("vtk-h~shared+cuda~openmp", when="~shared+vtkh+cuda~openmp")
+    depends_on("vtk-h", when="+vtkh")
+    # propagate relevent variants to vtk-h
+    depends_on("vtk-h+openmp", when="+vtkh+openmp")
+    depends_on("vtk-h~openmp", when="+vtkh~openmp")
+    depends_on("vtk-h+cuda", when="+vtkh+cuda")
+    depends_on("vtk-h~cuda", when="+vtkh~cuda")
+    depends_on("vtk-h+shared", when="+vtkh+shared")
+    depends_on("vtk-h~shared", when="+vtkh~shared")
 
     # mfem
-    depends_on("mfem~threadsafe~openmp+shared+mpi+conduit", when="+shared+mfem+mpi")
-    depends_on("mfem~threadsafe~openmp~shared+mpi+conduit", when="~shared+mfem+mpi")
-
-    depends_on("mfem~threadsafe~openmp+shared~mpi+conduit", when="+shared+mfem~mpi")
-    depends_on("mfem~threadsafe~openmp~shared~mpi+conduit", when="~shared+mfem~mpi")
+    depends_on("mfem~threadsafe~openmp+conduit", when="+mfem")
+    # propagate relevent variants to mfem
+    depends_on("mfem+mpi", when="+mfem+mpi")
+    depends_on("mfem~mpi", when="+mfem~mpi")
+    depends_on("mfem+shared", when="+mfem+shared")
+    depends_on("mfem~shared", when="+mfem~shared")
 
     # fides
     depends_on("fides", when="+fides")
 
     # devil ray variants with mpi
     # we have to specify both because mfem makes us
-    depends_on("dray+mpi~test~utils+shared+cuda",        when="+dray+mpi+cuda+shared")
-    depends_on("dray+mpi~test~utils+shared+openmp",      when="+dray+mpi+openmp+shared")
-    depends_on("dray+mpi~test~utils+shared~openmp~cuda", when="+dray+mpi~openmp~cuda+shared")
-
-    depends_on("dray+mpi~test~utils~shared+cuda",        when="+dray+mpi+cuda~shared")
-    depends_on("dray+mpi~test~utils~shared+openmp",      when="+dray+mpi+openmp~shared")
-    depends_on("dray+mpi~test~utils~shared~openmp~cuda", when="+dray+mpi~openmp~cuda~shared")
-
-    # devil ray variants without mpi
-    depends_on("dray~mpi~test~utils+shared+cuda",        when="+dray~mpi+cuda+shared")
-    depends_on("dray~mpi~test~utils+shared+openmp",      when="+dray~mpi+openmp+shared")
-    depends_on("dray~mpi~test~utils+shared~openmp~cuda", when="+dray~mpi~openmp~cuda+shared")
-
-    depends_on("dray~mpi~test~utils~shared+cuda",        when="+dray~mpi+cuda~shared")
-    depends_on("dray~mpi~test~utils~shared+openmp",      when="+dray~mpi+openmp~shared")
-    depends_on("dray~mpi~test~utils~shared~openmp~cuda", when="+dray~mpi~openmp~cuda~shared")
+    depends_on('dray~test~utils', when='+dray')
+    # propagate relevent variants to dray
+    depends_on('dray+cuda', when='+dray+cuda')
+    depends_on('dray~cuda', when='+dray~cuda')
+    depends_on('dray+mpi', when='+dray+mpi')
+    depends_on('dray~mpi', when='+dray~mpi')
+    depends_on('dray+shared', when='+dray+shared')
+    depends_on('dray~shared', when='+dray~shared')
+    depends_on('dray+openmp', when='+dray+openmp')
+    depends_on('dray~openmp', when='+dray~openmp')
+
+    # Adios2
+    depends_on('adios2', when='+adios2')
+    # propagate relevent variants to adios2
+    depends_on('adios2+mpi', when='+adios2+mpi')
+    depends_on('adios2~mpi', when='+adios2~mpi')
+    depends_on('adios2+shared', when='+adios2+shared')
+    depends_on('adios2~shared', when='+adios2~shared')
 
     #######################
     # Documentation related