Make sure all device specific tests use the intended device.

This means that we not only setup the runtime device tracker
to force the intended device, it also means making sure
the default device is the error device.

vtkm/cont/cuda/testing/CMakeLists.txt

@@ -31,7 +31,7 @@ set(unit_tests
   UnitTestCudaImplicitFunction.cu
   UnitTestCudaMath.cu
   UnitTestCudaShareUserProvidedManagedMemory.cu
-  UnitTestCudaPointLocatorUniformGrid.cxx
+  UnitTestCudaPointLocatorUniformGrid.cu
   UnitTestCudaVirtualObjectHandle.cu
   )
 vtkm_unit_tests(SOURCES ${unit_tests})

vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu

@@ -18,6 +18,9 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
@@ -25,5 +28,7 @@
 
 int UnitTestCudaArrayHandle(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run();
 }

vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu

@@ -18,9 +18,9 @@
 //  this software.
 //============================================================================
 
-#ifdef VTKM_DEVICE_ADAPTER
-#undef VTKM_DEVICE_ADAPTER
-#endif
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
@@ -30,6 +30,8 @@
 
 int UnitTestCudaArrayHandleFancy(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result =
     vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run();
   return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);

vtkm/cont/cuda/testing/UnitTestCudaArrayHandleVirtualCoordinates.cu

@@ -17,11 +17,19 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 #include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
 
 int UnitTestCudaArrayHandleVirtualCoordinates(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
     vtkm::cont::DeviceAdapterTagCuda>::Run();
 }

vtkm/cont/cuda/testing/UnitTestCudaCellLocatorTwoLevelUniformGrid.cu

@@ -17,10 +17,18 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
 
 int UnitTestCudaCellLocatorTwoLevelUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagCuda>);
 }

vtkm/cont/cuda/testing/UnitTestCudaColorTable.cu

@@ -29,5 +29,7 @@
 
 int UnitTestCudaColorTable(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagCuda>::Run();
 }

vtkm/cont/cuda/testing/UnitTestCudaComputeRange.cu

@@ -17,6 +17,12 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 
 #include <vtkm/cont/cuda/internal/testing/Testing.h>
@@ -24,6 +30,8 @@
 
 int UnitTestCudaComputeRange(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result = vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagCuda>::Run();
   return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
 }

vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu

@@ -18,9 +18,10 @@
 //  this software.
 //============================================================================
 
-#ifndef VTKM_DEVICE_ADAPTER
-#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_CUDA
-#endif
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 #include <vtkm/cont/cuda/internal/testing/Testing.h>
@@ -28,6 +29,8 @@
 
 int UnitTestCudaDataSetExplicit(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result = vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagCuda>::Run();
   return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
 }

vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu

@@ -18,9 +18,9 @@
 //  this software.
 //============================================================================
 
-#ifdef VTKM_DEVICE_ADAPTER
-#undef VTKM_DEVICE_ADAPTER
-#endif
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
@@ -30,6 +30,8 @@
 
 int UnitTestCudaDataSetSingleType(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result =
     vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagCuda>::Run();
   return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);

vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu

@@ -18,18 +18,20 @@
 //  this software.
 //============================================================================
 
-#ifdef VTKM_DEVICE_ADAPTER
-#undef VTKM_DEVICE_ADAPTER
-#endif
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
-
 #include <vtkm/cont/cuda/internal/testing/Testing.h>
 #include <vtkm/cont/testing/TestingDeviceAdapter.h>
 
 int UnitTestCudaDeviceAdapter(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result = vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagCuda>::Run();
   return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(result);
 }

vtkm/cont/cuda/testing/UnitTestCudaImplicitFunction.cu

@@ -18,6 +18,11 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingImplicitFunction.h>
 
 namespace
@@ -33,5 +38,7 @@ void TestImplicitFunctions()
 
 int UnitTestCudaImplicitFunction(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
 }

vtkm/cont/cuda/testing/UnitTestCudaMath.cu

@@ -20,17 +20,19 @@
 //
 //=============================================================================
 
-#ifdef VTKM_DEVICE_ADAPTER
-#undef VTKM_DEVICE_ADAPTER
-#endif
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
-#include <vtkm/testing/TestingMath.h>
-
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
+#include <vtkm/testing/TestingMath.h>
 
 int UnitTestCudaMath(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     UnitTestMathNamespace::RunMathTests<vtkm::cont::DeviceAdapterTagCuda>);
 }

