Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Sudhanshu Sane
VTK-m
Commits
93506d25
Commit
93506d25
authored
May 25, 2018
by
Allison Vacanti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change function signatures to use 'using' aliases.
Also cleaned up some lingering type typedefs.
parent
a8f4f133
Changes
202
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
202 changed files
with
1056 additions
and
1106 deletions
+1056
-1106
benchmarking/BenchmarkFieldAlgorithms.cxx
benchmarking/BenchmarkFieldAlgorithms.cxx
+21
-24
benchmarking/BenchmarkTopologyAlgorithms.cxx
benchmarking/BenchmarkTopologyAlgorithms.cxx
+6
-6
examples/dynamic_dispatcher/main.cxx
examples/dynamic_dispatcher/main.cxx
+3
-7
examples/game_of_life/GameOfLife.cxx
examples/game_of_life/GameOfLife.cxx
+2
-2
examples/hello_world/HelloWorld.cxx
examples/hello_world/HelloWorld.cxx
+2
-2
examples/isosurface/IsosurfaceUniformGrid.cxx
examples/isosurface/IsosurfaceUniformGrid.cxx
+2
-2
examples/multi_backend/IOGenerator.cxx
examples/multi_backend/IOGenerator.cxx
+2
-2
examples/tau_timing/TauTiming.cxx
examples/tau_timing/TauTiming.cxx
+2
-2
examples/unified_memory/UnifiedMemory.cu
examples/unified_memory/UnifiedMemory.cu
+4
-4
vtkm/cont/CellLocator.h
vtkm/cont/CellLocator.h
+2
-2
vtkm/cont/CellLocatorTwoLevelUniformGrid.h
vtkm/cont/CellLocatorTwoLevelUniformGrid.h
+14
-14
vtkm/cont/CellSetPermutation.h
vtkm/cont/CellSetPermutation.h
+2
-2
vtkm/cont/PointLocatorUniformGrid.h
vtkm/cont/PointLocatorUniformGrid.h
+4
-4
vtkm/cont/internal/ConnectivityExplicitInternals.h
vtkm/cont/internal/ConnectivityExplicitInternals.h
+4
-4
vtkm/cont/tbb/internal/ParallelSortTBB.cxx
vtkm/cont/tbb/internal/ParallelSortTBB.cxx
+2
-2
vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h
vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h
+2
-2
vtkm/cont/testing/TestingArrayHandles.h
vtkm/cont/testing/TestingArrayHandles.h
+2
-2
vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h
vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h
+2
-2
vtkm/cont/testing/TestingDeviceAdapter.h
vtkm/cont/testing/TestingDeviceAdapter.h
+2
-2
vtkm/cont/testing/TestingFancyArrayHandles.h
vtkm/cont/testing/TestingFancyArrayHandles.h
+8
-8
vtkm/cont/testing/TestingImplicitFunction.h
vtkm/cont/testing/TestingImplicitFunction.h
+2
-2
vtkm/cont/testing/TestingPointLocatorUniformGrid.h
vtkm/cont/testing/TestingPointLocatorUniformGrid.h
+2
-2
vtkm/cont/testing/UnitTestCellSetExplicit.cxx
vtkm/cont/testing/UnitTestCellSetExplicit.cxx
+4
-4
vtkm/cont/testing/UnitTestCellSetPermutation.cxx
vtkm/cont/testing/UnitTestCellSetPermutation.cxx
+6
-6
vtkm/exec/arg/testing/UnitTestFetchArrayTopologyMapIn.cxx
vtkm/exec/arg/testing/UnitTestFetchArrayTopologyMapIn.cxx
+10
-12
vtkm/exec/cuda/internal/testing/UnitTestTaskStrided.cu
vtkm/exec/cuda/internal/testing/UnitTestTaskStrided.cu
+5
-5
vtkm/exec/internal/WorkletInvokeFunctorDetail.h
vtkm/exec/internal/WorkletInvokeFunctorDetail.h
+40
-40
vtkm/exec/internal/testing/TestingTaskTiling.h
vtkm/exec/internal/testing/TestingTaskTiling.h
+5
-5
vtkm/exec/internal/testing/UnitTestTaskSingular.cxx
vtkm/exec/internal/testing/UnitTestTaskSingular.cxx
+5
-5
vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx
vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx
+3
-3
vtkm/filter/CrossProduct.h
vtkm/filter/CrossProduct.h
+1
-1
vtkm/filter/DotProduct.h
vtkm/filter/DotProduct.h
+1
-1
vtkm/filter/testing/UnitTestEntropyFilter.cxx
vtkm/filter/testing/UnitTestEntropyFilter.cxx
+2
-2
vtkm/filter/testing/UnitTestMarchingCubesFilter.cxx
vtkm/filter/testing/UnitTestMarchingCubesFilter.cxx
+2
-2
vtkm/internal/FunctionInterface.h
vtkm/internal/FunctionInterface.h
+1
-1
vtkm/internal/FunctionInterfaceDetailPost.h
vtkm/internal/FunctionInterfaceDetailPost.h
+21
-21
vtkm/internal/FunctionInterfaceDetailPost.h.in
vtkm/internal/FunctionInterfaceDetailPost.h.in
+1
-1
vtkm/internal/FunctionInterfaceDetailPre.h
vtkm/internal/FunctionInterfaceDetailPre.h
+2
-2
vtkm/internal/FunctionInterfaceDetailPre.h.in
vtkm/internal/FunctionInterfaceDetailPre.h.in
+2
-2
vtkm/internal/testing/UnitTestFunctionInterface.cxx
vtkm/internal/testing/UnitTestFunctionInterface.cxx
+1
-1
vtkm/rendering/Canvas.cxx
vtkm/rendering/Canvas.cxx
+11
-11
vtkm/rendering/CanvasRayTracer.cxx
vtkm/rendering/CanvasRayTracer.cxx
+2
-2
vtkm/rendering/ConnectivityProxy.cxx
vtkm/rendering/ConnectivityProxy.cxx
+2
-2
vtkm/rendering/MapperGL.cxx
vtkm/rendering/MapperGL.cxx
+3
-3
vtkm/rendering/MapperWireframer.cxx
vtkm/rendering/MapperWireframer.cxx
+8
-8
vtkm/rendering/TextRenderer.cxx
vtkm/rendering/TextRenderer.cxx
+3
-6
vtkm/rendering/Triangulator.h
vtkm/rendering/Triangulator.h
+17
-17
vtkm/rendering/Wireframer.h
vtkm/rendering/Wireframer.h
+6
-6
vtkm/rendering/raytracing/BoundingVolumeHierarchy.cxx
vtkm/rendering/raytracing/BoundingVolumeHierarchy.cxx
+34
-34
vtkm/rendering/raytracing/BoundingVolumeHierarchy.h
vtkm/rendering/raytracing/BoundingVolumeHierarchy.h
+2
-2
vtkm/rendering/raytracing/Camera.cxx
vtkm/rendering/raytracing/Camera.cxx
+7
-12
vtkm/rendering/raytracing/ChannelBuffer.cxx
vtkm/rendering/raytracing/ChannelBuffer.cxx
+10
-10
vtkm/rendering/raytracing/ChannelBufferOperations.h
vtkm/rendering/raytracing/ChannelBufferOperations.h
+4
-4
vtkm/rendering/raytracing/ConnectivityTracer.hxx
vtkm/rendering/raytracing/ConnectivityTracer.hxx
+28
-28
vtkm/rendering/raytracing/MeshConnectivityBuilder.h
vtkm/rendering/raytracing/MeshConnectivityBuilder.h
+16
-21
vtkm/rendering/raytracing/MeshConnectivityStructures.h
vtkm/rendering/raytracing/MeshConnectivityStructures.h
+23
-23
vtkm/rendering/raytracing/MortonCodes.h
vtkm/rendering/raytracing/MortonCodes.h
+6
-9
vtkm/rendering/raytracing/RayOperations.h
vtkm/rendering/raytracing/RayOperations.h
+4
-4
vtkm/rendering/raytracing/RayTracer.cxx
vtkm/rendering/raytracing/RayTracer.cxx
+20
-28
vtkm/rendering/raytracing/RayTracingTypeDefs.h
vtkm/rendering/raytracing/RayTracingTypeDefs.h
+20
-20
vtkm/rendering/raytracing/TriangleIntersector.h
vtkm/rendering/raytracing/TriangleIntersector.h
+12
-12
vtkm/rendering/raytracing/VolumeRendererStructured.cxx
vtkm/rendering/raytracing/VolumeRendererStructured.cxx
+17
-17
vtkm/rendering/raytracing/VolumeRendererStructured.h
vtkm/rendering/raytracing/VolumeRendererStructured.h
+3
-3
vtkm/rendering/raytracing/Worklets.h
vtkm/rendering/raytracing/Worklets.h
+10
-10
vtkm/rendering/testing/UnitTestMapperConnectivity.cxx
vtkm/rendering/testing/UnitTestMapperConnectivity.cxx
+3
-3
vtkm/rendering/testing/UnitTestMapperRayTracer.cxx
vtkm/rendering/testing/UnitTestMapperRayTracer.cxx
+4
-4
vtkm/rendering/testing/UnitTestMapperVolume.cxx
vtkm/rendering/testing/UnitTestMapperVolume.cxx
+3
-3
vtkm/rendering/testing/UnitTestMapperWireframer.cxx
vtkm/rendering/testing/UnitTestMapperWireframer.cxx
+5
-5
vtkm/rendering/testing/UnitTestMultiMapper.cxx
vtkm/rendering/testing/UnitTestMultiMapper.cxx
+5
-5
vtkm/rendering/testing/egl/UnitTestMapperEGL.cxx
vtkm/rendering/testing/egl/UnitTestMapperEGL.cxx
+5
-5
vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx
vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx
+5
-5
vtkm/rendering/testing/glut/UnitTestMapperGLUT.cxx
vtkm/rendering/testing/glut/UnitTestMapperGLUT.cxx
+4
-4
vtkm/rendering/testing/osmesa/UnitTestMapperOSMesa.cxx
vtkm/rendering/testing/osmesa/UnitTestMapperOSMesa.cxx
+5
-5
vtkm/testing/OptionParser.h
vtkm/testing/OptionParser.h
+1
-1
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/fmt/ostream.h
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/fmt/ostream.h
+3
-3
vtkm/worklet/AverageByKey.h
vtkm/worklet/AverageByKey.h
+4
-4
vtkm/worklet/CellAverage.h
vtkm/worklet/CellAverage.h
+2
-2
vtkm/worklet/CellDeepCopy.h
vtkm/worklet/CellDeepCopy.h
+4
-4
vtkm/worklet/CellMeasure.h
vtkm/worklet/CellMeasure.h
+2
-2
vtkm/worklet/Clip.h
vtkm/worklet/Clip.h
+4
-4
vtkm/worklet/CrossProduct.h
vtkm/worklet/CrossProduct.h
+2
-2
vtkm/worklet/DotProduct.h
vtkm/worklet/DotProduct.h
+2
-2
vtkm/worklet/ExternalFaces.h
vtkm/worklet/ExternalFaces.h
+20
-20
vtkm/worklet/ExtractGeometry.h
vtkm/worklet/ExtractGeometry.h
+2
-2
vtkm/worklet/ExtractPoints.h
vtkm/worklet/ExtractPoints.h
+2
-2
vtkm/worklet/FieldEntropy.h
vtkm/worklet/FieldEntropy.h
+2
-2
vtkm/worklet/FieldHistogram.h
vtkm/worklet/FieldHistogram.h
+4
-4
vtkm/worklet/FieldStatistics.h
vtkm/worklet/FieldStatistics.h
+4
-4
vtkm/worklet/KernelSplatter.h
vtkm/worklet/KernelSplatter.h
+10
-10
vtkm/worklet/Magnitude.h
vtkm/worklet/Magnitude.h
+2
-2
vtkm/worklet/MarchingCubes.h
vtkm/worklet/MarchingCubes.h
+14
-14
vtkm/worklet/Normalize.h
vtkm/worklet/Normalize.h
+4
-4
vtkm/worklet/PointAverage.h
vtkm/worklet/PointAverage.h
+2
-2
vtkm/worklet/PointElevation.h
vtkm/worklet/PointElevation.h
+2
-2
vtkm/worklet/PointTransform.h
vtkm/worklet/PointTransform.h
+2
-2
vtkm/worklet/Probe.h
vtkm/worklet/Probe.h
+10
-10
vtkm/worklet/RemoveUnusedPoints.h
vtkm/worklet/RemoveUnusedPoints.h
+4
-4
vtkm/worklet/StreamLineUniformGrid.h
vtkm/worklet/StreamLineUniformGrid.h
+2
-2
vtkm/worklet/SurfaceNormals.h
vtkm/worklet/SurfaceNormals.h
+4
-4
vtkm/worklet/Tetrahedralize.h
vtkm/worklet/Tetrahedralize.h
+2
-2
vtkm/worklet/Threshold.h
vtkm/worklet/Threshold.h
+4
-4
vtkm/worklet/ThresholdPoints.h
vtkm/worklet/ThresholdPoints.h
+2
-2
vtkm/worklet/Triangulate.h
vtkm/worklet/Triangulate.h
+2
-2
vtkm/worklet/VertexClustering.h
vtkm/worklet/VertexClustering.h
+14
-14
vtkm/worklet/colorconversion/ConvertToRGB.h
vtkm/worklet/colorconversion/ConvertToRGB.h
+2
-2
vtkm/worklet/colorconversion/ConvertToRGBA.h
vtkm/worklet/colorconversion/ConvertToRGBA.h
+2
-2
vtkm/worklet/colorconversion/LookupTable.h
vtkm/worklet/colorconversion/LookupTable.h
+2
-2
vtkm/worklet/colorconversion/ShiftScaleToRGB.h
vtkm/worklet/colorconversion/ShiftScaleToRGB.h
+2
-2
vtkm/worklet/colorconversion/ShiftScaleToRGBA.h
vtkm/worklet/colorconversion/ShiftScaleToRGBA.h
+2
-2
vtkm/worklet/colorconversion/TransferFunction.h
vtkm/worklet/colorconversion/TransferFunction.h
+2
-2
vtkm/worklet/connectivities/CellSetDualGraph.h
vtkm/worklet/connectivities/CellSetDualGraph.h
+6
-6
vtkm/worklet/connectivities/GraphConnectivity.h
vtkm/worklet/connectivities/GraphConnectivity.h
+2
-2
vtkm/worklet/connectivities/ImageConnectivity.h
vtkm/worklet/connectivities/ImageConnectivity.h
+2
-2
vtkm/worklet/connectivities/InnerJoin.h
vtkm/worklet/connectivities/InnerJoin.h
+3
-8
vtkm/worklet/connectivities/UnionFind.h
vtkm/worklet/connectivities/UnionFind.h
+4
-4
vtkm/worklet/contourtree/ActiveEdgeTransferrer.h
vtkm/worklet/contourtree/ActiveEdgeTransferrer.h
+10
-10
vtkm/worklet/contourtree/ChainDoubler.h
vtkm/worklet/contourtree/ChainDoubler.h
+2
-2
vtkm/worklet/contourtree/ContourTree.h
vtkm/worklet/contourtree/ContourTree.h
+2
-2
vtkm/worklet/contourtree/CopyJoinSplit.h
vtkm/worklet/contourtree/CopyJoinSplit.h
+2
-2
vtkm/worklet/contourtree/CopyNeighbors.h
vtkm/worklet/contourtree/CopyNeighbors.h
+6
-6
vtkm/worklet/contourtree/CopySupernodes.h
vtkm/worklet/contourtree/CopySupernodes.h
+2
-2
vtkm/worklet/contourtree/DegreeDelta.h
vtkm/worklet/contourtree/DegreeDelta.h
+5
-5
vtkm/worklet/contourtree/DegreeSubrangeOffset.h
vtkm/worklet/contourtree/DegreeSubrangeOffset.h
+2
-2
vtkm/worklet/contourtree/FillSupernodes.h
vtkm/worklet/contourtree/FillSupernodes.h
+2
-2
vtkm/worklet/contourtree/FindLeaves.h
vtkm/worklet/contourtree/FindLeaves.h
+2
-2
vtkm/worklet/contourtree/GoverningSaddleFinder.h
vtkm/worklet/contourtree/GoverningSaddleFinder.h
+8
-8
vtkm/worklet/contourtree/JoinArcConnector.h
vtkm/worklet/contourtree/JoinArcConnector.h
+2
-2
vtkm/worklet/contourtree/JoinSuperArcFinder.h
vtkm/worklet/contourtree/JoinSuperArcFinder.h
+2
-2
vtkm/worklet/contourtree/JoinTreeTransferrer.h
vtkm/worklet/contourtree/JoinTreeTransferrer.h
+8
-8
vtkm/worklet/contourtree/Mesh2D_DEM_SaddleStarter.h
vtkm/worklet/contourtree/Mesh2D_DEM_SaddleStarter.h
+11
-11
vtkm/worklet/contourtree/Mesh2D_DEM_VertexOutdegreeStarter.h
vtkm/worklet/contourtree/Mesh2D_DEM_VertexOutdegreeStarter.h
+2
-2
vtkm/worklet/contourtree/Mesh2D_DEM_VertexStarter.h
vtkm/worklet/contourtree/Mesh2D_DEM_VertexStarter.h
+2
-2
vtkm/worklet/contourtree/Mesh3D_DEM_SaddleStarter.h
vtkm/worklet/contourtree/Mesh3D_DEM_SaddleStarter.h
+11
-11
vtkm/worklet/contourtree/Mesh3D_DEM_VertexOutdegreeStarter.h
vtkm/worklet/contourtree/Mesh3D_DEM_VertexOutdegreeStarter.h
+2
-2
vtkm/worklet/contourtree/Mesh3D_DEM_VertexStarter.h
vtkm/worklet/contourtree/Mesh3D_DEM_VertexStarter.h
+2
-2
vtkm/worklet/contourtree/RegularPointTransferrer.h
vtkm/worklet/contourtree/RegularPointTransferrer.h
+2
-2
vtkm/worklet/contourtree/RegularToCandidate.h
vtkm/worklet/contourtree/RegularToCandidate.h
+2
-2
vtkm/worklet/contourtree/RegularToCriticalDown.h
vtkm/worklet/contourtree/RegularToCriticalDown.h
+2
-2
vtkm/worklet/contourtree/RegularToCriticalUp.h
vtkm/worklet/contourtree/RegularToCriticalUp.h
+2
-2
vtkm/worklet/contourtree/ResetDegrees.h
vtkm/worklet/contourtree/ResetDegrees.h
+2
-2
vtkm/worklet/contourtree/SaddleAscentFunctor.h
vtkm/worklet/contourtree/SaddleAscentFunctor.h
+9
-9
vtkm/worklet/contourtree/SaddleAscentTransferrer.h
vtkm/worklet/contourtree/SaddleAscentTransferrer.h
+8
-8
vtkm/worklet/contourtree/SetJoinAndSplitArcs.h
vtkm/worklet/contourtree/SetJoinAndSplitArcs.h
+2
-2
vtkm/worklet/contourtree/SetSupernodeInward.h
vtkm/worklet/contourtree/SetSupernodeInward.h
+2
-2
vtkm/worklet/contourtree/SkipVertex.h
vtkm/worklet/contourtree/SkipVertex.h
+2
-2
vtkm/worklet/contourtree/SubrangeOffset.h
vtkm/worklet/contourtree/SubrangeOffset.h
+5
-5
vtkm/worklet/contourtree/TrunkBuilder.h
vtkm/worklet/contourtree/TrunkBuilder.h
+5
-5
vtkm/worklet/contourtree/UpdateOutbound.h
vtkm/worklet/contourtree/UpdateOutbound.h
+2
-2
vtkm/worklet/contourtree/VertexDegreeUpdater.h
vtkm/worklet/contourtree/VertexDegreeUpdater.h
+10
-10
vtkm/worklet/cosmotools/ComputeBinIndices.h
vtkm/worklet/cosmotools/ComputeBinIndices.h
+2
-2
vtkm/worklet/cosmotools/ComputeBinRange.h
vtkm/worklet/cosmotools/ComputeBinRange.h
+2
-2
vtkm/worklet/cosmotools/ComputeBins.h
vtkm/worklet/cosmotools/ComputeBins.h
+2
-2
vtkm/worklet/cosmotools/ComputeNeighborBins.h
vtkm/worklet/cosmotools/ComputeNeighborBins.h
+2
-2
vtkm/worklet/cosmotools/ComputePotential.h
vtkm/worklet/cosmotools/ComputePotential.h
+10
-10
vtkm/worklet/cosmotools/ComputePotentialBin.h
vtkm/worklet/cosmotools/ComputePotentialBin.h
+2
-2
vtkm/worklet/cosmotools/ComputePotentialMxN.h
vtkm/worklet/cosmotools/ComputePotentialMxN.h
+2
-2
vtkm/worklet/cosmotools/ComputePotentialNeighbors.h
vtkm/worklet/cosmotools/ComputePotentialNeighbors.h
+11
-11
vtkm/worklet/cosmotools/ComputePotentialNxN.h
vtkm/worklet/cosmotools/ComputePotentialNxN.h
+2
-2
vtkm/worklet/cosmotools/ComputePotentialOnCandidates.h
vtkm/worklet/cosmotools/ComputePotentialOnCandidates.h
+2
-2
vtkm/worklet/cosmotools/CosmoTools.h
vtkm/worklet/cosmotools/CosmoTools.h
+2
-2
vtkm/worklet/cosmotools/EqualsMinimumPotential.h
vtkm/worklet/cosmotools/EqualsMinimumPotential.h
+2
-2
vtkm/worklet/cosmotools/GraftParticles.h
vtkm/worklet/cosmotools/GraftParticles.h
+2
-2
vtkm/worklet/cosmotools/IsStar.h
vtkm/worklet/cosmotools/IsStar.h
+2
-2
vtkm/worklet/cosmotools/MarkActiveNeighbors.h
vtkm/worklet/cosmotools/MarkActiveNeighbors.h
+10
-10
vtkm/worklet/cosmotools/PointerJump.h
vtkm/worklet/cosmotools/PointerJump.h
+2
-2
vtkm/worklet/cosmotools/SetCandidateParticles.h
vtkm/worklet/cosmotools/SetCandidateParticles.h
+2
-2
vtkm/worklet/cosmotools/ValidHalo.h
vtkm/worklet/cosmotools/ValidHalo.h
+2
-2
vtkm/worklet/gradient/CellGradient.h
vtkm/worklet/gradient/CellGradient.h
+2
-2
vtkm/worklet/gradient/Divergence.h
vtkm/worklet/gradient/Divergence.h
+2
-2
vtkm/worklet/gradient/PointGradient.h
vtkm/worklet/gradient/PointGradient.h
+2
-2
vtkm/worklet/gradient/QCriterion.h
vtkm/worklet/gradient/QCriterion.h
+2
-2
vtkm/worklet/gradient/StructuredPointGradient.h
vtkm/worklet/gradient/StructuredPointGradient.h
+2
-2
vtkm/worklet/gradient/Transpose.h
vtkm/worklet/gradient/Transpose.h
+2
-2
vtkm/worklet/gradient/Vorticity.h
vtkm/worklet/gradient/Vorticity.h
+2
-2
vtkm/worklet/histogram/ComputeNDEntropy.h
vtkm/worklet/histogram/ComputeNDEntropy.h
+2
-2
vtkm/worklet/histogram/ComputeNDHistogram.h
vtkm/worklet/histogram/ComputeNDHistogram.h
+4
-4
vtkm/worklet/histogram/MarginalizeNDHistogram.h
vtkm/worklet/histogram/MarginalizeNDHistogram.h
+4
-4
vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx
vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx
+4
-4
vtkm/worklet/particleadvection/ParticleAdvectionWorklets.h
vtkm/worklet/particleadvection/ParticleAdvectionWorklets.h
+4
-4
vtkm/worklet/spatialstructure/KdTree3DConstruction.h
vtkm/worklet/spatialstructure/KdTree3DConstruction.h
+19
-23
vtkm/worklet/spatialstructure/KdTree3DNNSearch.h
vtkm/worklet/spatialstructure/KdTree3DNNSearch.h
+2
-2
vtkm/worklet/testing/UnitTestCellSetConnectivity.cxx
vtkm/worklet/testing/UnitTestCellSetConnectivity.cxx
+2
-2
vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
+2
-2
vtkm/worklet/testing/UnitTestMarchingCubes.cxx
vtkm/worklet/testing/UnitTestMarchingCubes.cxx
+2
-2
vtkm/worklet/testing/UnitTestParticleAdvection.cxx
vtkm/worklet/testing/UnitTestParticleAdvection.cxx
+4
-4
vtkm/worklet/testing/UnitTestScatterCounting.cxx
vtkm/worklet/testing/UnitTestScatterCounting.cxx
+2
-2
vtkm/worklet/testing/UnitTestScatterPermutation.cxx
vtkm/worklet/testing/UnitTestScatterPermutation.cxx
+2
-2
vtkm/worklet/testing/UnitTestStreamingSine.cxx
vtkm/worklet/testing/UnitTestStreamingSine.cxx
+2
-2
vtkm/worklet/testing/UnitTestWaveletCompressor.cxx
vtkm/worklet/testing/UnitTestWaveletCompressor.cxx
+4
-4
vtkm/worklet/testing/UnitTestWholeCellSetIn.cxx
vtkm/worklet/testing/UnitTestWholeCellSetIn.cxx
+2
-2
vtkm/worklet/testing/UnitTestWorkletMapField.cxx
vtkm/worklet/testing/UnitTestWorkletMapField.cxx
+4
-4
vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx
vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx
+2
-2
vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx
vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx
+4
-4
vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx
vtkm/worklet/testing/UnitTestWorkletMapPointNeighborhood.cxx
+8
-16
vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx
vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx
+2
-2
vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx
vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx
+4
-4
vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx
vtkm/worklet/testing/UnitTestWorkletReduceByKey.cxx
+4
-4
vtkm/worklet/tetrahedralize/TetrahedralizeExplicit.h
vtkm/worklet/tetrahedralize/TetrahedralizeExplicit.h
+4
-4
vtkm/worklet/tetrahedralize/TetrahedralizeStructured.h
vtkm/worklet/tetrahedralize/TetrahedralizeStructured.h
+2
-2
vtkm/worklet/triangulate/TriangulateExplicit.h
vtkm/worklet/triangulate/TriangulateExplicit.h
+4
-4
vtkm/worklet/triangulate/TriangulateStructured.h
vtkm/worklet/triangulate/TriangulateStructured.h
+2
-2
vtkm/worklet/wavelets/WaveletTransforms.h
vtkm/worklet/wavelets/WaveletTransforms.h
+62
-62
No files found.
benchmarking/BenchmarkFieldAlgorithms.cxx
View file @
93506d25
...
...
@@ -65,12 +65,9 @@ class BlackScholes : public vtkm::worklet::WorkletMapField
T
Volatility
;
public:
typedef
void
ControlSignature
(
FieldIn
<
Scalar
>
,
FieldIn
<
Scalar
>
,
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
,
_5
);
using
ControlSignature
=
void
(
FieldIn
<
Scalar
>
,
FieldIn
<
Scalar
>
,
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
,
_5
);
BlackScholes
(
T
risk
,
T
volatility
)
:
Riskfree
(
risk
)
...
...
@@ -131,8 +128,8 @@ public:
class
Mag
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
template
<
typename
T
,
typename
U
>
VTKM_EXEC
void
operator
()(
const
vtkm
::
Vec
<
T
,
3
>&
vec
,
U
&
result
)
const
...
...
@@ -144,8 +141,8 @@ public:
class
Square
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
template
<
typename
T
,
typename
U
>
VTKM_EXEC
void
operator
()(
T
input
,
U
&
output
)
const
...
...
@@ -157,8 +154,8 @@ public:
class
Sin
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
template
<
typename
T
,
typename
U
>
VTKM_EXEC
void
operator
()(
T
input
,
U
&
output
)
const
...
...
@@ -170,8 +167,8 @@ public:
class
Cos
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Scalar
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
template
<
typename
T
,
typename
U
>
VTKM_EXEC
void
operator
()(
T
input
,
U
&
output
)
const
...
...
@@ -183,8 +180,8 @@ public:
class
FusedMath
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
template
<
typename
T
>
VTKM_EXEC
void
operator
()(
const
vtkm
::
Vec
<
T
,
3
>&
vec
,
T
&
result
)
const
...
...
@@ -203,8 +200,8 @@ public:
class
GenerateEdges
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
CellSetIn
cellset
,
WholeArrayOut
<>
edgeIds
);
typedef
void
ExecutionSignature
(
PointIndices
,
ThreadIndices
,
_2
);
using
ControlSignature
=
void
(
CellSetIn
cellset
,
WholeArrayOut
<>
edgeIds
);
using
ExecutionSignature
=
void
(
PointIndices
,
ThreadIndices
,
_2
);
using
InputDomain
=
_1
;
template
<
typename
ConnectivityInVec
,
typename
ThreadIndicesType
,
typename
IdPairTableType
>
...
...
@@ -229,11 +226,11 @@ public:
class
InterpolateField
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Id2Type
>
interpolation_ids
,
using
ControlSignature
=
void
(
FieldIn
<
Id2Type
>
interpolation_ids
,
FieldIn
<
Scalar
>
interpolation_weights
,
WholeArrayIn
<>
inputField
,
FieldOut
<>
output
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
);
using
InputDomain
=
_1
;
template
<
typename
WeightType
,
typename
T
,
typename
S
,
typename
D
>
...
...
@@ -262,8 +259,8 @@ template <typename ImplicitFunction>
class
EvaluateImplicitFunction
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
EvaluateImplicitFunction
(
const
ImplicitFunction
*
function
)
:
Function
(
function
)
...
...
@@ -284,8 +281,8 @@ template <typename T1, typename T2>
class
Evaluate2ImplicitFunctions
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Vec3
>
,
FieldOut
<
Scalar
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
Evaluate2ImplicitFunctions
(
const
T1
*
f1
,
const
T2
*
f2
)
:
Function1
(
f1
)
...
...
benchmarking/BenchmarkTopologyAlgorithms.cxx
View file @
93506d25
...
...
@@ -55,10 +55,10 @@ enum BenchmarkName
class
AveragePointToCell
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
FieldInPoint
<>
inPoints
,
using
ControlSignature
=
void
(
FieldInPoint
<>
inPoints
,
CellSetIn
cellset
,
FieldOutCell
<>
outCells
);
typedef
void
ExecutionSignature
(
_1
,
PointCount
,
_3
);
using
ExecutionSignature
=
void
(
_1
,
PointCount
,
_3
);
using
InputDomain
=
_2
;
template
<
typename
PointValueVecType
,
typename
OutType
>
...
...
@@ -79,8 +79,8 @@ public:
class
AverageCellToPoint
:
public
vtkm
::
worklet
::
WorkletMapCellToPoint
{
public:
typedef
void
ControlSignature
(
FieldInCell
<>
inCells
,
CellSetIn
topology
,
FieldOut
<>
outPoints
);
typedef
void
ExecutionSignature
(
_1
,
_3
,
CellCount
);
using
ControlSignature
=
void
(
FieldInCell
<>
inCells
,
CellSetIn
topology
,
FieldOut
<>
outPoints
);
using
ExecutionSignature
=
void
(
_1
,
_3
,
CellCount
);
using
InputDomain
=
_2
;
template
<
typename
CellVecType
,
typename
OutType
>
...
...
@@ -106,10 +106,10 @@ template <typename T>
class
Classification
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
FieldInPoint
<>
inNodes
,
using
ControlSignature
=
void
(
FieldInPoint
<>
inNodes
,
CellSetIn
cellset
,
FieldOutCell
<
IdComponentType
>
outCaseId
);
typedef
void
ExecutionSignature
(
_1
,
_3
);
using
ExecutionSignature
=
void
(
_1
,
_3
);
using
InputDomain
=
_2
;
T
IsoValue
;
...
...
examples/dynamic_dispatcher/main.cxx
View file @
93506d25
...
...
@@ -31,13 +31,9 @@
struct
ExampleFieldWorklet
:
public
vtkm
::
worklet
::
WorkletMapField
{
typedef
void
ControlSignature
(
FieldIn
<>
,
FieldIn
<>
,
FieldIn
<>
,
FieldOut
<>
,
FieldOut
<>
,
FieldOut
<>
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
,
_5
,
_6
);
using
ControlSignature
=
void
(
FieldIn
<>
,
FieldIn
<>
,
FieldIn
<>
,
FieldOut
<>
,
FieldOut
<>
,
FieldOut
<>
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
,
_5
,
_6
);
template
<
typename
T
,
typename
U
,
typename
V
>
VTKM_EXEC
void
operator
()(
const
vtkm
::
Vec
<
T
,
3
>&
vec
,
...
...
examples/game_of_life/GameOfLife.cxx
View file @
93506d25
...
...
@@ -78,12 +78,12 @@ struct UpdateLifeState : public vtkm::worklet::WorkletPointNeighborhood3x3x3
{
using
CountingHandle
=
vtkm
::
cont
::
ArrayHandleCounting
<
vtkm
::
Id
>
;
typedef
void
ControlSignature
(
CellSetIn
,
using
ControlSignature
=
void
(
CellSetIn
,
FieldInNeighborhood
<>
prevstate
,
FieldOut
<>
state
,
FieldOut
<>
color
);
typedef
void
ExecutionSignature
(
_2
,
_3
,
_4
);
using
ExecutionSignature
=
void
(
_2
,
_3
,
_4
);
template
<
typename
NeighIn
>
VTKM_EXEC
void
operator
()(
const
NeighIn
&
prevstate
,
...
...
examples/hello_world/HelloWorld.cxx
View file @
93506d25
...
...
@@ -144,8 +144,8 @@ struct HelloVTKMInterop
{
}
typedef
void
ControlSignature
(
FieldIn
<>
,
FieldOut
<>
,
FieldOut
<>
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
);
using
ControlSignature
=
void
(
FieldIn
<>
,
FieldOut
<>
,
FieldOut
<>
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
);
VTKM_EXEC
void
operator
()(
const
vtkm
::
Vec
<
T
,
3
>&
input
,
...
...
examples/isosurface/IsosurfaceUniformGrid.cxx
View file @
93506d25
...
...
@@ -62,8 +62,8 @@ namespace
class
TangleField
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
IdType
>
vertexId
,
FieldOut
<
Scalar
>
v
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
IdType
>
vertexId
,
FieldOut
<
Scalar
>
v
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
using
InputDomain
=
_1
;
const
vtkm
::
Id
xdim
,
ydim
,
zdim
;
...
...
examples/multi_backend/IOGenerator.cxx
View file @
93506d25
...
...
@@ -34,8 +34,8 @@
struct
WaveField
:
public
vtkm
::
worklet
::
WorkletMapField
{
typedef
void
ControlSignature
(
FieldIn
<
Vec3
>
,
FieldOut
<
Vec3
>
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
Vec3
>
,
FieldOut
<
Vec3
>
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
template
<
typename
T
>
VTKM_EXEC
void
operator
()(
const
vtkm
::
Vec
<
T
,
3
>&
input
,
vtkm
::
Vec
<
T
,
3
>&
output
)
const
...
...
examples/tau_timing/TauTiming.cxx
View file @
93506d25
...
...
@@ -69,8 +69,8 @@ using DeviceAdapter = VTKM_DEFAULT_DEVICE_ADAPTER_TAG;
class
TangleField
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
IdType
>
vertexId
,
FieldOut
<
Scalar
>
v
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
IdType
>
vertexId
,
FieldOut
<
Scalar
>
v
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
using
InputDomain
=
_1
;
const
vtkm
::
Id
xdim
,
ydim
,
zdim
;
...
...
examples/unified_memory/UnifiedMemory.cu
View file @
93506d25
...
...
@@ -39,8 +39,8 @@ namespace
class
TangleField
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
IdType
>
vertexId
,
FieldOut
<
Scalar
>
v
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ControlSignature
=
void
(
FieldIn
<
IdType
>
vertexId
,
FieldOut
<
Scalar
>
v
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
using
InputDomain
=
_1
;
const
vtkm
::
Id
xdim
,
ydim
,
zdim
;
...
...
@@ -126,8 +126,8 @@ namespace worklet
class
SineWorklet
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<>
,
FieldOut
<>
);
typedef
_2
ExecutionSignature
(
_1
,
WorkIndex
);
using
ControlSignature
=
void
(
FieldIn
<>
,
FieldOut
<>
);
using
ExecutionSignature
=
_2
(
_1
,
WorkIndex
);
VTKM_EXEC
vtkm
::
Float32
operator
()(
vtkm
::
Int64
x
,
vtkm
::
Id
&
)
const
...
...
vtkm/cont/CellLocator.h
View file @
93506d25
...
...
@@ -77,12 +77,12 @@ public:
DIM
>
;
public:
typedef
void
ControlSignature
(
FieldIn
<
Vec3
>
points
,
using
ControlSignature
=
void
(
FieldIn
<
Vec3
>
points
,
WholeCellSetIn
<>
cellSet
,
WholeArrayIn
<
Vec3
>
coordinates
,
FieldOut
<
IdType
>
cellIds
,
FieldOut
<
Vec3
>
parametricCoordinates
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
,
_5
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
,
_5
);
template
<
typename
CoordsPortalType
,
vtkm
::
IdComponent
DIM
>
VTKM_EXEC
void
operator
()(
const
vtkm
::
Vec
<
vtkm
::
FloatDefault
,
3
>&
point
,
...
...
vtkm/cont/CellLocatorTwoLevelUniformGrid.h
View file @
93506d25
...
...
@@ -282,10 +282,10 @@ public:
class
CountBinsL1
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
CellSetIn
cellset
,
using
ControlSignature
=
void
(
CellSetIn
cellset
,
FieldInPoint
<
Vec3
>
coords
,
FieldOutCell
<
IdType
>
bincount
);
typedef
void
ExecutionSignature
(
_2
,
_3
);
using
ExecutionSignature
=
void
(
_2
,
_3
);
CountBinsL1
(
const
Grid
&
grid
)
:
L1Grid
(
grid
)
...
...
@@ -307,11 +307,11 @@ public:
class
FindBinsL1
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
CellSetIn
cellset
,
using
ControlSignature
=
void
(
CellSetIn
cellset
,
FieldInPoint
<
Vec3
>
coords
,
FieldInCell
<
IdType
>
offsets
,
WholeArrayOut
<
IdType
>
binIds
);
typedef
void
ExecutionSignature
(
_2
,
_3
,
_4
);
using
ExecutionSignature
=
void
(
_2
,
_3
,
_4
);
FindBinsL1
(
const
Grid
&
grid
)
:
L1Grid
(
grid
)
...
...
@@ -340,10 +340,10 @@ public:
class
GenerateBinsL1
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
IdType
>
binIds
,
using
ControlSignature
=
void
(
FieldIn
<
IdType
>
binIds
,
FieldIn
<
IdType
>
cellCounts
,
WholeArrayOut
<
vtkm
::
ListTagBase
<
DimVec3
>>
dimensions
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
);
using
InputDomain
=
_1
;
...
...
@@ -369,11 +369,11 @@ public:
class
CountBinsL2
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
CellSetIn
cellset
,
using
ControlSignature
=
void
(
CellSetIn
cellset
,
FieldInPoint
<
Vec3
>
coords
,
WholeArrayIn
<
vtkm
::
ListTagBase
<
DimVec3
>>
binDimensions
,
FieldOutCell
<
IdType
>
bincount
);
typedef
void
ExecutionSignature
(
_2
,
_3
,
_4
);
using
ExecutionSignature
=
void
(
_2
,
_3
,
_4
);
CountBinsL2
(
const
Grid
&
grid
)
:
L1Grid
(
grid
)
...
...
@@ -404,14 +404,14 @@ public:
class
FindBinsL2
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
CellSetIn
cellset
,
using
ControlSignature
=
void
(
CellSetIn
cellset
,
FieldInPoint
<
Vec3
>
coords
,
WholeArrayIn
<
vtkm
::
ListTagBase
<
DimVec3
>>
binDimensions
,
WholeArrayIn
<
IdType
>
binStarts
,
FieldInCell
<
IdType
>
offsets
,
WholeArrayOut
<
IdType
>
binIds
,
WholeArrayOut
<
IdType
>
cellIds
);
typedef
void
ExecutionSignature
(
InputIndex
,
_2
,
_3
,
_4
,
_5
,
_6
,
_7
);
using
ExecutionSignature
=
void
(
InputIndex
,
_2
,
_3
,
_4
,
_5
,
_6
,
_7
);
FindBinsL2
(
const
Grid
&
grid
)
:
L1Grid
(
grid
)
...
...
@@ -456,12 +456,12 @@ public:
class
GenerateBinsL2
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
IdType
>
binIds
,
using
ControlSignature
=
void
(
FieldIn
<
IdType
>
binIds
,
FieldIn
<
IdType
>
startsIn
,
FieldIn
<
IdType
>
countsIn
,
WholeArrayOut
<
IdType
>
startsOut
,
WholeArrayOut
<
IdType
>
countsOut
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
,
_5
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
,
_5
);
using
InputDomain
=
_1
;
...
...
@@ -639,13 +639,13 @@ public:
class
FindCellWorklet
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<
Vec3
>
points
,
using
ControlSignature
=
void
(
FieldIn
<
Vec3
>
points
,
WholeCellSetIn
<>
cellSet
,
WholeArrayIn
<
Vec3
>
coordinates
,
ExecObject
lookupStruct
,
FieldOut
<
IdType
>
cellIds
,
FieldOut
<
Vec3
>
parametricCoordinates
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
,
_5
,
_6
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
,
_5
,
_6
);
using
InputDomain
=
_1
;
...
...
vtkm/cont/CellSetPermutation.h
View file @
93506d25
...
...
@@ -46,10 +46,10 @@ namespace internal
struct
WriteConnectivity
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
typedef
void
ControlSignature
(
CellSetIn
cellset
,
using
ControlSignature
=
void
(
CellSetIn
cellset
,
FieldInCell
<
IdType
>
offset
,
WholeArrayOut
<>
connectivity
);
typedef
void
ExecutionSignature
(
PointCount
,
PointIndices
,
_2
,
_3
);
using
ExecutionSignature
=
void
(
PointCount
,
PointIndices
,
_2
,
_3
);
using
InputDomain
=
_1
;
template
<
typename
PointIndicesType
,
typename
OutPortalType
>
...
...
vtkm/cont/PointLocatorUniformGrid.h
View file @
93506d25
...
...
@@ -46,9 +46,9 @@ public:
class
BinPointsWorklet
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<>
coord
,
FieldOut
<>
label
);
using
ControlSignature
=
void
(
FieldIn
<>
coord
,
FieldOut
<>
label
);
typedef
void
ExecutionSignature
(
_1
,
_2
);
using
ExecutionSignature
=
void
(
_1
,
_2
);
VTKM_CONT
BinPointsWorklet
(
vtkm
::
Vec
<
T
,
3
>
_min
,
vtkm
::
Vec
<
T
,
3
>
_max
,
vtkm
::
Vec
<
vtkm
::
Id
,
3
>
_dims
)
...
...
@@ -74,7 +74,7 @@ public:
class
UniformGridSearch
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<>
query
,
using
ControlSignature
=
void
(
FieldIn
<>
query
,
WholeArrayIn
<>
coordIn
,
WholeArrayIn
<
IdType
>
pointId
,
WholeArrayIn
<
IdType
>
cellLower
,
...
...
@@ -82,7 +82,7 @@ public:
FieldOut
<
IdType
>
neighborId
,
FieldOut
<>
distance
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
,
_5
,
_6
,
_7
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
,
_5
,
_6
,
_7
);
VTKM_CONT
UniformGridSearch
(
const
vtkm
::
Vec
<
T
,
3
>&
_min
,
...
...
vtkm/cont/internal/ConnectivityExplicitInternals.h
View file @
93506d25
...
...
@@ -176,11 +176,11 @@ struct ConnectivityExplicitInternals
class
ExpandIndices
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<>
cellIndex
,
using
ControlSignature
=
void
(
FieldIn
<>
cellIndex
,
FieldIn
<>
offset
,
FieldIn
<>
numIndices
,
WholeArrayOut
<>
cellIndices
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
,
_4
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
,
_4
);
using
InputDomain
=
_1
;
VTKM_CONT
...
...
@@ -204,8 +204,8 @@ public:
class
ScatterValues
:
public
vtkm
::
worklet
::
WorkletMapField
{
public:
typedef
void
ControlSignature
(
FieldIn
<>
index
,
FieldIn
<>
value
,
WholeArrayOut
<>
output
);
typedef
void
ExecutionSignature
(
_1
,
_2
,
_3
);
using
ControlSignature
=
void
(
FieldIn
<>
index
,
FieldIn
<>
value
,
WholeArrayOut
<>
output
);
using
ExecutionSignature
=
void
(
_1
,
_2
,
_3
);
using
InputDomain
=
_1
;
template
<
typename
T
,
typename
PortalType
>
...
...
vtkm/cont/tbb/internal/ParallelSortTBB.cxx
View file @
93506d25
...
...
@@ -488,7 +488,7 @@ void ParallelRadixSortInternal<PlainType, CompareType, UnsignedType, Encoder, Va
}
};
typedef
RunTask
<
PlainType
,
UnsignedType
,
Encoder
,
Base
,
std
::
function
<
void
(
size_t
)
>>
RunTaskType
;
using
RunTaskType
=
RunTask
<
PlainType
,
UnsignedType
,
Encoder
,
Base
,
std
::
function
<
void
(
size_t
)
>>
;
RunTaskType
&
root
=
*
new
(
::
tbb
::
task
::
allocate_root
())
RunTaskType
(
0
,
1
,
lambda
,
num_elems_
,
num_threads_
);
...
...
@@ -563,7 +563,7 @@ void ParallelRadixSortInternal<PlainType, CompareType, UnsignedType, Encoder, Va
}
};
typedef
RunTask
<
PlainType
,
UnsignedType
,
Encoder
,
Base
,
std
::
function
<
void
(
size_t
)
>>
RunTaskType
;
using
RunTaskType
=
RunTask
<
PlainType
,
UnsignedType
,
Encoder
,
Base
,
std
::
function
<
void
(
size_t
)
>>
;
RunTaskType
&
root
=
*
new
(
::
tbb
::
task
::
allocate_root
())
RunTaskType
(
0
,
1
,
lambda
,
num_elems_
,
num_threads_
);
...
...
vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h
View file @
93506d25
...
...
@@ -39,8 +39,8 @@ namespace
struct
CopyWorklet
:
public
vtkm
::
worklet
::
WorkletMapField
{
typedef
void
ControlSignature
(
FieldIn
<
FieldCommon
>
in
,
FieldOut
<
FieldCommon
>
out
);
typedef
_2
ExecutionSignature
(
_1
);
using
ControlSignature
=
void
(
FieldIn
<
FieldCommon
>
in
,
FieldOut
<
FieldCommon
>
out
);
using
ExecutionSignature
=
_2
(
_1
);
template
<
typename
T
>
VTKM_EXEC
T
operator
()(
const
T
&
in
)
const
...
...
vtkm/cont/testing/TestingArrayHandles.h
View file @
93506d25
...
...
@@ -90,8 +90,8 @@ struct TestingArrayHandles
struct
PassThrough
:
public
vtkm
::
worklet
::
WorkletMapField
{
typedef
void
ControlSignature
(
FieldIn
<>
,
FieldOut
<>
);
typedef
_2
ExecutionSignature
(
_1
);
using
ControlSignature
=
void
(
FieldIn
<>
,
FieldOut
<>
);
using
ExecutionSignature
=
_2
(
_1
);
template
<
class
ValueType
>
VTKM_EXEC
ValueType
operator
()(
const
ValueType
&
inValue
)
const
...
...
vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h
View file @
93506d25
...
...
@@ -47,11 +47,11 @@ std::default_random_engine RandomGenerator;
class
ParametricToWorldCoordinates
:
public
vtkm
::
worklet
::
WorkletMapPointToCell
{
public:
typedef
void
ControlSignature
(
CellSetIn
cellset
,
using
ControlSignature
=
void
(
CellSetIn
cellset
,
FieldInPoint
<
Vec3
>
coords
,
FieldInOutCell
<
Vec3
>
pcs
,
FieldOutCell
<
Vec3
>
wcs
);
typedef
void
ExecutionSignature
(
CellShape
,
_2
,
_3
,
_4
);
using
ExecutionSignature
=
void
(
CellShape
,
_2
,
_3
,
_4
);
using
ScatterType
=
vtkm
::
worklet
::
ScatterPermutation
<>
;
...
...
vtkm/cont/testing/TestingDeviceAdapter.h
View file @
93506d25
...
...
@@ -145,8 +145,8 @@ public:
struct