Merge topic 'move_device_adapter_tag_to_vtkm_cont'

1d20ae4f7 Move DeviceAdapterTag to vtkm/cont Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1624
2024-09-16 17:22:55 +00:00 · 2019-04-05 12:03:43 +00:00 · 2019-04-05 12:03:43 +00:00 · 107edaff75
commit 107edaff75
parent 34dd533179 1d20ae4f7b
41 changed files with 39 additions and 42 deletions
--- a/benchmarking/BenchmarkAtomicArray.cxx
+++ b/benchmarking/BenchmarkAtomicArray.cxx
@ -22,9 +22,9 @@

 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/AtomicArray.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/RuntimeDeviceTracker.h>
 #include <vtkm/cont/Timer.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/exec/FunctorBase.h>

--- a/benchmarking/Benchmarker.h
+++ b/benchmarking/Benchmarker.h
@ -23,8 +23,8 @@

 #include <vtkm/ListTag.h>
 #include <vtkm/Math.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/TryExecute.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
 #include <vtkm/cont/testing/Testing.h>

 #include <algorithm>
--- a/vtkm/cont/Algorithm.h
+++ b/vtkm/cont/Algorithm.h
@ -22,10 +22,11 @@

 #include <vtkm/Types.h>

+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/ExecutionObjectBase.h>
 #include <vtkm/cont/TryExecute.h>
 #include <vtkm/cont/internal/ArrayManagerExecution.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+

 namespace vtkm
 {
--- a/vtkm/cont/ArrayHandleVirtual.h
+++ b/vtkm/cont/ArrayHandleVirtual.h
@ -24,7 +24,7 @@

 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #include <vtkm/cont/StorageVirtual.h>

--- a/vtkm/cont/ArrayRangeCompute.h
+++ b/vtkm/cont/ArrayRangeCompute.h
@ -27,7 +27,7 @@
 #include <vtkm/cont/ArrayHandleCompositeVector.h>
 #include <vtkm/cont/ArrayHandleUniformPointCoordinates.h>
 #include <vtkm/cont/ArrayHandleVirtualCoordinates.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 namespace vtkm
 {
--- 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
--- a/vtkm/cont/DeviceAdapter.h
+++ b/vtkm/cont/DeviceAdapter.h
@ -27,7 +27,7 @@
 // clang-format off
 #include <vtkm/cont/internal/DeviceAdapterDefaultSelection.h>
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/internal/ArrayManagerExecution.h>
 // clang-format on

--- a/vtkm/cont/DeviceAdapterAlgorithm.h
+++ b/vtkm/cont/DeviceAdapterAlgorithm.h
@ -22,9 +22,10 @@

 #include <vtkm/Types.h>

+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/Logging.h>
 #include <vtkm/cont/internal/ArrayManagerExecution.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+

 #ifdef _WIN32
 #include <sys/timeb.h>
--- a/vtkm/cont/internal/DeviceAdapterTag.h
+++ b/vtkm/cont/internal/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 <vtkm/StaticAssert.h>
 #include <vtkm/Types.h>
@ -162,4 +162,4 @@ VTKM_INVALID_DEVICE_ADAPTER(Undefined, VTKM_DEVICE_ADAPTER_UNDEFINED)
                  !std::is_same<vtkm::cont::DeviceAdapterId, tag>::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
--- a/vtkm/cont/ErrorBadDevice.cxx
+++ b/vtkm/cont/ErrorBadDevice.cxx
@ -18,8 +18,8 @@
 //  this software.
 //============================================================================

+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/ErrorBadDevice.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <string>

--- a/vtkm/cont/ErrorBadDevice.h
+++ b/vtkm/cont/ErrorBadDevice.h
@ -22,7 +22,7 @@

 #include <vtkm/cont/Error.h>

-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/vtkm_cont_export.h>

 namespace vtkm
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/vtkm_cont_export.h>
 #include <vtkm/internal/ExportMacros.h>

--- a/vtkm/cont/RuntimeDeviceInformation.cxx
+++ b/vtkm/cont/RuntimeDeviceInformation.cxx
@ -22,7 +22,7 @@
 #include <vtkm/ListTag.h>
 #include <vtkm/cont/DeviceAdapter.h>
 #include <vtkm/cont/DeviceAdapterListTag.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 //Bring in each device adapters runtime class
 #include <vtkm/cont/cuda/internal/DeviceAdapterRuntimeDetectorCuda.h>
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/internal/ExportMacros.h>

 namespace vtkm
--- a/vtkm/cont/RuntimeDeviceTracker.h
+++ b/vtkm/cont/RuntimeDeviceTracker.h
@ -22,10 +22,10 @@

 #include <vtkm/cont/vtkm_cont_export.h>

+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/ErrorBadAllocation.h>
 #include <vtkm/cont/ErrorBadDevice.h>
 #include <vtkm/cont/RuntimeDeviceInformation.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <memory>

--- a/vtkm/cont/TryExecute.h
+++ b/vtkm/cont/TryExecute.h
@ -21,9 +21,10 @@
 #define vtk_m_cont_TryExecute_h

 #include <vtkm/cont/DeviceAdapterListTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/Logging.h>
 #include <vtkm/cont/RuntimeDeviceTracker.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+

 namespace vtkm
 {
--- a/vtkm/cont/VirtualObjectHandle.hxx
+++ b/vtkm/cont/VirtualObjectHandle.hxx
@ -23,8 +23,8 @@
 #include <vtkm/cont/VirtualObjectHandle.h>

 #include <vtkm/cont/DeviceAdapterListTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/internal/DeviceAdapterListHelpers.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/cont/internal/VirtualObjectTransfer.h>
 #include <vtkm/cont/internal/VirtualObjectTransfer.hxx>
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 //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
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 namespace vtkm
 {
--- 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
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/internal/Configure.h>

 //-----------------------------------------------------------------------------
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 /// 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
--- a/vtkm/cont/internal/DeviceAdapterTag.cxx
+++ b/vtkm/cont/internal/DeviceAdapterTag.cxx
@ -18,7 +18,7 @@
 //  this software.
 //============================================================================

-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #include <vtkm/cont/RuntimeDeviceInformation.h>

--- a/vtkm/cont/internal/TransferInfo.h
+++ b/vtkm/cont/internal/TransferInfo.h
@ -23,7 +23,7 @@
 #include <vtkm/cont/vtkm_cont_export.h>

 #include <vtkm/Types.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/internal/ArrayPortalVirtual.h>

 #include <memory>
--- a/vtkm/cont/internal/VirtualObjectTransfer.h
+++ b/vtkm/cont/internal/VirtualObjectTransfer.h
@ -23,7 +23,7 @@
 #include <vtkm/cont/vtkm_cont_export.h>

 #include <vtkm/VirtualObjectBase.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #include <array>
 #include <memory>
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #ifdef VTKM_ENABLE_OPENMP
 VTKM_VALID_DEVICE_ADAPTER(OpenMP, VTKM_DEVICE_ADAPTER_OPENMP)
--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 VTKM_VALID_DEVICE_ADAPTER(Serial, VTKM_DEVICE_ADAPTER_SERIAL);

--- 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 <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 //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
--- a/vtkm/cont/testing/TestingImplicitFunction.h
+++ b/vtkm/cont/testing/TestingImplicitFunction.h
@ -22,8 +22,8 @@

 #include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/DeviceAdapterListTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/ImplicitFunctionHandle.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
 #include <vtkm/cont/testing/MakeTestDataSet.h>
 #include <vtkm/cont/testing/Testing.h>

--- a/vtkm/filter/internal/ResolveFieldTypeAndExecute.h
+++ b/vtkm/filter/internal/ResolveFieldTypeAndExecute.h
@ -21,8 +21,8 @@
 #define vtk_m_filter_internal_ResolveFieldTypeAndExecute_h

 #include <vtkm/cont/DataSet.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/TryExecute.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/filter/FieldMetadata.h>
 #include <vtkm/filter/PolicyBase.h>
--- a/vtkm/filter/internal/ResolveFieldTypeAndMap.h
+++ b/vtkm/filter/internal/ResolveFieldTypeAndMap.h
@ -21,8 +21,8 @@
 #define vtk_m_filter_internal_ResolveFieldTypeAndMap_h

 #include <vtkm/cont/DataSet.h>
+#include <vtkm/cont/DeviceAdapterTag.h>
 #include <vtkm/cont/TryExecute.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/filter/FieldMetadata.h>
 #include <vtkm/filter/PolicyBase.h>
--- a/vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx
+++ b/vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx
@ -23,7 +23,6 @@
 #include <vtkm/cont/CellLocatorBoundingIntervalHierarchy.h>
 #include <vtkm/cont/DataSetBuilderUniform.h>
 #include <vtkm/cont/Timer.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
 #include <vtkm/cont/testing/Testing.h>
 #include <vtkm/exec/CellInterpolate.h>
 #include <vtkm/exec/ParametricCoordinates.h>
--- a/vtkm/worklet/testing/UnitTestWaveletGenerator.cxx
+++ b/vtkm/worklet/testing/UnitTestWaveletGenerator.cxx
@ -21,7 +21,6 @@
 #include <vtkm/worklet/WaveletGenerator.h>

 #include <vtkm/cont/Timer.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
 #include <vtkm/cont/testing/Testing.h>

 namespace detail
--- a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx
@ -21,7 +21,6 @@
 #include <vtkm/cont/ArrayHandle.h>

 #include <vtkm/cont/VariantArrayHandle.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/WorkletMapField.h>
--- a/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx
@ -21,7 +21,6 @@
 #include <vtkm/cont/ArrayHandleIndex.h>
 #include <vtkm/cont/ExecutionObjectBase.h>
 #include <vtkm/cont/VariantArrayHandle.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/WorkletMapField.h>
--- a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx
@ -20,7 +20,6 @@
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
 #include <vtkm/cont/VariantArrayHandle.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/WorkletMapField.h>
--- a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArrayAtomic.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArrayAtomic.cxx
@ -20,7 +20,6 @@
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
 #include <vtkm/cont/VariantArrayHandle.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>

 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/WorkletMapField.h>
--- a/vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx
@ -28,7 +28,7 @@
 #include <vtkm/VecAxisAlignedPointCoordinates.h>

 #include <vtkm/cont/DataSet.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #include <vtkm/cont/testing/MakeTestDataSet.h>
 #include <vtkm/cont/testing/Testing.h>
--- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx
@ -27,7 +27,7 @@
 #include <vtkm/Math.h>

 #include <vtkm/cont/DataSet.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #include <vtkm/cont/testing/MakeTestDataSet.h>
 #include <vtkm/cont/testing/Testing.h>
--- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx
@ -27,7 +27,7 @@
 #include <vtkm/Math.h>

 #include <vtkm/cont/DataSet.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #include <vtkm/cont/testing/MakeTestDataSet.h>
 #include <vtkm/cont/testing/Testing.h>
--- a/vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx
+++ b/vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx
@ -26,7 +26,7 @@
 #include <vtkm/worklet/Keys.h>

 #include <vtkm/cont/ArrayCopy.h>
-#include <vtkm/cont/internal/DeviceAdapterTag.h>
+#include <vtkm/cont/DeviceAdapterTag.h>

 #include <vtkm/cont/testing/Testing.h>