vtkm/cont/cuda/testing/UnitTestCudaPointLocatorUniformGrid.cu

@@ -17,10 +17,18 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
 
 int UnitTestCudaPointLocatorUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
-    TestingPointLocatorUniformGrid<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>());
+    TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
 }

vtkm/cont/cuda/testing/UnitTestCudaShareUserProvidedManagedMemory.cu

@@ -18,14 +18,15 @@
 //  this software.
 //============================================================================
 
-#ifdef VTKM_DEVICE_ADAPTER
-#undef VTKM_DEVICE_ADAPTER
-#endif
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/cuda/internal/testing/Testing.h>
 
 #include <vtkm/cont/ArrayHandle.h>
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 #include <vtkm/cont/cuda/ErrorCuda.h>
@@ -281,6 +282,8 @@ void Launch()
 
 int UnitTestCudaShareUserProvidedManagedMemory(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int ret = vtkm::cont::testing::Testing::Run(Launch);
   return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(ret);
 }

vtkm/cont/cuda/testing/UnitTestCudaVirtualObjectHandle.cu

@@ -17,6 +17,11 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingVirtualObjectHandle.h>
 
 namespace
@@ -24,10 +29,16 @@ namespace
 
 void TestVirtualObjectHandle()
 {
-  using DeviceAdapterList =
-    vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagSerial, vtkm::cont::DeviceAdapterTagCuda>;
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
 
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
+  using DeviceAdapterList = vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagCuda>;
   vtkm::cont::testing::TestingVirtualObjectHandle<DeviceAdapterList>::Run();
+
+  tracker.Reset();
+  using DeviceAdapterList2 =
+    vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagSerial, vtkm::cont::DeviceAdapterTagCuda>;
+  vtkm::cont::testing::TestingVirtualObjectHandle<DeviceAdapterList2>::Run();
 }
 
 } // anonymous namespace

vtkm/cont/serial/testing/UnitTestSerialArrayHandle.cxx

