Merge topic 'deviceAdapter_serial_separate_directory'

0f58d6fc Add vtkm/cont/serial directory for the serial backend.
f7a9bbe0 All cuda / tbb unit tests follow the same naming pattern.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !569

examples/dynamic_dispatcher/main.cxx

@@ -47,6 +47,7 @@ struct ExampleFieldWorklet : public vtkm::worklet::WorkletMapField
     out_vec = vec * scalar1;
     out_scalar1 = static_cast<U>(scalar1 + scalar2);
     out_scalar2 = scalar2;
+    std::cout << "hello world" << std::endl;
   }
 
   template<typename T, typename U, typename V, typename W, typename X, typename Y>
@@ -68,9 +69,9 @@ int main(int argc, char** argv)
   (void)argc;
   (void)argv;
 
-  std::vector< vtkm::Vec<vtkm::Float32, 3> > inputVec;
-  std::vector< vtkm::Int32 > inputScalar1;
-  std::vector< vtkm::Float64 > inputScalar2;
+  std::vector< vtkm::Vec<vtkm::Float32, 3> > inputVec(10);
+  std::vector< vtkm::Int32 > inputScalar1(10);
+  std::vector< vtkm::Float64 > inputScalar2(10);
 
   vtkm::cont::ArrayHandle< vtkm::Vec<vtkm::Float32, 3> > handleV =
     vtkm::cont::make_ArrayHandle(inputVec);

examples/multi_backend/MultiBackend.cxx

@@ -28,7 +28,7 @@
 
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/TryExecute.h>
 
 typedef vtkm::Vec< vtkm::Float32, 3 > FloatVec3;

vtkm/cont/CMakeLists.txt

