Merge topic 'update-vtkm-052019'

637c4728 Update to latest VTK-m

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !5604

Accelerators/Vtkm/vtkmClip.cxx

@@ -104,10 +104,8 @@ int vtkmClip::RequestData(vtkInformation *,
                           vtkInformationVector **inInfoVec,
                           vtkInformationVector *outInfoVec)
 {
-  vtkm::cont::ScopedRuntimeDeviceTracker tracker;
-  (void)tracker;
-  vtkm::cont::GetRuntimeDeviceTracker().DisableDevice(
-        vtkm::cont::DeviceAdapterTagCuda{});
+  vtkm::cont::ScopedRuntimeDeviceTracker tracker(vtkm::cont::DeviceAdapterTagCuda{},
+                                                 vtkm::cont::RuntimeDeviceTrackerMode::Disable);
 
   vtkInformation* inInfo = inInfoVec[0]->GetInformationObject(0);
   vtkInformation* outInfo = outInfoVec->GetInformationObject(0);

Accelerators/Vtkm/vtkmContour.cxx

@@ -60,10 +60,9 @@ int vtkmContour::RequestData(vtkInformation* request,
                              vtkInformationVector** inputVector,
                              vtkInformationVector* outputVector)
 {
-  vtkm::cont::ScopedRuntimeDeviceTracker tracker;
-  (void)tracker;
-  vtkm::cont::GetRuntimeDeviceTracker().DisableDevice(
-        vtkm::cont::DeviceAdapterTagCuda{});
+  vtkm::cont::ScopedRuntimeDeviceTracker tracker(vtkm::cont::DeviceAdapterTagCuda{},
+                                                 vtkm::cont::RuntimeDeviceTrackerMode::Disable);
+
 
   vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
   vtkInformation* outInfo = outputVector->GetInformationObject(0);

Accelerators/Vtkm/vtkmlib/ArrayConverters.cxx

@@ -389,11 +389,11 @@ public:
     //stealing the array clears the delete function, so we need to get the function first.
     //VTK-m allocations are aligned or done with cuda uvm memory so we need to propagate
     //the proper free function to VTK
-    auto deleteFunction = handle.GetStorage().GetDeleteFunction();
-    ValueType* stolenMemory = reinterpret_cast<ValueType*>(handle.GetStorage().StealArray());
+    auto stolenState = handle.GetStorage().StealArray();
+    auto stolenMemory = reinterpret_cast<ValueType*>(stolenState.first);
     array->SetVoidArray(
       stolenMemory, size, 0, vtkAbstractArray::VTK_DATA_ARRAY_USER_DEFINED);
-    array->SetArrayFreeFunction(deleteFunction);
+    array->SetArrayFreeFunction(stolenState.second);
 
     this->Data = array;
   }

vtk-m @ ae6999e5

-Subproject commit a3df54017bd390db8f99d3ce071c4d74f7bc06ba
+Subproject commit ae6999e534876ffa1b723511d60c2d8585a38f03