Commit 1f698a10 authored by Allison Vacanti's avatar Allison Vacanti

Bump VTKm.

parent 3548c481
......@@ -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);
......
......@@ -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 =
......
......@@ -235,8 +235,6 @@ public:
typedef vtkm::TypeListTagFieldVec3 CoordinateTypeList;
typedef tovtkm::PointListInVTK CoordinateStorageList;
typedef vtkm::filter::PolicyDefault::DeviceAdapterList DeviceAdapterList;
};
//------------------------------------------------------------------------------
......@@ -253,8 +251,6 @@ public:
typedef vtkm::TypeListTagFieldVec3 CoordinateTypeList;
typedef tovtkm::PointListOutVTK CoordinateStorageList;
typedef vtkm::filter::PolicyDefault::DeviceAdapterList DeviceAdapterList;
};
#endif
......
......@@ -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)
......
......@@ -69,8 +69,6 @@ public:
using CoordinateTypeList = vtkm::TypeListTagFieldVec3;
using CoordinateStorageList = tovtkm::PointListInVTK;
using DeviceAdapterList = vtkm::filter::PolicyDefault::DeviceAdapterList;
};
}
......
......@@ -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
{
......
Subproject commit 16c4dde2ee2a19a0278473fed03c852482006a6e
Subproject commit 629b290216966d7f7c0ab377c622717b2933cf06
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment