Upgrade vtk-m dep to [2.0, 2.3] (#453)

`GetCoordinateSystem` no longer returns reference, so some of our API usage had to be changed a bit. Ref: https://gitlab.kitware.com/vtk/vtk-m/-/commit/2d30e6d45a659d64865f7b7db14e0e38a9716245

Author: JarrettSJohnson

layer0/ContourSurf.cpp

@@ -82,18 +82,12 @@ using ::copysign;
 
 #include <vtkm/Version.h>
 #include <vtkm/cont/DataSetBuilderUniform.h>
-#include <vtkm/filter/Contour.h>
+#include <vtkm/filter/Contour/Contour.h>
 
 #include <cassert>
 #include <set>
 #include <vector>
 
-#if VTKM_VERSION_MINOR < 6 && VTKM_VERSION_PATCH > 0
-// 1.5.1
-#define ReadPortal GetPortalConstControl
-#define make_ArrayHandleMove(v) make_ArrayHandle(v, vtkm::CopyFlag::Off)
-#endif
-
 /**
  * Make a copy of a field (with operator()) and expose an array-like data access
  * API (operator[], empty(), size()).
@@ -342,13 +336,21 @@ static int ContourSurfVolumeVtkm(PyMOLGlobals* G, Isofield* field, float level,
     }
   }
 
-  auto dataSet = vtkm::cont::DataSetBuilderUniform().Create(pointDimensions);
-  dataSet.GetCoordinateSystem().SetData(
-      vtkm::cont::make_ArrayHandleMove(std::move(coorddata)));
-  dataSet.AddField(vtkm::cont::make_Field(pointFieldName,
-      vtkm::cont::Field::Association::POINTS, pointdata, vtkm::CopyFlag::Off));
+  vtkm::cont::CellSetStructured<3> cellSet;
+  cellSet.SetPointDimensions(pointDimensions);
+
+  vtkm::cont::DataSet dataSet;
+  dataSet.SetCellSet(cellSet);
+
+  vtkm::cont::CoordinateSystem coordinateSystem(
+    "coordinates", vtkm::cont::make_ArrayHandleMove(std::move(coorddata)));
+
+    dataSet.AddCoordinateSystem(coordinateSystem);
+
+    dataSet.AddField(vtkm::cont::make_Field(pointFieldName,
+        vtkm::cont::Field::Association::Points, pointdata, vtkm::CopyFlag::Off));
 
-  vtkm::filter::Contour filter;
+  vtkm::filter::contour::Contour filter;
   filter.SetIsoValue(level);
   filter.SetActiveField(pointFieldName);
   filter.SetGenerateNormals(mode == cIsosurfaceMode::triangles_grad_normals ||
@@ -362,12 +364,12 @@ static int ContourSurfVolumeVtkm(PyMOLGlobals* G, Isofield* field, float level,
   if (filter.GetGenerateNormals()) {
     outputData.GetPointField(filter.GetNormalArrayName())
         .GetData()
-        .CastAndCall(normalscopy);
+        .CastAndCallForTypes<vtkm::TypeListAll, VTKM_DEFAULT_STORAGE_LIST>(normalscopy);
   }
 
   auto const& vertices = outputData.GetCoordinateSystem();
   auto const& cellsetsingletype =
-      outputData.GetCellSet().Cast<vtkm::cont::CellSetSingleType<>>();
+      outputData.GetCellSet().AsCellSet<vtkm::cont::CellSetSingleType<>>();
 
   side = get_adjusted_side(level, side);
 

setup.py

@@ -220,7 +220,7 @@ class options:
 parser.add_argument("--use-openmp", type=str2bool, help="Use OpenMP")
 parser.add_argument(
     "--use-vtkm",
-    choices=("1.5", "1.6", "1.7", "no"),
+    choices=("2.0", "2.1", "2.2", "2.3", "no"),
     help="Use VTK-m for isosurface generation",
 )
 parser.add_argument(
@@ -730,17 +730,11 @@ def make_launch_script(self):
         vtkm_inc_dir,
         vtkm_inc_dir + "/vtkm/thirdparty/diy/vtkmdiy/include",
         vtkm_inc_dir + "/vtkm/thirdparty/lcl/vtkmlcl",
-    ] + (options.use_vtkm == "1.5") * [
-        vtkm_inc_dir + "/vtkm/thirdparty/diy",
-        vtkm_inc_dir + "/vtkm/thirdparty/taotuple",
     ]
     libs += [
         f"vtkm_cont-{options.use_vtkm}",
-        (
-            f"vtkm_filter-{options.use_vtkm}"
-            if options.use_vtkm == "1.5"
-            else f"vtkm_filter_contour-{options.use_vtkm}"
-        ),
+        f"vtkm_filter_contour-{options.use_vtkm}",
+        f"vtkm_filter_core-{options.use_vtkm}",
     ]
 
 if options.vmd_plugins: