From 1d20ae4f7bb071aec4666e459237f13f7167fa56 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 3 Apr 2019 16:28:31 -0400 Subject: [PATCH] Move DeviceAdapterTag to vtkm/cont --- benchmarking/BenchmarkAtomicArray.cxx | 2 +- benchmarking/Benchmarker.h | 2 +- vtkm/cont/Algorithm.h | 3 ++- vtkm/cont/ArrayHandleVirtual.h | 2 +- vtkm/cont/ArrayRangeCompute.h | 2 +- vtkm/cont/CMakeLists.txt | 1 + vtkm/cont/DeviceAdapter.h | 2 +- vtkm/cont/DeviceAdapterAlgorithm.h | 3 ++- vtkm/cont/{internal => }/DeviceAdapterTag.h | 6 +++--- vtkm/cont/ErrorBadDevice.cxx | 2 +- vtkm/cont/ErrorBadDevice.h | 2 +- vtkm/cont/Initialize.h | 2 +- vtkm/cont/RuntimeDeviceInformation.cxx | 2 +- vtkm/cont/RuntimeDeviceInformation.h | 2 +- vtkm/cont/RuntimeDeviceTracker.h | 2 +- vtkm/cont/TryExecute.h | 3 ++- vtkm/cont/VirtualObjectHandle.hxx | 2 +- vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h | 2 +- vtkm/cont/internal/ArrayManagerExecution.h | 2 +- vtkm/cont/internal/CMakeLists.txt | 1 - vtkm/cont/internal/DeviceAdapterDefaultSelection.h | 2 +- vtkm/cont/internal/DeviceAdapterError.h | 2 +- vtkm/cont/internal/DeviceAdapterTag.cxx | 2 +- vtkm/cont/internal/TransferInfo.h | 2 +- vtkm/cont/internal/VirtualObjectTransfer.h | 2 +- vtkm/cont/openmp/internal/DeviceAdapterTagOpenMP.h | 2 +- vtkm/cont/serial/internal/DeviceAdapterTagSerial.h | 2 +- vtkm/cont/tbb/internal/DeviceAdapterTagTBB.h | 2 +- vtkm/cont/testing/TestingImplicitFunction.h | 2 +- vtkm/filter/internal/ResolveFieldTypeAndExecute.h | 2 +- vtkm/filter/internal/ResolveFieldTypeAndMap.h | 2 +- vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx | 1 - vtkm/worklet/testing/UnitTestWaveletGenerator.cxx | 1 - vtkm/worklet/testing/UnitTestWorkletMapField.cxx | 1 - vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx | 1 - vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx | 1 - .../testing/UnitTestWorkletMapFieldWholeArrayAtomic.cxx | 1 - .../worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx | 2 +- vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx | 2 +- vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx | 2 +- vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx | 2 +- 41 files changed, 39 insertions(+), 42 deletions(-) rename vtkm/cont/{internal => }/DeviceAdapterTag.h (98%) diff --git a/benchmarking/BenchmarkAtomicArray.cxx b/benchmarking/BenchmarkAtomicArray.cxx index 1790d82fa..94502b6a4 100644 --- a/benchmarking/BenchmarkAtomicArray.cxx +++ b/benchmarking/BenchmarkAtomicArray.cxx @@ -22,9 +22,9 @@ #include #include +#include #include #include -#include #include diff --git a/benchmarking/Benchmarker.h b/benchmarking/Benchmarker.h index bfd88cf78..a0c132f47 100644 --- a/benchmarking/Benchmarker.h +++ b/benchmarking/Benchmarker.h @@ -23,8 +23,8 @@ #include #include +#include #include -#include #include #include diff --git a/vtkm/cont/Algorithm.h b/vtkm/cont/Algorithm.h index 7b86684b9..bb644c85b 100644 --- a/vtkm/cont/Algorithm.h +++ b/vtkm/cont/Algorithm.h @@ -22,10 +22,11 @@ #include +#include #include #include #include -#include + namespace vtkm { diff --git a/vtkm/cont/ArrayHandleVirtual.h b/vtkm/cont/ArrayHandleVirtual.h index fdf14770b..f4a46e39d 100644 --- a/vtkm/cont/ArrayHandleVirtual.h +++ b/vtkm/cont/ArrayHandleVirtual.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/vtkm/cont/ArrayRangeCompute.h b/vtkm/cont/ArrayRangeCompute.h index 9edb5153c..bc1ff979e 100644 --- a/vtkm/cont/ArrayRangeCompute.h +++ b/vtkm/cont/ArrayRangeCompute.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace vtkm { diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt index e4d0e1174..6543c9893 100644 --- a/vtkm/cont/CMakeLists.txt +++ b/vtkm/cont/CMakeLists.txt @@ -75,6 +75,7 @@ set(headers DeviceAdapter.h DeviceAdapterAlgorithm.h DeviceAdapterListTag.h + DeviceAdapterTag.h DynamicCellSet.h EnvironmentTracker.h Error.h diff --git a/vtkm/cont/DeviceAdapter.h b/vtkm/cont/DeviceAdapter.h index 86548f8b1..63abb8251 100644 --- a/vtkm/cont/DeviceAdapter.h +++ b/vtkm/cont/DeviceAdapter.h @@ -27,7 +27,7 @@ // clang-format off #include #include -#include +#include #include // clang-format on diff --git a/vtkm/cont/DeviceAdapterAlgorithm.h b/vtkm/cont/DeviceAdapterAlgorithm.h index 8c980bb0a..d2f8b4aaf 100644 --- a/vtkm/cont/DeviceAdapterAlgorithm.h +++ b/vtkm/cont/DeviceAdapterAlgorithm.h @@ -22,9 +22,10 @@ #include +#include #include #include -#include + #ifdef _WIN32 #include diff --git a/vtkm/cont/internal/DeviceAdapterTag.h b/vtkm/cont/DeviceAdapterTag.h similarity index 98% rename from vtkm/cont/internal/DeviceAdapterTag.h rename to vtkm/cont/DeviceAdapterTag.h index 7f09ffe47..9dc3576c0 100644 --- a/vtkm/cont/internal/DeviceAdapterTag.h +++ b/vtkm/cont/DeviceAdapterTag.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtk_m_cont_internal_DeviceAdapterTag_h -#define vtk_m_cont_internal_DeviceAdapterTag_h +#ifndef vtk_m_cont_DeviceAdapterTag_h +#define vtk_m_cont_DeviceAdapterTag_h #include #include @@ -162,4 +162,4 @@ VTKM_INVALID_DEVICE_ADAPTER(Undefined, VTKM_DEVICE_ADAPTER_UNDEFINED) !std::is_same::value, \ "Provided type is not a valid VTK-m device adapter tag.") -#endif //vtk_m_cont_internal_DeviceAdapterTag_h +#endif //vtk_m_cont_DeviceAdapterTag_h diff --git a/vtkm/cont/ErrorBadDevice.cxx b/vtkm/cont/ErrorBadDevice.cxx index 6b7e99124..9e51ca57d 100644 --- a/vtkm/cont/ErrorBadDevice.cxx +++ b/vtkm/cont/ErrorBadDevice.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ +#include #include -#include #include diff --git a/vtkm/cont/ErrorBadDevice.h b/vtkm/cont/ErrorBadDevice.h index eb480e53f..6119eaea3 100644 --- a/vtkm/cont/ErrorBadDevice.h +++ b/vtkm/cont/ErrorBadDevice.h @@ -22,7 +22,7 @@ #include -#include +#include #include namespace vtkm diff --git a/vtkm/cont/Initialize.h b/vtkm/cont/Initialize.h index cc06db6ff..08598632d 100644 --- a/vtkm/cont/Initialize.h +++ b/vtkm/cont/Initialize.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_Initialize_h #define vtk_m_cont_Initialize_h -#include +#include #include #include diff --git a/vtkm/cont/RuntimeDeviceInformation.cxx b/vtkm/cont/RuntimeDeviceInformation.cxx index 0e5bd0cd2..847ae4268 100644 --- a/vtkm/cont/RuntimeDeviceInformation.cxx +++ b/vtkm/cont/RuntimeDeviceInformation.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include //Bring in each device adapters runtime class #include diff --git a/vtkm/cont/RuntimeDeviceInformation.h b/vtkm/cont/RuntimeDeviceInformation.h index acb762546..9272d4919 100644 --- a/vtkm/cont/RuntimeDeviceInformation.h +++ b/vtkm/cont/RuntimeDeviceInformation.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_RuntimeDeviceInformation_h #define vtk_m_cont_RuntimeDeviceInformation_h -#include +#include #include namespace vtkm diff --git a/vtkm/cont/RuntimeDeviceTracker.h b/vtkm/cont/RuntimeDeviceTracker.h index 805b4df26..74c480b92 100644 --- a/vtkm/cont/RuntimeDeviceTracker.h +++ b/vtkm/cont/RuntimeDeviceTracker.h @@ -22,10 +22,10 @@ #include +#include #include #include #include -#include #include diff --git a/vtkm/cont/TryExecute.h b/vtkm/cont/TryExecute.h index 90fcf370a..e8de49e00 100644 --- a/vtkm/cont/TryExecute.h +++ b/vtkm/cont/TryExecute.h @@ -21,9 +21,10 @@ #define vtk_m_cont_TryExecute_h #include +#include #include #include -#include + namespace vtkm { diff --git a/vtkm/cont/VirtualObjectHandle.hxx b/vtkm/cont/VirtualObjectHandle.hxx index b35dd5751..81200c45c 100644 --- a/vtkm/cont/VirtualObjectHandle.hxx +++ b/vtkm/cont/VirtualObjectHandle.hxx @@ -23,8 +23,8 @@ #include #include +#include #include -#include #include #include diff --git a/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h b/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h index 0c2f8ea93..c3917800c 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterTagCuda.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_cuda_internal_DeviceAdapterTagCuda_h #define vtk_m_cont_cuda_internal_DeviceAdapterTagCuda_h -#include +#include //We always create the cuda tag when included, but we only mark it as //a valid tag when VTKM_CUDA is true. This is for easier development diff --git a/vtkm/cont/internal/ArrayManagerExecution.h b/vtkm/cont/internal/ArrayManagerExecution.h index 62f5e2cd9..131d29a24 100644 --- a/vtkm/cont/internal/ArrayManagerExecution.h +++ b/vtkm/cont/internal/ArrayManagerExecution.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_internal_ArrayManagerExecution_h #define vtk_m_cont_internal_ArrayManagerExecution_h -#include +#include namespace vtkm { diff --git a/vtkm/cont/internal/CMakeLists.txt b/vtkm/cont/internal/CMakeLists.txt index 080ca7221..ba338e8bf 100644 --- a/vtkm/cont/internal/CMakeLists.txt +++ b/vtkm/cont/internal/CMakeLists.txt @@ -34,7 +34,6 @@ set(headers DeviceAdapterDefaultSelection.h DeviceAdapterError.h DeviceAdapterListHelpers.h - DeviceAdapterTag.h DynamicTransform.h FunctorsGeneral.h IteratorFromArrayPortal.h diff --git a/vtkm/cont/internal/DeviceAdapterDefaultSelection.h b/vtkm/cont/internal/DeviceAdapterDefaultSelection.h index b5228f3fd..019be5265 100644 --- a/vtkm/cont/internal/DeviceAdapterDefaultSelection.h +++ b/vtkm/cont/internal/DeviceAdapterDefaultSelection.h @@ -24,7 +24,7 @@ #ifndef vtk_m_cont_internal_DeviceAdapterDefaultSelection_h #define vtk_m_cont_internal_DeviceAdapterDefaultSelection_h -#include +#include #include //----------------------------------------------------------------------------- diff --git a/vtkm/cont/internal/DeviceAdapterError.h b/vtkm/cont/internal/DeviceAdapterError.h index 383fc3762..b059c3846 100644 --- a/vtkm/cont/internal/DeviceAdapterError.h +++ b/vtkm/cont/internal/DeviceAdapterError.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_internal_DeviceAdapterError_h #define vtk_m_cont_internal_DeviceAdapterError_h -#include +#include /// This is an invalid DeviceAdapter. The point of this class is to include the /// header file to make this invalid class the default DeviceAdapter. From that diff --git a/vtkm/cont/internal/DeviceAdapterTag.cxx b/vtkm/cont/internal/DeviceAdapterTag.cxx index 631a0c496..2f39f20b9 100644 --- a/vtkm/cont/internal/DeviceAdapterTag.cxx +++ b/vtkm/cont/internal/DeviceAdapterTag.cxx @@ -18,7 +18,7 @@ // this software. //============================================================================ -#include +#include #include diff --git a/vtkm/cont/internal/TransferInfo.h b/vtkm/cont/internal/TransferInfo.h index 5669a7fc3..86880a7f4 100644 --- a/vtkm/cont/internal/TransferInfo.h +++ b/vtkm/cont/internal/TransferInfo.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/cont/internal/VirtualObjectTransfer.h b/vtkm/cont/internal/VirtualObjectTransfer.h index 283d808d0..49cf88013 100644 --- a/vtkm/cont/internal/VirtualObjectTransfer.h +++ b/vtkm/cont/internal/VirtualObjectTransfer.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/cont/openmp/internal/DeviceAdapterTagOpenMP.h b/vtkm/cont/openmp/internal/DeviceAdapterTagOpenMP.h index 9f6b50e2c..1e059d4f6 100644 --- a/vtkm/cont/openmp/internal/DeviceAdapterTagOpenMP.h +++ b/vtkm/cont/openmp/internal/DeviceAdapterTagOpenMP.h @@ -21,7 +21,7 @@ #ifndef vtk_m_cont_openmp_internal_DeviceAdapterTagOpenMP_h #define vtk_m_cont_openmp_internal_DeviceAdapterTagOpenMP_h -#include +#include #ifdef VTKM_ENABLE_OPENMP VTKM_VALID_DEVICE_ADAPTER(OpenMP, VTKM_DEVICE_ADAPTER_OPENMP) diff --git a/vtkm/cont/serial/internal/DeviceAdapterTagSerial.h b/vtkm/cont/serial/internal/DeviceAdapterTagSerial.h index e8f044539..7a7def7e2 100644 --- a/vtkm/cont/serial/internal/DeviceAdapterTagSerial.h +++ b/vtkm/cont/serial/internal/DeviceAdapterTagSerial.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_serial_internal_DeviceAdapterTagSerial_h #define vtk_m_cont_serial_internal_DeviceAdapterTagSerial_h -#include +#include VTKM_VALID_DEVICE_ADAPTER(Serial, VTKM_DEVICE_ADAPTER_SERIAL); diff --git a/vtkm/cont/tbb/internal/DeviceAdapterTagTBB.h b/vtkm/cont/tbb/internal/DeviceAdapterTagTBB.h index b9e39a62d..cc4d004d3 100644 --- a/vtkm/cont/tbb/internal/DeviceAdapterTagTBB.h +++ b/vtkm/cont/tbb/internal/DeviceAdapterTagTBB.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_tbb_internal_DeviceAdapterTagTBB_h #define vtk_m_cont_tbb_internal_DeviceAdapterTagTBB_h -#include +#include //We always create the tbb tag when included, but we only mark it as //a valid tag when VTKM_ENABLE_TBB is true. This is for easier development diff --git a/vtkm/cont/testing/TestingImplicitFunction.h b/vtkm/cont/testing/TestingImplicitFunction.h index da742470b..e5f3a6174 100644 --- a/vtkm/cont/testing/TestingImplicitFunction.h +++ b/vtkm/cont/testing/TestingImplicitFunction.h @@ -22,8 +22,8 @@ #include #include +#include #include -#include #include #include diff --git a/vtkm/filter/internal/ResolveFieldTypeAndExecute.h b/vtkm/filter/internal/ResolveFieldTypeAndExecute.h index 227ac34a7..3d74d2140 100644 --- a/vtkm/filter/internal/ResolveFieldTypeAndExecute.h +++ b/vtkm/filter/internal/ResolveFieldTypeAndExecute.h @@ -21,8 +21,8 @@ #define vtk_m_filter_internal_ResolveFieldTypeAndExecute_h #include +#include #include -#include #include #include diff --git a/vtkm/filter/internal/ResolveFieldTypeAndMap.h b/vtkm/filter/internal/ResolveFieldTypeAndMap.h index efd20dc12..8e14238e8 100644 --- a/vtkm/filter/internal/ResolveFieldTypeAndMap.h +++ b/vtkm/filter/internal/ResolveFieldTypeAndMap.h @@ -21,8 +21,8 @@ #define vtk_m_filter_internal_ResolveFieldTypeAndMap_h #include +#include #include -#include #include #include diff --git a/vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx b/vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx index 961166c13..9510e7a78 100644 --- a/vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx +++ b/vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/vtkm/worklet/testing/UnitTestWaveletGenerator.cxx b/vtkm/worklet/testing/UnitTestWaveletGenerator.cxx index 5ec595709..aacbd0105 100644 --- a/vtkm/worklet/testing/UnitTestWaveletGenerator.cxx +++ b/vtkm/worklet/testing/UnitTestWaveletGenerator.cxx @@ -21,7 +21,6 @@ #include #include -#include #include namespace detail diff --git a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx index 5b9a4339a..572c4755f 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx b/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx index 461bc6478..af0338797 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx index 655811a2d..9018225d1 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArrayAtomic.cxx b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArrayAtomic.cxx index 0df2800f2..6959c4c40 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArrayAtomic.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArrayAtomic.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx b/vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx index 99192cd94..6ab4ed574 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx index 4e36862b0..dcb1dd9c2 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx index dd836ff08..0d605705e 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx b/vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx index a8792dcc0..9eed58cf1 100644 --- a/vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include