Merge topic 'force_point_locator_tests_to_use_correct_device'

e5090e12 Make sure the PointLocatorUniform uses the correct runtime device
38e0e4c3 Mark PointLocatorUniformGrid constructors as host only
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1306

vtkm/cont/cuda/testing/UnitTestCudaPointLocatorUniformGrid.cu

@@ -27,6 +27,8 @@
 
 int UnitTestCudaPointLocatorUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>());
 }

vtkm/cont/openmp/testing/UnitTestOpenMPPointLocatorUniformGrid.cxx

@@ -25,6 +25,8 @@
 
 int UnitTestOpenMPPointLocatorUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>());
 }

vtkm/cont/serial/testing/UnitTestSerialPointLocatorUniformGrid.cxx

@@ -27,6 +27,8 @@
 
 int UnitTestSerialPointLocatorUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
 }

vtkm/cont/tbb/testing/UnitTestTBBPointLocatorUniformGrid.cxx

@@ -27,6 +27,8 @@
 
 int UnitTestTBBPointLocatorUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagTBB>());
 }

vtkm/exec/PointLocatorUniformGrid.h

@@ -50,7 +50,6 @@ public:
 
   PointLocatorUniformGrid() = default;
 
-  VTKM_EXEC_CONT
   PointLocatorUniformGrid(const vtkm::Vec<vtkm::FloatDefault, 3>& _min,
                           const vtkm::Vec<vtkm::FloatDefault, 3>& _max,
                           const vtkm::Vec<vtkm::Id, 3>& _dims,