@@ -52,7 +52,6 @@ set(headers
   DeviceAdapter.h
   DeviceAdapterAlgorithm.h
   DeviceAdapterListTag.h
-  DeviceAdapterSerial.h
   DynamicArrayHandle.h
   DynamicCellSet.h
   Error.h
@@ -79,6 +78,7 @@ add_subdirectory(arg)
 
 vtkm_declare_headers(${impl_headers} ${headers})
 
+add_subdirectory(serial)
 add_subdirectory(cuda)
 add_subdirectory(tbb)
 

vtkm/cont/DataSetBuilderRectilinear.h

@@ -24,7 +24,7 @@
 #include <vtkm/cont/ArrayPortalToIterators.h>
 #include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 namespace vtkm {
 namespace cont {

vtkm/cont/DeviceAdapterAlgorithm.h

@@ -566,7 +566,7 @@ class DeviceAdapterAtomicArrayImplementation;
 // need.
 
 #if VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_SERIAL
-#include <vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h>
+#include <vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h>
 #elif VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_CUDA
 #include <vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h>
 // #elif VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_OPENMP

vtkm/cont/DeviceAdapterListTag.h

@@ -27,7 +27,7 @@
 
 #include <vtkm/ListTag.h>
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
 

vtkm/cont/arg/testing/UnitTestTransportArrayIn.cxx

@@ -23,7 +23,7 @@
 #include <vtkm/exec/FunctorBase.h>
 
 #include <vtkm/cont/ArrayHandle.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/testing/Testing.h>
 

vtkm/cont/arg/testing/UnitTestTransportArrayOut.cxx

@@ -23,7 +23,7 @@
 #include <vtkm/exec/FunctorBase.h>
 
 #include <vtkm/cont/ArrayHandle.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/testing/Testing.h>
 

vtkm/cont/arg/testing/UnitTestTransportExecObject.cxx

@@ -23,7 +23,7 @@
 #include <vtkm/exec/ExecutionObjectBase.h>
 #include <vtkm/exec/FunctorBase.h>
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/testing/Testing.h>
 

vtkm/cont/cuda/testing/CMakeLists.txt

@@ -19,12 +19,12 @@
 ##============================================================================
 
 set(unit_tests
-  UnitTestComputeRangeCuda.cu
   UnitTestCudaArrayHandle.cu
   UnitTestCudaArrayHandleFancy.cu
+  UnitTestCudaComputeRange.cu
   UnitTestCudaDataSetExplicit.cu
   UnitTestCudaDataSetSingleType.cu
+  UnitTestCudaDeviceAdapter.cu
   UnitTestCudaMath.cu
-  UnitTestDeviceAdapterCuda.cu
   )
 vtkm_unit_tests(CUDA SOURCES ${unit_tests})

vtkm/cont/cuda/testing/UnitTestCudaComputeRange.cu

@@ -22,7 +22,7 @@
 #include <vtkm/cont/cuda/internal/testing/Testing.h>
 #include <vtkm/cont/testing/TestingComputeRange.h>
 
-int UnitTestComputeRangeCuda(int, char *[])
+int UnitTestCudaComputeRange(int, char *[])
 {
   int result = vtkm::cont::testing::TestingComputeRange
       <vtkm::cont::DeviceAdapterTagCuda>::Run();

vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu

@@ -28,7 +28,7 @@
 #include <vtkm/cont/testing/TestingDeviceAdapter.h>
 #include <vtkm/cont/cuda/internal/testing/Testing.h>
 
-int UnitTestDeviceAdapterCuda(int, char *[])
+int UnitTestCudaDeviceAdapter(int, char *[])
 {
   int result =  vtkm::cont::testing::TestingDeviceAdapter
       <vtkm::cont::DeviceAdapterTagCuda>::Run();

vtkm/cont/internal/ArrayManagerExecution.h

@@ -132,7 +132,7 @@ public:
   ///
   template <class IteratorTypeControl>
   VTKM_CONT_EXPORT void CopyInto(IteratorTypeControl dest) const;
-  
+
   /// \brief Reduces the size of the array without changing its values.
   ///
   /// This method allows you to resize the array without reallocating it. The
@@ -166,7 +166,7 @@ public:
 // need.
 
 #if VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_SERIAL
-#include <vtkm/cont/internal/ArrayManagerExecutionSerial.h>
+#include <vtkm/cont/serial/internal/ArrayManagerExecutionSerial.h>
 #elif VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_CUDA
 #include <vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h>
 // #elif VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_OPENMP

vtkm/cont/internal/CMakeLists.txt

@@ -21,17 +21,14 @@
 set(headers
   ArrayHandleExecutionManager.h
   ArrayManagerExecution.h
-  ArrayManagerExecutionSerial.h
   ArrayManagerExecutionShareWithControl.h
   ArrayPortalFromIterators.h
   ArrayPortalShrink.h
   ArrayTransfer.h
   ConnectivityExplicitInternals.h
   DeviceAdapterAlgorithmGeneral.h
-  DeviceAdapterAlgorithmSerial.h
   DeviceAdapterError.h
   DeviceAdapterTag.h
-  DeviceAdapterTagSerial.h
   DynamicTransform.h
   FunctorsGeneral.h
   IteratorFromArrayPortal.h

vtkm/cont/internal/DeviceAdapterTag.h

@@ -128,7 +128,7 @@ struct DeviceAdapterTagCheck
 //-----------------------------------------------------------------------------
 #if VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_SERIAL
 
-#include <vtkm/cont/internal/DeviceAdapterTagSerial.h>
+#include <vtkm/cont/serial/internal/DeviceAdapterTagSerial.h>
 #define VTKM_DEFAULT_DEVICE_ADAPTER_TAG ::vtkm::cont::DeviceAdapterTagSerial
 
 #elif VTKM_DEVICE_ADAPTER == VTKM_DEVICE_ADAPTER_CUDA

vtkm/cont/internal/RuntimeDeviceTracker.h

@@ -24,7 +24,7 @@
 #include <vtkm/cont/RuntimeDeviceInformation.h>
 #include <vtkm/cont/DeviceAdapter.h>
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
 

vtkm/cont/serial/CMakeLists.txt

@@ -0,0 +1,28 @@
+##============================================================================
+##  Copyright (c) Kitware, Inc.
+##  All rights reserved.
+##  See LICENSE.txt for details.
+##  This software is distributed WITHOUT ANY WARRANTY; without even
+##  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+##  PURPOSE.  See the above copyright notice for more information.
+##
+##  Copyright 2014 Sandia Corporation.
+##  Copyright 2014 UT-Battelle, LLC.
+##  Copyright 2014 Los Alamos National Security.
+##
+##  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+##  the U.S. Government retains certain rights in this software.
+##
+##  Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
+##  Laboratory (LANL), the U.S. Government retains certain rights in
+##  this software.
+##============================================================================
+
+set(headers
+  DeviceAdapterSerial.h
+  )
+
+add_subdirectory(internal)
+
+vtkm_declare_headers(${headers})
+

vtkm/cont/serial/DeviceAdapterSerial.h

@@ -17,11 +17,11 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_cont_DeviceAdapterSerial_h
-#define vtk_m_cont_DeviceAdapterSerial_h
+#ifndef vtk_m_cont_serial_DeviceAdapterSerial_h
+#define vtk_m_cont_serial_DeviceAdapterSerial_h
 
-#include <vtkm/cont/internal/DeviceAdapterTagSerial.h>
-#include <vtkm/cont/internal/ArrayManagerExecutionSerial.h>
-#include <vtkm/cont/internal/DeviceAdapterAlgorithmSerial.h>
+#include <vtkm/cont/serial/internal/DeviceAdapterTagSerial.h>
+#include <vtkm/cont/serial/internal/ArrayManagerExecutionSerial.h>
+#include <vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h>
 
-#endif //vtk_m_cont_DeviceAdapterSerial_h
+#endif //vtk_m_cont_serial_DeviceAdapterSerial_h

vtkm/cont/serial/internal/ArrayManagerExecutionSerial.h

@@ -17,12 +17,12 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_cont_internal_ArrayManagerExecutionSerial_h
-#define vtk_m_cont_internal_ArrayManagerExecutionSerial_h
+#ifndef vtk_m_cont_serial_internal_ArrayManagerExecutionSerial_h
+#define vtk_m_cont_serial_internal_ArrayManagerExecutionSerial_h
 
 #include <vtkm/cont/internal/ArrayManagerExecution.h>
 #include <vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h>
-#include <vtkm/cont/internal/DeviceAdapterTagSerial.h>
+#include <vtkm/cont/serial/internal/DeviceAdapterTagSerial.h>
 
 namespace vtkm {
 namespace cont {
@@ -49,4 +49,4 @@ public:
 }
 } // namespace vtkm::cont::internal
 
-#endif //vtk_m_cont_internal_ArrayManagerExecutionSerial_h
+#endif //vtk_m_cont_serial_internal_ArrayManagerExecutionSerial_h

vtkm/cont/serial/internal/CMakeLists.txt

@@ -0,0 +1,27 @@
+##============================================================================
+##  Copyright (c) Kitware, Inc.
+##  All rights reserved.
+##  See LICENSE.txt for details.
+##  This software is distributed WITHOUT ANY WARRANTY; without even
+##  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+##  PURPOSE.  See the above copyright notice for more information.
+##
+##  Copyright 2014 Sandia Corporation.
+##  Copyright 2014 UT-Battelle, LLC.
+##  Copyright 2014 Los Alamos National Security.
+##
+##  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+##  the U.S. Government retains certain rights in this software.
+##
+##  Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
+##  Laboratory (LANL), the U.S. Government retains certain rights in
+##  this software.
+##============================================================================
+
+set(headers
+  ArrayManagerExecutionSerial.h
+  DeviceAdapterAlgorithmSerial.h
+  DeviceAdapterTagSerial.h
+  )
+
+vtkm_declare_headers(${headers})

vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h

@@ -17,8 +17,8 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_cont_internal_DeviceAdapterAlgorithmSerial_h
-#define vtk_m_cont_internal_DeviceAdapterAlgorithmSerial_h
+#ifndef vtk_m_cont_serial_internal_DeviceAdapterAlgorithmSerial_h
+#define vtk_m_cont_serial_internal_DeviceAdapterAlgorithmSerial_h
 
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ArrayHandleZip.h>
@@ -26,7 +26,7 @@
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>
 #include <vtkm/cont/ErrorExecution.h>
 #include <vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h>
-#include <vtkm/cont/internal/DeviceAdapterTagSerial.h>
+#include <vtkm/cont/serial/internal/DeviceAdapterTagSerial.h>
 
 #include <vtkm/BinaryOperators.h>
 
@@ -265,8 +265,7 @@ private:
 
 public:
   template<class Functor>
-  VTKM_CONT_EXPORT static void Schedule(Functor functor,
-                                        vtkm::Id numInstances)
+  VTKM_CONT_EXPORT static void Schedule(Functor functor, vtkm::Id numInstances)
   {
     const vtkm::Id MESSAGE_SIZE = 1024;
     char errorString[MESSAGE_SIZE];
@@ -293,7 +292,6 @@ VTKM_VECTORIZATION_IN_LOOP
     }
   }
 
-public:
   template<class Functor>
   VTKM_CONT_EXPORT
   static void Schedule(Functor functor, vtkm::Id3 rangeMax)
@@ -307,7 +305,6 @@ public:
     functor.SetErrorMessageBuffer(errorMessage);
 
     DeviceAdapterAlgorithm<Device>::ScheduleKernel<Functor> kernel(functor);
-
     for(vtkm::Id k=0; k < rangeMax[2]; ++k)
       {
       for(vtkm::Id j=0; j < rangeMax[1]; ++j)
@@ -444,4 +441,4 @@ public:
 }
 } // namespace vtkm::cont
 
-#endif //vtk_m_cont_internal_DeviceAdapterAlgorithmSerial_h
+#endif //vtk_m_cont_serial_internal_DeviceAdapterAlgorithmSerial_h

vtkm/cont/serial/internal/DeviceAdapterTagSerial.h

@@ -17,11 +17,11 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_cont_internal_DeviceAdapterTagSerial_h
-#define vtk_m_cont_internal_DeviceAdapterTagSerial_h
+#ifndef vtk_m_cont_serial_internal_DeviceAdapterTagSerial_h
+#define vtk_m_cont_serial_internal_DeviceAdapterTagSerial_h
 
 #include <vtkm/cont/internal/DeviceAdapterTag.h>
 
 VTKM_VALID_DEVICE_ADAPTER(Serial, VTKM_DEVICE_ADAPTER_SERIAL);
 
-#endif //vtk_m_cont_internal_DeviceAdapterTagSerial_h
+#endif //vtk_m_cont_serial_internal_DeviceAdapterTagSerial_h

vtkm/cont/serial/testing/CMakeLists.txt

@@ -0,0 +1,29 @@
+##============================================================================
+##  Copyright (c) Kitware, Inc.
+##  All rights reserved.
+##  See LICENSE.txt for details.
+##  This software is distributed WITHOUT ANY WARRANTY; without even
+##  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+##  PURPOSE.  See the above copyright notice for more information.
+##
+##  Copyright 2014 Sandia Corporation.
+##  Copyright 2014 UT-Battelle, LLC.
+##  Copyright 2014 Los Alamos National Security.
+##
+##  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+##  the U.S. Government retains certain rights in this software.
+##
+##  Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
+##  Laboratory (LANL), the U.S. Government retains certain rights in
+##  this software.
+##============================================================================
+
+set(unit_tests
+  UnitTestSerialArrayHandle.cxx
+  UnitTestSerialArrayHandleFancy.cxx
+  UnitTestSerialComputeRange.cxx
+  UnitTestSerialDataSetExplicit.cxx
+  UnitTestSerialDataSetSingleType.cxx
+  UnitTestSerialDeviceAdapter.cxx
+  )
+vtkm_unit_tests(TBB SOURCES ${unit_tests})

vtkm/cont/serial/testing/UnitTestSerialArrayHandle.cxx

@@ -23,10 +23,10 @@
 // for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/testing/TestingArrayHandles.h>
 
-int UnitTestArrayHandle(int, char *[])
+int UnitTestSerialArrayHandle(int, char *[])
 {
 return vtkm::cont::testing::TestingArrayHandles
          <vtkm::cont::DeviceAdapterTagSerial>::Run();

vtkm/cont/serial/testing/UnitTestSerialArrayHandleFancy.cxx

@@ -25,12 +25,12 @@
 // for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/testing/TestingFancyArrayHandles.h>
 
 
-int UnitTestArrayHandleFancy(int, char *[])
+int UnitTestSerialArrayHandleFancy(int, char *[])
 {
   return vtkm::cont::testing::TestingFancyArrayHandles
          <vtkm::cont::DeviceAdapterTagSerial>::Run();

vtkm/cont/serial/testing/UnitTestSerialComputeRange.cxx

@@ -23,11 +23,11 @@
 // for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/testing/TestingComputeRange.h>
 
-int UnitTestComputeRangeSerial(int, char *[])
+int UnitTestSerialComputeRange(int, char *[])
 {
   return vtkm::cont::testing::TestingComputeRange
       <vtkm::cont::DeviceAdapterTagSerial>::Run();

vtkm/cont/serial/testing/UnitTestSerialDataSetExplicit.cxx

@@ -23,10 +23,10 @@
 // for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/testing/TestingDataSetExplicit.h>
 
-int UnitTestDataSetExplicit(int, char *[])
+int UnitTestSerialDataSetExplicit(int, char *[])
 {
   return vtkm::cont::testing::TestingDataSetExplicit
          <vtkm::cont::DeviceAdapterTagSerial>::Run();

vtkm/cont/serial/testing/UnitTestSerialDataSetSingleType.cxx

@@ -23,10 +23,10 @@
 // for a part of an operation where the TBB device was specified.
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/testing/TestingDataSetSingleType.h>
 
-int UnitTestDataSetSingleType(int, char *[])
+int UnitTestSerialDataSetSingleType(int, char *[])
 {
   return vtkm::cont::testing::TestingDataSetSingleType
          <vtkm::cont::DeviceAdapterTagSerial>::Run();

vtkm/cont/serial/testing/UnitTestSerialDeviceAdapter.cxx

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

vtkm/cont/tbb/testing/CMakeLists.txt

@@ -19,11 +19,11 @@
 ##============================================================================
 
 set(unit_tests
-  UnitTestComputeRangeTBB.cxx
-  UnitTestDataSetExplicitTBB.cxx
-  UnitTestDataSetSingleTypeTBB.cxx
-  UnitTestDeviceAdapterTBB.cxx
   UnitTestTBBArrayHandle.cxx
   UnitTestTBBArrayHandleFancy.cxx
+  UnitTestTBBComputeRange.cxx
+  UnitTestTBBDataSetExplicit.cxx
+  UnitTestTBBDataSetSingleType.cxx
+  UnitTestTBBDeviceAdapter.cxx
   )
 vtkm_unit_tests(TBB SOURCES ${unit_tests})

vtkm/cont/tbb/testing/UnitTestTBBComputeRange.cxx

@@ -22,7 +22,7 @@
 
 #include <vtkm/cont/testing/TestingComputeRange.h>
 
-int UnitTestComputeRangeTBB(int, char *[])
+int UnitTestTBBComputeRange(int, char *[])
 {
   return vtkm::cont::testing::TestingComputeRange
       <vtkm::cont::DeviceAdapterTagTBB>::Run();

vtkm/cont/tbb/testing/UnitTestTBBDataSetExplicit.cxx

@@ -22,7 +22,7 @@
 
 #include <vtkm/cont/testing/TestingDataSetExplicit.h>
 
-int UnitTestDataSetExplicitTBB(int, char *[])
+int UnitTestTBBDataSetExplicit(int, char *[])
 {
   return vtkm::cont::testing::TestingDataSetExplicit
       <vtkm::cont::DeviceAdapterTagTBB>::Run();

vtkm/cont/tbb/testing/UnitTestTBBDataSetSingleType.cxx

@@ -22,7 +22,7 @@
 
 #include <vtkm/cont/testing/TestingDataSetSingleType.h>
 
-int UnitTestDataSetSingleTypeTBB(int, char *[])
+int UnitTestTBBDataSetSingleType(int, char *[])
 {
   return vtkm::cont::testing::TestingDataSetSingleType
       <vtkm::cont::DeviceAdapterTagTBB>::Run();

vtkm/cont/tbb/testing/UnitTestTBBDeviceAdapter.cxx

@@ -24,7 +24,7 @@
 
 #include <vtkm/cont/testing/TestingDeviceAdapter.h>
 
-int UnitTestDeviceAdapterTBB(int, char *[])
+int UnitTestTBBDeviceAdapter(int, char *[])
 {
   return vtkm::cont::testing::TestingDeviceAdapter
       <vtkm::cont::DeviceAdapterTagTBB>::Run();

vtkm/cont/testing/CMakeLists.txt

@@ -33,11 +33,9 @@ set(headers
 vtkm_declare_headers(${headers})
 
 set(unit_tests
-  UnitTestArrayHandle.cxx
   UnitTestArrayHandleCartesianProduct.cxx
   UnitTestArrayHandleCompositeVector.cxx
   UnitTestArrayHandleCounting.cxx
-  UnitTestArrayHandleFancy.cxx
   UnitTestArrayHandleImplicit.cxx
   UnitTestArrayHandleIndex.cxx
   UnitTestArrayHandlePermutation.cxx
@@ -46,18 +44,14 @@ set(unit_tests
   UnitTestArrayHandleConcatenate.cxx
   UnitTestArrayPortalToIterators.cxx
   UnitTestContTesting.cxx
-  UnitTestComputeRangeSerial.cxx
   UnitTestDataSetBuilderExplicit.cxx
   UnitTestDataSetBuilderRectilinear.cxx
   UnitTestDataSetBuilderUniform.cxx
-  UnitTestDataSetRectilinear.cxx
-  UnitTestDataSetExplicit.cxx
-  UnitTestDataSetSingleType.cxx
   UnitTestDataSetPermutation.cxx
+  UnitTestDataSetRectilinear.cxx
   UnitTestDataSetUniform.cxx
   UnitTestDeviceAdapterAlgorithmDependency.cxx
   UnitTestDeviceAdapterAlgorithmGeneral.cxx
-  UnitTestDeviceAdapterSerial.cxx
   UnitTestDynamicArrayHandle.cxx
   UnitTestDynamicCellSet.cxx
   UnitTestRuntimeDeviceInformation.cxx

vtkm/cont/testing/TestingArrayHandles.h

@@ -26,7 +26,7 @@
 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/WorkletMapField.h>
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/testing/Testing.h>
 
 #include <algorithm>

vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx

@@ -29,7 +29,7 @@
 
 #include <vtkm/cont/ArrayHandleConstant.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/StorageBasic.h>
 
 #include <vtkm/cont/testing/Testing.h>

vtkm/cont/testing/UnitTestArrayHandleImplicit.cxx

@@ -22,7 +22,7 @@
 
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ArrayHandleImplicit.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/VecTraits.h>
 

vtkm/cont/testing/UnitTestDataSetPermutation.cxx

@@ -22,7 +22,7 @@
 #include <vtkm/cont/CellSetSingleType.h>
 #include <vtkm/cont/CellSetPermutation.h>
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/testing/Testing.h>
 #include <vtkm/cont/testing/MakeTestDataSet.h>

vtkm/cont/testing/UnitTestDataSetRectilinear.cxx

@@ -22,7 +22,7 @@
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/exec/ConnectivityStructured.h>
 

vtkm/cont/testing/UnitTestDataSetUniform.cxx

@@ -22,7 +22,7 @@
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/exec/ConnectivityStructured.h>
 

vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmDependency.cxx

@@ -32,7 +32,7 @@
 
 // Important for this test!
 //This file must be included after ArrayHandle.h
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 namespace {
 

vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx

@@ -28,7 +28,7 @@
 
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h>
 
 #include <vtkm/cont/testing/TestingDeviceAdapter.h>

vtkm/cont/testing/UnitTestRuntimeDeviceInformation.cxx

@@ -23,7 +23,7 @@
 //include all backends
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
 #include <vtkm/cont/tbb/DeviceAdapterTBB.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/testing/Testing.h>
 

vtkm/cont/testing/UnitTestTryExecute.cxx

@@ -21,7 +21,7 @@
 #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR
 
 #include <vtkm/cont/ArrayHandle.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/TryExecute.h>
 
 #include <vtkm/cont/internal/DeviceAdapterError.h>

vtkm/interop/testing/UnitTestTransferToOpenGL.cxx

@@ -20,7 +20,7 @@
 
 
 //This sets up testing with the default device adapter and array container
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/interop/testing/TestingOpenGLInterop.h>
 
 int UnitTestTransferToOpenGL(int, char *[])

vtkm/rendering/raytracing/BoundingVolumeHierarchy.h

@@ -27,7 +27,7 @@
 #include <vtkm/exec/ExecutionWholeArray.h>
 #include <vtkm/Math.h>
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 #include <vtkm/cont/testing/Testing.h>
 #include <vtkm/cont/Timer.h>
 #include <vtkm/exec/AtomicArray.h>

vtkm/testing/UnitTestImplicitFunctions.cxx

@@ -21,7 +21,7 @@
 //=============================================================================
 
 #include <vtkm/testing/TestingImplicitFunctions.h>
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 int UnitTestImplicitFunctions(int, char *[])
 {

vtkm/testing/UnitTestMath.cxx

@@ -22,7 +22,7 @@
 
 #include <vtkm/testing/TestingMath.h>
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 int UnitTestMath(int, char *[])
 {

vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx

@@ -20,7 +20,7 @@
 
 #include <vtkm/worklet/internal/DispatcherBase.h>
 
-#include <vtkm/cont/DeviceAdapterSerial.h>
+#include <vtkm/cont/serial/DeviceAdapterSerial.h>
 
 #include <vtkm/cont/arg/ControlSignatureTagBase.h>