Fix fides / ascent / vtk-m / visit (#41908)

Fixes among other things the compat bounds

4 files changed, 25 insertions, 20 deletions

diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py
index 5512859fb8..b8ab20f813 100644
--- a/var/spack/repos/builtin/packages/ascent/package.py
+++ b/var/spack/repos/builtin/packages/ascent/package.py
@@ -197,7 +197,10 @@ class Ascent(CMakePackage, CudaPackage):
     # VTK-m
     #######################
     depends_on("vtk-m@2.0:", when="@0.9.2: +vtkh")
-    depends_on("vtk-m@1.9:1.9", when="@0.9.0: +vtkh")
+    # 2.1 support needs commit e52b7bb8c9fd131f2fd49edf58037cc5ef77a166
+    depends_on("vtk-m@:2.0", when="@:0.9.2 +vtkh")
+    depends_on("vtk-m@1.9", when="@0.9.0:0.9.1 +vtkh")
+    depends_on("vtk-m +doubleprecision ~64bitids", when="+vtkh ^vtk-m")
 
     depends_on("vtk-m~tbb", when="@0.9.0: +vtkh")
     depends_on("vtk-m+openmp", when="@0.9.0: +vtkh+openmp")
diff --git a/var/spack/repos/builtin/packages/fides/package.py b/var/spack/repos/builtin/packages/fides/package.py
index 6bc6fbb3d6..29c5ea00c5 100644
--- a/var/spack/repos/builtin/packages/fides/package.py
+++ b/var/spack/repos/builtin/packages/fides/package.py
@@ -23,13 +23,16 @@ class Fides(CMakePackage):
 
     # 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("mpi", when="+mpi")
     depends_on("adios2")
-    # Type check failures when using 32 bit IDs and ADIOS2 with ZFP in older
-    # versions of Fides
-    depends_on("adios2~zfp", when="@:1.1 ^vtk-m ~64bitids")
-    depends_on("vtk-m")
+    # adios2::Mode::ReadRandomAccess requires adios2 2.8.0.
+    # older adios2 supported in https://gitlab.kitware.com/vtk/fides/-/merge_requests/146
+    depends_on("adios2@2.8:", when="@1.2")
+    depends_on("adios2@2.7:2.8", when="@1.1")
+
+    depends_on("vtk-m@1.9:")
+    # vtk-m 2.0 has a breaking change in cmake target name
+    depends_on("vtk-m@:1.9", when="@:1.1")
 
     # Fix missing implicit includes
     @when("%gcc@7:")
diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py
index cf023cb705..4270c5f3f7 100644
--- a/var/spack/repos/builtin/packages/visit/package.py
+++ b/var/spack/repos/builtin/packages/visit/package.py
@@ -170,13 +170,16 @@ class Visit(CMakePackage):
     depends_on("mfem+shared+exceptions+fms+conduit", when="+mfem")
     depends_on("libfms@0.2:", when="+mfem")
 
-    depends_on("adios2@2.7.1", when="+adios2")
-    depends_on("adios2+hdf5", when="+adios2+hdf5")
-    depends_on("adios2~hdf5", when="+adios2~hdf5")
-    depends_on("adios2+mpi", when="+adios2+mpi")
-    depends_on("adios2~mpi", when="+adios2~mpi")
-    depends_on("adios2+python", when="+adios2+python")
-    depends_on("adios2~python", when="+adios2~python")
+    with when("+adios2"):
+        depends_on("adios2")
+        # adios 2.8 removed adios2_taustubs (https://github.com/visit-dav/visit/issues/19209)
+        depends_on("adios2@:2.7.1")
+        depends_on("adios2+hdf5", when="+hdf5")
+        depends_on("adios2~hdf5", when="~hdf5")
+        depends_on("adios2+mpi", when="+mpi")
+        depends_on("adios2~mpi", when="~mpi")
+        depends_on("adios2+python", when="+python")
+        depends_on("adios2~python", when="~python")
 
     # For version 3.3.0 through 3.3.2, we used vtk-h to utilize vtk-m.
     # For version starting with 3.3.3 we use vtk-m directly.
diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py
index d98da40018..6c7e3cda9d 100644
--- a/var/spack/repos/builtin/packages/vtk-m/package.py
+++ b/var/spack/repos/builtin/packages/vtk-m/package.py
@@ -56,12 +56,6 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
     variant("doubleprecision", default=True, description="enable double precision")
     variant("logging", default=False, when="@1.3:", description="build logging support")
     variant(
-        "ascent_types",
-        default=True,
-        when="~64bitids",
-        description="build support for ascent types",
-    )
-    variant(
         "virtuals",
         default=False,
         description="enable support for deprecated virtual functions",
@@ -188,8 +182,10 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
                 self.define_from_variant("VTKm_INSTALL_EXAMPLES", "examples"),
                 self.define_from_variant("VTKm_NO_DEPRECATED_VIRTUAL", "virtuals"),
                 self.define_from_variant("VTKm_USE_64BIT_IDS", "64bitids"),
-                self.define_from_variant("VTKm_USE_DEFAULT_TYPES_FOR_ASCENT", "ascent_types"),
                 self.define_from_variant("VTKm_USE_DOUBLE_PRECISION", "doubleprecision"),
+                self.define(
+                    "VTKm_USE_DEFAULT_TYPES_FOR_ASCENT", "~64bitids +doubleprecision" in spec
+                ),
             ]
 
             if "+tbb" in spec: