VTK-m once again uses consistent include style

2024-09-08 13:23:51 +00:00 · 2019-03-28 13:29:24 -04:00 · 2019-03-28 13:29:24 -04:00 · b9e0e541b8
commit b9e0e541b8
parent 069923d49d
28 changed files with 57 additions and 64 deletions
--- a/vtkm/Geometry.h
+++ b/vtkm/Geometry.h
@ -420,6 +420,6 @@ VTKM_EXEC_CONT vtkm::Sphere<CoordType, 3> make_SphereFrom4Points(

 } // namespace vtkm

-#include "vtkm/Geometry.hxx"
+#include <vtkm/Geometry.hxx>

 #endif // vtk_m_Geometry_h
--- a/vtkm/cont/Field.cxx
+++ b/vtkm/cont/Field.cxx
@ -18,7 +18,7 @@
 //  this software.
 //============================================================================

-#include "Field.h"
+#include <vtkm/cont/Field.h>

 namespace vtkm
 {
--- a/vtkm/cont/StorageVirtual.cxx
+++ b/vtkm/cont/StorageVirtual.cxx
@ -18,7 +18,7 @@
 //  this software.
 //============================================================================
 #define vtk_m_cont_StorageVirtual_cxx
-#include "StorageVirtual.h"
+#include <vtkm/cont/StorageVirtual.h>

 #include <vtkm/cont/internal/DeviceAdapterError.h>

--- a/vtkm/cont/cuda/internal/DeviceAdapterRuntimeDetectorCuda.cu
+++ b/vtkm/cont/cuda/internal/DeviceAdapterRuntimeDetectorCuda.cu
@ -17,4 +17,4 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#include "DeviceAdapterRuntimeDetectorCuda.cxx"
+#include <vtkm/cont/cuda/internal/DeviceAdapterRuntimeDetectorCuda.cxx>
--- a/vtkm/cont/internal/DynamicTransform.h
+++ b/vtkm/cont/internal/DynamicTransform.h
@ -20,7 +20,7 @@
 #ifndef vtk_m_cont_internal_DynamicTransform_h
 #define vtk_m_cont_internal_DynamicTransform_h

-#include "vtkm/internal/IndexTag.h"
+#include <vtkm/internal/IndexTag.h>

 #include <utility>

--- a/vtkm/cont/internal/testing/UnitTestDynamicTransform.cxx
+++ b/vtkm/cont/internal/testing/UnitTestDynamicTransform.cxx
@ -18,15 +18,15 @@
 //  this software.
 //============================================================================

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

-#include "vtkm/cont/ArrayHandle.h"
-#include "vtkm/cont/DynamicCellSet.h"
-#include "vtkm/cont/VariantArrayHandle.h"
+#include <vtkm/cont/ArrayHandle.h>
+#include <vtkm/cont/DynamicCellSet.h>
+#include <vtkm/cont/VariantArrayHandle.h>

-#include "vtkm/internal/FunctionInterface.h"
+#include <vtkm/internal/FunctionInterface.h>

-#include "vtkm/cont/testing/Testing.h"
+#include <vtkm/cont/testing/Testing.h>

 namespace vtkm
 {
--- a/vtkm/exec/CellMeasure.h
+++ b/vtkm/exec/CellMeasure.h
@ -23,11 +23,11 @@
 * Functions that provide integral measures over cells.
 */

-#include "vtkm/CellShape.h"
-#include "vtkm/CellTraits.h"
-#include "vtkm/VecTraits.h"
-#include "vtkm/VectorAnalysis.h"
-#include "vtkm/exec/FunctorBase.h"
+#include <vtkm/CellShape.h>
+#include <vtkm/CellTraits.h>
+#include <vtkm/VecTraits.h>
+#include <vtkm/VectorAnalysis.h>
+#include <vtkm/exec/FunctorBase.h>

 namespace vtkm
 {
--- a/vtkm/filter/CellMeasures.h
+++ b/vtkm/filter/CellMeasures.h
@ -21,8 +21,8 @@
 #ifndef vtk_m_filter_CellMeasures_h
 #define vtk_m_filter_CellMeasures_h

-#include "vtkm/filter/FilterCell.h"
-#include "vtkm/worklet/CellMeasure.h"
+#include <vtkm/filter/FilterCell.h>
+#include <vtkm/worklet/CellMeasure.h>

 namespace vtkm
 {
--- a/vtkm/filter/CellMeasures.hxx
+++ b/vtkm/filter/CellMeasures.hxx
@ -18,10 +18,10 @@
 //  this software.
 //============================================================================

-#include "vtkm/cont/DynamicCellSet.h"
-#include "vtkm/cont/ErrorFilterExecution.h"
-#include "vtkm/filter/internal/CreateResult.h"
-#include "vtkm/worklet/DispatcherMapTopology.h"
+#include <vtkm/cont/DynamicCellSet.h>
+#include <vtkm/cont/ErrorFilterExecution.h>
+#include <vtkm/filter/internal/CreateResult.h>
+#include <vtkm/worklet/DispatcherMapTopology.h>

 namespace vtkm
 {
--- a/vtkm/filter/OscillatorSource.h
+++ b/vtkm/filter/OscillatorSource.h
@ -20,8 +20,8 @@
 #ifndef vtk_m_filter_OscillatorSource_h
 #define vtk_m_filter_OscillatorSource_h

-#include "vtkm/filter/FilterField.h"
-#include "vtkm/worklet/OscillatorSource.h"
+#include <vtkm/filter/FilterField.h>
+#include <vtkm/worklet/OscillatorSource.h>

 namespace vtkm
 {
--- a/vtkm/filter/testing/UnitTestCellMeasuresFilter.cxx
+++ b/vtkm/filter/testing/UnitTestCellMeasuresFilter.cxx
@ -18,10 +18,10 @@
 //  this software.
 //============================================================================

-#include "vtkm/filter/CellMeasures.h"
+#include <vtkm/filter/CellMeasures.h>

-#include "vtkm/cont/testing/MakeTestDataSet.h"
-#include "vtkm/cont/testing/Testing.h"
+#include <vtkm/cont/testing/MakeTestDataSet.h>
+#include <vtkm/cont/testing/Testing.h>

 #include <vector>

--- a/vtkm/io/reader/VTKPolyDataReader.h
+++ b/vtkm/io/reader/VTKPolyDataReader.h
@ -24,7 +24,7 @@

 #include <vtkm/cont/ArrayPortalToIterators.h>

-#include "iterator"
+#include <iterator>

 namespace vtkm
 {
--- a/vtkm/worklet/CellMeasure.h
+++ b/vtkm/worklet/CellMeasure.h
@ -21,9 +21,9 @@
 #ifndef vtk_m_worklet_CellMeasure_h
 #define vtk_m_worklet_CellMeasure_h

-#include "vtkm/worklet/WorkletMapTopology.h"
+#include <vtkm/worklet/WorkletMapTopology.h>

-#include "vtkm/exec/CellMeasure.h"
+#include <vtkm/exec/CellMeasure.h>

 namespace vtkm
 {
--- a/vtkm/worklet/contourtree/JoinSuperArcFinder.h
+++ b/vtkm/worklet/contourtree/JoinSuperArcFinder.h
@ -87,9 +87,9 @@
 #ifndef vtkm_worklet_contourtree_join_super_arc_finder_h
 #define vtkm_worklet_contourtree_join_super_arc_finder_h

-#include "vtkm/worklet/contourtree/Types.h"
-#include "vtkm/worklet/contourtree/VertexValueComparator.h"
 #include <vtkm/worklet/WorkletMapField.h>
+#include <vtkm/worklet/contourtree/Types.h>
+#include <vtkm/worklet/contourtree/VertexValueComparator.h>

 namespace vtkm
 {
--- a/vtkm/worklet/contourtree/RegularPointTransferrer.h
+++ b/vtkm/worklet/contourtree/RegularPointTransferrer.h
@ -83,10 +83,10 @@
 #ifndef vtkm_worklet_contourtree_regular_point_transferrer_h
 #define vtkm_worklet_contourtree_regular_point_transferrer_h

-#include "vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation_Macros.h"
-#include "vtkm/worklet/contourtree/Types.h"
-#include "vtkm/worklet/contourtree/VertexValueComparator.h"
 #include <vtkm/worklet/WorkletMapField.h>
+#include <vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation_Macros.h>
+#include <vtkm/worklet/contourtree/Types.h>
+#include <vtkm/worklet/contourtree/VertexValueComparator.h>

 namespace vtkm
 {
--- a/vtkm/worklet/contourtree/RegularToCandidate.h
+++ b/vtkm/worklet/contourtree/RegularToCandidate.h
@ -67,8 +67,8 @@
 #ifndef vtkm_worklet_contourtree_regular_to_candidate_h
 #define vtkm_worklet_contourtree_regular_to_candidate_h

-#include "vtkm/worklet/contourtree/Types.h"
 #include <vtkm/worklet/WorkletMapField.h>
+#include <vtkm/worklet/contourtree/Types.h>

 namespace vtkm
 {
--- a/vtkm/worklet/contourtree_augmented/ArrayTransforms.h
+++ b/vtkm/worklet/contourtree_augmented/ArrayTransforms.h
@ -72,7 +72,7 @@
 #include <vtkm/cont/ArrayHandleTransform.h>

 // local includes
-#include "Types.h"
+#include <vtkm/worklet/contourtree_augmented/Types.h>


 namespace vtkm
--- a/vtkm/worklet/contourtree_augmented/ContourTree.h
+++ b/vtkm/worklet/contourtree_augmented/ContourTree.h
@ -69,8 +69,8 @@
 #include <iostream>

 // local includes
-#include "PrintVectors.h"
-#include "Types.h"
+#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
+#include <vtkm/worklet/contourtree_augmented/Types.h>

 //VTKM includes
 #include <vtkm/Pair.h>
--- a/vtkm/worklet/contourtree_augmented/ContourTreeMaker.h
+++ b/vtkm/worklet/contourtree_augmented/ContourTreeMaker.h
@ -63,7 +63,6 @@
 #ifndef vtkm_worklet_contourtree_augmented_contourtreemaker_h
 #define vtkm_worklet_contourtree_augmented_contourtreemaker_h

-#include "Types.h"
 #include <iomanip>

 // local includes
--- a/vtkm/worklet/contourtree_augmented/MergeTree.h
+++ b/vtkm/worklet/contourtree_augmented/MergeTree.h
@ -67,8 +67,8 @@
 #include <iomanip>

 // local includes
-#include "PrintVectors.h"
-#include "Types.h"
+#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
+#include <vtkm/worklet/contourtree_augmented/Types.h>

 //VTKM includes
 #include <vtkm/Types.h>
--- a/vtkm/worklet/contourtree_augmented/MeshExtrema.h
+++ b/vtkm/worklet/contourtree_augmented/MeshExtrema.h
@ -66,12 +66,12 @@
 #include <iomanip>

 // local includes
-#include "PrintVectors.h"
-#include "Types.h"
 #include <vtkm/cont/Algorithm.h>
 #include <vtkm/cont/ArrayHandleConstant.h>
 #include <vtkm/worklet/Invoker.h>
 #include <vtkm/worklet/contourtree_augmented/PointerDoubling.h>
+#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
+#include <vtkm/worklet/contourtree_augmented/Types.h>
 #include <vtkm/worklet/contourtree_augmented/meshextrema/SetStarts.h>


--- a/vtkm/worklet/contourtree_augmented/Mesh_DEM_Triangulation.h
+++ b/vtkm/worklet/contourtree_augmented/Mesh_DEM_Triangulation.h
@ -357,8 +357,8 @@ void Mesh_DEM_Triangulation_3D<T, StorageType>::DebugPrintValues(
 } // worklet
 } // vtkm

-#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h" // include Mesh_DEM_Triangulation_2D_Freudenthal
-#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_Freudenthal
-#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_MarchinCubes
+#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h> // include Mesh_DEM_Triangulation_2D_Freudenthal
+#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h> // include Mesh_DEM_Triangulation_3D_Freudenthal
+#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h> // include Mesh_DEM_Triangulation_3D_MarchinCubes

 #endif
--- a/vtkm/worklet/contourtree_augmented/PrintVectors.h
+++ b/vtkm/worklet/contourtree_augmented/PrintVectors.h
@ -75,8 +75,8 @@
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>

 // local includes
-#include "../../cont/arg/Transport.h"
-#include "Types.h"
+#include <vtkm/cont/arg/Transport.h>
+#include <vtkm/worklet/contourtree_augmented/Types.h>


 namespace vtkm
--- a/vtkm/worklet/contourtree_augmented/ProcessContourTree.h
+++ b/vtkm/worklet/contourtree_augmented/ProcessContourTree.h
@ -70,8 +70,8 @@
 #include <iostream>

 // local includes
-#include "PrintVectors.h"
-#include "Types.h"
+#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
+#include <vtkm/worklet/contourtree_augmented/Types.h>

 //VTKM includes
 #include <vtkm/Pair.h>
--- a/vtkm/worklet/splatkernels/Gaussian.h
+++ b/vtkm/worklet/splatkernels/Gaussian.h
@ -20,7 +20,7 @@
 #ifndef VTKM_KERNEL_GAUSSIAN_H
 #define VTKM_KERNEL_GAUSSIAN_H

-#include "KernelBase.h"
+#include <vtkm/worklet/splatkernels/KernelBase.h>

 //
 // Gaussian kernel.
--- a/vtkm/worklet/splatkernels/Spline3rdOrder.h
+++ b/vtkm/worklet/splatkernels/Spline3rdOrder.h
@ -20,7 +20,7 @@
 #ifndef VTKM_KERNEL_SPLINE_3RD_ORDER_H
 #define VTKM_KERNEL_SPLINE_3RD_ORDER_H

-#include "KernelBase.h"
+#include <vtkm/worklet/splatkernels/KernelBase.h>

 //
 // Spline 3rd Order kernel.
--- a/vtkm/worklet/testing/UnitTestCellMeasure.cxx
+++ b/vtkm/worklet/testing/UnitTestCellMeasure.cxx
@ -18,11 +18,11 @@
 //  this software.
 //============================================================================

-#include "vtkm/worklet/CellMeasure.h"
-#include "vtkm/worklet/DispatcherMapTopology.h"
+#include <vtkm/worklet/CellMeasure.h>
+#include <vtkm/worklet/DispatcherMapTopology.h>

-#include "vtkm/cont/testing/MakeTestDataSet.h"
-#include "vtkm/cont/testing/Testing.h"
+#include <vtkm/cont/testing/MakeTestDataSet.h>
+#include <vtkm/cont/testing/Testing.h>

 namespace
 {
--- a/vtkm/worklet/testing/UnitTestSplatKernels.cxx
+++ b/vtkm/worklet/testing/UnitTestSplatKernels.cxx
@ -23,13 +23,7 @@
 #include <vtkm/cont/testing/Testing.h>
 #include <vtkm/worklet/splatkernels/Gaussian.h>
 #include <vtkm/worklet/splatkernels/Spline3rdOrder.h>
-/*
-#include "KernelBox.h"
-#include "KernelCusp.h"
-#include "KernelQuadratic.h"
-#include "KernelSpline5thOrder.h"
-#include "KernelWendland.h"
-*/
+

 using Vector = vtkm::Vec<vtkm::Float64, 3>;