Reverse Invoker, Dispatcher and Worklet dependency
This commit is contained in:
parent
567b1fedd2
commit
f333182476
@ -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,12 +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))
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
#include <vtkm/cont/ArrayCopy.h>
|
||||
#include <vtkm/source/Tangle.h>
|
||||
#include <vtkm/worklet/WorkletMapTopology.h>
|
||||
|
||||
namespace vtkm
|
||||
{
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
#include <vtkm/source/Wavelet.h>
|
||||
#include <vtkm/worklet/WorkletMapField.h>
|
||||
#include <vtkm/worklet/WorkletMapTopology.h>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -20,6 +20,7 @@ namespace vtkm
|
||||
{
|
||||
namespace worklet
|
||||
{
|
||||
class WorkletCellNeighborhood;
|
||||
|
||||
/// \brief Dispatcher for worklets that inherit from \c WorkletCellNeighborhood.
|
||||
///
|
||||
|
@ -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>
|
||||
|
@ -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.
|
||||
///
|
||||
|
@ -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.
|
||||
///
|
||||
|
@ -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.
|
||||
///
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user