@@ -28,5 +28,7 @@
 
 int UnitTestSerialArrayHandle(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialArrayHandleFancy.cxx

@@ -31,5 +31,7 @@
 
 int UnitTestSerialArrayHandleFancy(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialArrayHandleVirtualCoordinates.cxx

@@ -17,11 +17,19 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
 
 int UnitTestSerialArrayHandleVirtualCoordinates(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
     vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialCellLocatorTwoLevelUniformGrid.cxx

@@ -17,10 +17,19 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
 
 int UnitTestSerialCellLocatorTwoLevelUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagSerial>);
 }

vtkm/cont/serial/testing/UnitTestSerialColorTable.cxx

@@ -29,5 +29,6 @@
 
 int UnitTestSerialColorTable(int, char* [])
 {
+  //TestingColorTable forces the device
   return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialComputeRange.cxx

@@ -29,5 +29,6 @@
 
 int UnitTestSerialComputeRange(int, char* [])
 {
+  //TestingComputeRange forces the device
   return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialDataSetExplicit.cxx

@@ -28,5 +28,7 @@
 
 int UnitTestSerialDataSetExplicit(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialDataSetSingleType.cxx

@@ -28,5 +28,7 @@
 
 int UnitTestSerialDataSetSingleType(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialDeviceAdapter.cxx

@@ -23,11 +23,13 @@
 // for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/cont/serial/DeviceAdapterSerial.h>
-
 #include <vtkm/cont/testing/TestingDeviceAdapter.h>
 
 int UnitTestSerialDeviceAdapter(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagSerial>::Run();
 }

vtkm/cont/serial/testing/UnitTestSerialImplicitFunction.cxx

@@ -18,6 +18,11 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingImplicitFunction.h>
 
 namespace
@@ -33,5 +38,7 @@ void TestImplicitFunctions()
 
 int UnitTestSerialImplicitFunction(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
 }

vtkm/cont/serial/testing/UnitTestSerialPointLocatorUniformGrid.cxx

@@ -17,10 +17,18 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
 
 int UnitTestSerialPointLocatorUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
-    TestingPointLocatorUniformGrid<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>());
+    TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
 }

vtkm/cont/serial/testing/UnitTestSerialVirtualObjectHandle.cxx

@@ -17,6 +17,12 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingVirtualObjectHandle.h>
 
 namespace
@@ -25,7 +31,6 @@ namespace
 void TestVirtualObjectHandle()
 {
   using DeviceAdapterList = vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagSerial>;
-
   vtkm::cont::testing::TestingVirtualObjectHandle<DeviceAdapterList>::Run();
 }
 
@@ -33,5 +38,7 @@ void TestVirtualObjectHandle()
 
 int UnitTestSerialVirtualObjectHandle(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle);
 }

vtkm/cont/tbb/testing/UnitTestTBBArrayHandle.cxx

@@ -18,6 +18,9 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
@@ -25,5 +28,7 @@
 
 int UnitTestTBBArrayHandle(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBArrayHandleFancy.cxx

@@ -18,6 +18,9 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
@@ -25,5 +28,7 @@
 
 int UnitTestTBBArrayHandleFancy(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBArrayHandleVirtualCoordinates.cxx

@@ -17,11 +17,19 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
 #include <vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h>
 
 int UnitTestTBBArrayHandleVirtualCoordinates(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
     vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBCellLocatorTwoLevelUniformGrid.cxx

@@ -17,10 +17,18 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h>
 
 int UnitTestTBBCellLocatorTwoLevelUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagTBB>);
 }

vtkm/cont/tbb/testing/UnitTestTBBColorTable.cxx

@@ -29,5 +29,7 @@
 
 int UnitTestTBBColorTable(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBComputeRange.cxx

@@ -18,11 +18,18 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
 
 #include <vtkm/cont/testing/TestingComputeRange.h>
 
 int UnitTestTBBComputeRange(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBDataSetExplicit.cxx

@@ -18,11 +18,18 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
 
 #include <vtkm/cont/testing/TestingDataSetExplicit.h>
 
 int UnitTestTBBDataSetExplicit(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBDataSetSingleType.cxx

@@ -18,11 +18,18 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
 
 #include <vtkm/cont/testing/TestingDataSetSingleType.h>
 
 int UnitTestTBBDataSetSingleType(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBDeviceAdapter.cxx

@@ -18,13 +18,18 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
+#include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
-
 #include <vtkm/cont/testing/TestingDeviceAdapter.h>
 
 int UnitTestTBBDeviceAdapter(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagTBB>::Run();
 }

vtkm/cont/tbb/testing/UnitTestTBBImplicitFunction.cxx

@@ -18,6 +18,11 @@
 //  this software.
 //============================================================================
 
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingImplicitFunction.h>
 
 namespace
@@ -33,5 +38,7 @@ void TestImplicitFunctions()
 
 int UnitTestTBBImplicitFunction(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(TestImplicitFunctions);
 }

vtkm/cont/tbb/testing/UnitTestTBBPointLocatorUniformGrid.cxx

@@ -17,10 +17,18 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingPointLocatorUniformGrid.h>
 
 int UnitTestTBBPointLocatorUniformGrid(int, char* [])
 {
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(
-    TestingPointLocatorUniformGrid<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>());
+    TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>());
 }

vtkm/cont/tbb/testing/UnitTestTBBVirtualObjectHandle.cxx

@@ -17,6 +17,12 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
+
+// Make sure that the tested code is using the device adapter specified. This
+// is important in the long run so we don't, for example, use the CUDA device
+// for a part of an operation where the TBB device was specified.
+#define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
+
 #include <vtkm/cont/testing/TestingVirtualObjectHandle.h>
 
 namespace
@@ -24,12 +30,19 @@ namespace
 
 void TestVirtualObjectHandle()
 {
-  using DeviceAdapterList =
-    vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagSerial, vtkm::cont::DeviceAdapterTagTBB>;
+  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
 
+  tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
+  using DeviceAdapterList = vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagTBB>;
   vtkm::cont::testing::TestingVirtualObjectHandle<DeviceAdapterList>::Run();
+
+  tracker.Reset();
+  using DeviceAdapterList2 =
+    vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagSerial, vtkm::cont::DeviceAdapterTagTBB>;
+  vtkm::cont::testing::TestingVirtualObjectHandle<DeviceAdapterList2>::Run();
 }
 
+
 } // anonymous namespace
 
 int UnitTestTBBVirtualObjectHandle(int, char* [])

vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h

@@ -148,7 +148,7 @@ vtkm::cont::DataSet MakeTestDataSet(const vtkm::Vec<vtkm::Id, DIMENSIONS>& dims,
   return out;
 }
 
-template <vtkm::IdComponent DIMENSIONS>
+template <vtkm::IdComponent DIMENSIONS, typename DeviceAdapter>
 void GenerateRandomInput(const vtkm::cont::DataSet& ds,
                          vtkm::Id count,
                          vtkm::cont::ArrayHandle<vtkm::Id>& cellIds,
@@ -181,7 +181,7 @@ void GenerateRandomInput(const vtkm::cont::DataSet& ds,
     pcoords.GetPortalControl().Set(i, pc);
   }
 
-  vtkm::worklet::DispatcherMapTopology<ParametricToWorldCoordinates> dispatcher(
+  vtkm::worklet::DispatcherMapTopology<ParametricToWorldCoordinates, DeviceAdapter> dispatcher(
     ParametricToWorldCoordinates::MakeScatter(cellIds));
   dispatcher.Invoke(ds.GetCellSet(), ds.GetCoordinateSystem().GetData(), pcoords, wcoords);
 }
@@ -206,7 +206,8 @@ void TestCellLocator(const vtkm::Vec<vtkm::Id, DIMENSIONS>& dim,
   vtkm::cont::ArrayHandle<vtkm::Id> expCellIds;
   vtkm::cont::ArrayHandle<PointType> expPCoords;
   vtkm::cont::ArrayHandle<PointType> points;
-  GenerateRandomInput<DIMENSIONS>(ds, numberOfPoints, expCellIds, expPCoords, points);
+  GenerateRandomInput<DIMENSIONS, DeviceAdapter>(
+    ds, numberOfPoints, expCellIds, expPCoords, points);
 
   std::cout << "Finding cells for " << numberOfPoints << " points\n";
   vtkm::cont::ArrayHandle<vtkm::Id> cellIds;

vtkm/cont/testing/TestingPointLocatorUniformGrid.h

@@ -79,7 +79,7 @@ template <typename DeviceAdapter>
 class TestingPointLocatorUniformGrid
 {
 public:
-  using Algorithm = vtkm::cont::DeviceAdapterAlgorithm<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>;
+  using Algorithm = vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>;
   void TestTest() const
   {
     vtkm::Int32 nTrainingPoints = 1000;
@@ -99,7 +99,7 @@ public:
 
     vtkm::worklet::PointLocatorUniformGrid<vtkm::Float32> uniformGrid(
       { 0.0f, 0.0f, 0.0f }, { 10.0f, 10.0f, 10.0f }, { 5, 5, 5 });
-    uniformGrid.Build(coordi_Handle, VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
+    uniformGrid.Build(coordi_Handle, DeviceAdapter());
 
     std::vector<vtkm::Vec<vtkm::Float32, 3>> qcVec;
     for (vtkm::Int32 i = 0; i < nTestingPoint; i++)
@@ -112,13 +112,13 @@ public:
     vtkm::cont::ArrayHandle<vtkm::Float32> nnDis_Handle;
 
     uniformGrid.FindNearestPoint(
-      coordi_Handle, qc_Handle, nnId_Handle, nnDis_Handle, VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
+      coordi_Handle, qc_Handle, nnId_Handle, nnDis_Handle, DeviceAdapter());
 
     vtkm::cont::ArrayHandle<vtkm::Id> bfnnId_Handle;
     vtkm::cont::ArrayHandle<vtkm::Float32> bfnnDis_Handle;
     NearestNeighborSearchBruteForce3DWorklet nnsbf3dWorklet;
-    vtkm::worklet::DispatcherMapField<NearestNeighborSearchBruteForce3DWorklet> nnsbf3DDispatcher(
-      nnsbf3dWorklet);
+    vtkm::worklet::DispatcherMapField<NearestNeighborSearchBruteForce3DWorklet, DeviceAdapter>
+      nnsbf3DDispatcher(nnsbf3dWorklet);
     nnsbf3DDispatcher.Invoke(
       qc_Handle, vtkm::cont::make_ArrayHandle(coordi), bfnnId_Handle, bfnnDis_Handle);