Merge topic 'vtkm-bump'

1f698a1 Bump VTKm. Acked-by: Kitware Robot <[email protected]> Acked-by: Robert Maynard <[email protected]> Merge-request: !4963
Kitware · Dec 7, 2018 · 2cb1ab3 · 2cb1ab3
2 parents 8501ce4 + 1f698a1
commit 2cb1ab3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/Accelerators/Vtkm/vtkmClip.cxx b/Accelerators/Vtkm/vtkmClip.cxx
@@ -39,6 +39,8 @@
 #include "vtkmCellSetSingleType.h"
 #include "vtkmFilterPolicy.h"
 
+#include <vtkm/cont/RuntimeDeviceTracker.h>
+
 #include <vtkm/filter/ClipWithField.h>
 #include <vtkm/filter/ClipWithImplicitFunction.h>
 
@@ -102,6 +104,11 @@ int vtkmClip::RequestData(vtkInformation *,
                           vtkInformationVector **inInfoVec,
                           vtkInformationVector *outInfoVec)
 {
+  vtkm::cont::ScopedGlobalRuntimeDeviceTracker tracker;
+  (void)tracker;
+  vtkm::cont::GetGlobalRuntimeDeviceTracker().DisableDevice(
+        vtkm::cont::DeviceAdapterTagCuda{});
+
   vtkInformation* inInfo = inInfoVec[0]->GetInformationObject(0);
   vtkInformation* outInfo = outInfoVec->GetInformationObject(0);
 

diff --git a/Accelerators/Vtkm/vtkmContour.cxx b/Accelerators/Vtkm/vtkmContour.cxx
@@ -34,6 +34,7 @@
 #include "vtkmCellSetSingleType.h"
 #include "vtkmFilterPolicy.h"
 
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/filter/MarchingCubes.h>
 
 vtkStandardNewMacro(vtkmContour)
@@ -59,6 +60,11 @@ int vtkmContour::RequestData(vtkInformation* request,
                              vtkInformationVector** inputVector,
                              vtkInformationVector* outputVector)
 {
+  vtkm::cont::ScopedGlobalRuntimeDeviceTracker tracker;
+  (void)tracker;
+  vtkm::cont::GetGlobalRuntimeDeviceTracker().DisableDevice(
+        vtkm::cont::DeviceAdapterTagCuda{});
+
   vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
   vtkInformation* outInfo = outputVector->GetInformationObject(0);
   vtkDataSet* input =

diff --git a/Accelerators/Vtkm/vtkmFilterPolicy.h b/Accelerators/Vtkm/vtkmFilterPolicy.h
@@ -235,8 +235,6 @@ class vtkmInputFilterPolicy
 
   typedef vtkm::TypeListTagFieldVec3 CoordinateTypeList;
   typedef tovtkm::PointListInVTK CoordinateStorageList;
-
-  typedef vtkm::filter::PolicyDefault::DeviceAdapterList DeviceAdapterList;
 };
 
 //------------------------------------------------------------------------------
@@ -253,8 +251,6 @@ class vtkmOutputFilterPolicy
 
   typedef vtkm::TypeListTagFieldVec3 CoordinateTypeList;
   typedef tovtkm::PointListOutVTK CoordinateStorageList;
-
-  typedef vtkm::filter::PolicyDefault::DeviceAdapterList DeviceAdapterList;
 };
 
 #endif

diff --git a/Accelerators/Vtkm/vtkmGradient.cxx b/Accelerators/Vtkm/vtkmGradient.cxx
@@ -65,8 +65,6 @@ class vtkmGradientFilterPolicy
 
     typedef vtkm::TypeListTagFieldVec3 CoordinateTypeList;
     typedef tovtkm::PointListInVTK CoordinateStorageList;
-
-    typedef vtkm::filter::PolicyDefault::DeviceAdapterList DeviceAdapterList;
   };
 
 vtkm::cont::DataSet CopyDataSetStructure(const vtkm::cont::DataSet& ds)

diff --git a/Accelerators/Vtkm/vtkmWarpScalar.cxx b/Accelerators/Vtkm/vtkmWarpScalar.cxx
@@ -69,8 +69,6 @@ class vtkmWarpScalarFilterPolicy : public
 
   using CoordinateTypeList = vtkm::TypeListTagFieldVec3;
   using CoordinateStorageList = tovtkm::PointListInVTK;
-
-  using DeviceAdapterList = vtkm::filter::PolicyDefault::DeviceAdapterList;
 };
 
 }

diff --git a/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.cxx b/Accelerators/Vtkm/vtkmlib/ImplicitFunctionConverter.cxx
@@ -53,7 +53,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction *function)
     box->GetXMax(xmax);
 
     auto b = new vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax));
-    this->OutFunction.Reset(b, true, vtkmInputFilterPolicy::DeviceAdapterList());
+    this->OutFunction.Reset(b, true);
   }
   else if ((cylinder = vtkCylinder::SafeDownCast(function)))
   {
@@ -64,7 +64,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction *function)
 
     auto c = new vtkm::Cylinder(
       MakeFVec3(center), MakeFVec3(axis), static_cast<vtkm::FloatDefault>(radius));
-    this->OutFunction.Reset(c, true, vtkmInputFilterPolicy::DeviceAdapterList());
+    this->OutFunction.Reset(c, true);
   }
   else if ((plane = vtkPlane::SafeDownCast(function)))
   {
@@ -73,7 +73,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction *function)
     plane->GetNormal(normal);
 
     auto p = new vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal));
-    this->OutFunction.Reset(p, true, vtkmInputFilterPolicy::DeviceAdapterList());
+    this->OutFunction.Reset(p, true);
   }
   else if ((sphere = vtkSphere::SafeDownCast(function)))
   {
@@ -83,7 +83,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction *function)
 
     auto s = new vtkm::Sphere(
       MakeFVec3(center), static_cast<vtkm::FloatDefault>(radius));
-    this->OutFunction.Reset(s, true, vtkmInputFilterPolicy::DeviceAdapterList());
+    this->OutFunction.Reset(s, true);
   }
   else
   {

diff --git a/ThirdParty/vtkm/vtk-m b/ThirdParty/vtkm/vtk-m
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,8 +69,6 @@ class vtkmWarpScalarFilterPolicy : public @@
       using CoordinateTypeList = vtkm::TypeListTagFieldVec3;
       using CoordinateStorageList = tovtkm::PointListInVTK;
-      using DeviceAdapterList = vtkm::filter::PolicyDefault::DeviceAdapterList;
     };
     }
@@ Expand Down @@