Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'worket_invoker_dispatcher2'

Browse Source 
0dcc6cc16 reverse #include on CellNeighborhood
2489da125 restore comment, add needed #include
f33318247 Reverse Invoker, Dispatcher and Worklet dependency

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2192
This commit is contained in:
Li-Ta Lo 2020-07-22 18:20:30 +00:00 committed by Kitware Robot
commit 537557ef91
22 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/game_of_life/GameOfLife.cxx
View File

@ -17,7 +17,6 @@
#include <iostream>
#include <random>
#include <vtkm/Math.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleCounting.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
@ -29,10 +28,8 @@
#include <vtkm/filter/FilterDataSet.h>
#include <vtkm/worklet/WorkletPointNeighborhood.h>
#include <vtkm/cont/Invoker.h>
#include <vtkm/cont/TryExecute.h>
#include <vtkm/cont/cuda/DeviceAdapterCuda.h>
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
#include <vtkm/cont/tbb/DeviceAdapterTBB.h>
//Suppress warnings about glut being deprecated on OSX
#if (defined(VTKM_GCC) || defined(VTKM_CLANG))

1
examples/ising/Ising.cxx
View File

@ -23,6 +23,7 @@
#include <vtkm/rendering/MapperRayTracer.h>
#include <vtkm/rendering/Scene.h>
#include <vtkm/rendering/View2D.h>
#include <vtkm/worklet/WorkletCellNeighborhood.h>
struct UpDown
{

7
vtkm/cont/Invoker.h
View File

@ -10,11 +10,8 @@
#ifndef vtk_m_cont_Invoker_h
#define vtk_m_cont_Invoker_h
#include <vtkm/worklet/DispatcherCellNeighborhood.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/DispatcherMapTopology.h>
#include <vtkm/worklet/DispatcherPointNeighborhood.h>
#include <vtkm/worklet/DispatcherReduceByKey.h>
#include <vtkm/worklet/internal/MaskBase.h>
#include <vtkm/worklet/internal/ScatterBase.h>
#include <vtkm/cont/TryExecute.h>

1
vtkm/filter/ImageMedian.hxx
View File

@ -12,6 +12,7 @@
#define vtk_m_filter_ImageMedian_hxx
#include <vtkm/Swap.h>
#include <vtkm/worklet/WorkletPointNeighborhood.h>
namespace vtkm
{

5
vtkm/rendering/raytracing/SphereExtractor.cxx
View File

@ -11,9 +11,8 @@
#include <vtkm/rendering/raytracing/SphereExtractor.h>
#include <vtkm/cont/Algorithm.h>
#include <vtkm/rendering/raytracing/Worklets.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/DispatcherMapTopology.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/WorkletMapTopology.h>
namespace vtkm
{

1
vtkm/source/Tangle.cxx
View File

@ -10,6 +10,7 @@
#include <vtkm/cont/ArrayCopy.h>
#include <vtkm/source/Tangle.h>
#include <vtkm/worklet/WorkletMapTopology.h>
namespace vtkm
{

1
vtkm/source/Wavelet.cxx
View File

@ -10,6 +10,7 @@
#include <vtkm/source/Wavelet.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/WorkletMapTopology.h>
namespace
{

2
vtkm/worklet/AverageByKey.h
View File

@ -14,8 +14,8 @@
#include <vtkm/cont/ArrayCopy.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/DescriptiveStatistics.h>
#include <vtkm/worklet/DispatcherReduceByKey.h>
#include <vtkm/worklet/Keys.h>
#include <vtkm/worklet/WorkletReduceByKey.h>
namespace vtkm
{

4
vtkm/worklet/DispatcherCellNeighborhood.h
View File

@ -12,14 +12,14 @@
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/worklet/WorkletCellNeighborhood.h>
#include <vtkm/worklet/internal/DispatcherBase.h>
namespace vtkm
{
namespace worklet
{
class WorkletNeighborhood;
class WorkletCellNeighborhood;
/// \brief Dispatcher for worklets that inherit from \c WorkletCellNeighborhood.
///

3
vtkm/worklet/DispatcherMapField.h
View File

@ -10,7 +10,6 @@
#ifndef vtk_m_worklet_Dispatcher_MapField_h
#define vtk_m_worklet_Dispatcher_MapField_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/internal/DispatcherBase.h>
namespace vtkm
@ -18,6 +17,8 @@ namespace vtkm
namespace worklet
{
class WorkletMapField;
/// \brief Dispatcher for worklets that inherit from \c WorkletMapField.
///
template <typename WorkletType>

7
vtkm/worklet/DispatcherMapTopology.h
View File

@ -12,13 +12,18 @@
#include <vtkm/TopologyElementTag.h>
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/worklet/WorkletMapTopology.h>
#include <vtkm/worklet/internal/DispatcherBase.h>
namespace vtkm
{
namespace worklet
{
namespace detail
{
struct WorkletMapTopologyBase;
}
class WorkletVisitCellsWithPoints;
class WorkletVisitPointsWithCells;
/// \brief Dispatcher for worklets that inherit from \c WorkletMapTopology.
///

5
vtkm/worklet/DispatcherPointNeighborhood.h
View File

@ -11,15 +11,14 @@
#define vtk_m_worklet_DispatcherPointNeighborhood_h
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/worklet/WorkletPointNeighborhood.h>
#include <vtkm/worklet/internal/DispatcherBase.h>
namespace vtkm
{
namespace worklet
{
class WorkletNeighborhood;
class WorkletPointNeighborhood;
/// \brief Dispatcher for worklets that inherit from \c WorkletPointNeighborhood.
///

4
vtkm/worklet/DispatcherReduceByKey.h
View File

@ -12,14 +12,14 @@
#include <vtkm/cont/DeviceAdapter.h>
#include <vtkm/worklet/WorkletReduceByKey.h>
#include <vtkm/cont/arg/TypeCheckTagKeys.h>
#include <vtkm/worklet/internal/DispatcherBase.h>
namespace vtkm
{
namespace worklet
{
class WorkletReduceByKey;
/// \brief Dispatcher for worklets that inherit from \c WorkletReduceByKey.
///

2
vtkm/worklet/TriangleWinding.h
View File

@ -35,9 +35,9 @@
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/Invoker.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/MaskIndices.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/WorkletMapTopology.h>
#include <vtkm/Types.h>
#include <vtkm/VectorAnalysis.h>

1
vtkm/worklet/WorkletCellNeighborhood.h
View File

@ -17,6 +17,7 @@
/// nature and is fixed at compile time.
#include <vtkm/exec/arg/ThreadIndicesCellNeighborhood.h>
#include <vtkm/worklet/DispatcherCellNeighborhood.h>
#include <vtkm/worklet/WorkletNeighborhood.h>
namespace vtkm

5
vtkm/worklet/WorkletMapField.h
View File

@ -24,14 +24,13 @@
#include <vtkm/exec/arg/FetchTagArrayDirectInOut.h>
#include <vtkm/exec/arg/FetchTagArrayDirectOut.h>
#include <vtkm/worklet/DispatcherMapField.h>
namespace vtkm
{
namespace worklet
{
template <typename WorkletType>
class DispatcherMapField;
/// Base class for worklets that do a simple mapping of field arrays. All
/// inputs and outputs are on the same domain. That is, all the arrays are the
/// same size.

2
vtkm/worklet/WorkletMapTopology.h
View File

@ -34,6 +34,8 @@
#include <vtkm/exec/arg/IncidentElementIndices.h>
#include <vtkm/exec/arg/ThreadIndicesTopologyMap.h>
#include <vtkm/worklet/DispatcherMapTopology.h>
namespace vtkm
{
namespace worklet

4
vtkm/worklet/WorkletPointNeighborhood.h
View File

@ -16,6 +16,7 @@
/// access to the 3D neighborhood values. The neighborhood is always cubic in
/// nature and is fixed at compile time.
#include <vtkm/exec/arg/ThreadIndicesPointNeighborhood.h>
#include <vtkm/worklet/DispatcherPointNeighborhood.h>
#include <vtkm/worklet/WorkletNeighborhood.h>
namespace vtkm
@ -23,9 +24,6 @@ namespace vtkm
namespace worklet
{
template <typename WorkletType>
class DispatcherPointNeighborhood;
class WorkletPointNeighborhood : public WorkletNeighborhood
{
public:

4
vtkm/worklet/WorkletReduceByKey.h
View File

@ -32,15 +32,13 @@
#include <vtkm/exec/arg/FetchTagKeysIn.h>
#include <vtkm/exec/arg/ThreadIndicesReduceByKey.h>
#include <vtkm/exec/arg/ValueCount.h>
#include <vtkm/worklet/DispatcherReduceByKey.h>
namespace vtkm
{
namespace worklet
{
template <typename WorkletType>
class DispatcherReduceByKey;
class WorkletReduceByKey : public vtkm::worklet::internal::WorkletBase
{
public:

1
vtkm/worklet/contour/FlyingEdgesPass1.h
View File

@ -13,6 +13,7 @@
#ifndef vtk_m_worklet_contour_flyingedges_pass1_h
#define vtk_m_worklet_contour_flyingedges_pass1_h
#include <vtkm/worklet/WorkletMapTopology.h>
#include <vtkm/worklet/contour/FlyingEdgesHelpers.h>
namespace vtkm

1
vtkm/worklet/contour/MarchingCells.h
View File

@ -28,6 +28,7 @@
#include <vtkm/worklet/ScatterCounting.h>
#include <vtkm/worklet/ScatterPermutation.h>
#include <vtkm/worklet/WorkletReduceByKey.h>
#include <vtkm/worklet/contour/CommonState.h>
#include <vtkm/worklet/contour/MarchingCellTables.h>
#include <vtkm/worklet/gradient/PointGradient.h>

6
vtkm/worklet/testing/UnitTestScatterAndMask.cxx
View File

@ -8,11 +8,11 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/DispatcherMapTopology.h>
#include <vtkm/worklet/DispatcherPointNeighborhood.h>
#include <vtkm/worklet/MaskIndices.h>
#include <vtkm/worklet/ScatterUniform.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/WorkletMapTopology.h>
#include <vtkm/worklet/WorkletPointNeighborhood.h>
#include <vtkm/cont/ArrayCopy.h>
#include <vtkm/cont/ArrayHandleConstant.h>