Run the update-control-signature-tags.sh script

This commit is contained in:
Kenneth Moreland 2019-01-10 11:59:25 -07:00
parent 16c2dfd8be
commit 2e426ad547
238 changed files with 1169 additions and 1323 deletions

@ -66,8 +66,7 @@ class BlackScholes : public vtkm::worklet::WorkletMapField
T Volatility;
public:
using ControlSignature =
void(FieldIn<Scalar>, FieldIn<Scalar>, FieldIn<Scalar>, FieldOut<Scalar>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldIn, FieldIn, FieldOut, FieldOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
BlackScholes(T risk, T volatility)
@ -129,7 +128,7 @@ public:
class Mag : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T, typename U>
@ -142,7 +141,7 @@ public:
class Square : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Scalar>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T, typename U>
@ -155,7 +154,7 @@ public:
class Sin : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Scalar>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T, typename U>
@ -168,7 +167,7 @@ public:
class Cos : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Scalar>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T, typename U>
@ -181,7 +180,7 @@ public:
class FusedMath : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T>
@ -201,7 +200,7 @@ public:
class GenerateEdges : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset, WholeArrayOut<> edgeIds);
using ControlSignature = void(CellSetIn cellset, WholeArrayOut edgeIds);
using ExecutionSignature = void(PointIndices, ThreadIndices, _2);
using InputDomain = _1;
@ -227,10 +226,10 @@ public:
class InterpolateField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Id2Type> interpolation_ids,
FieldIn<Scalar> interpolation_weights,
WholeArrayIn<> inputField,
FieldOut<> output);
using ControlSignature = void(FieldIn interpolation_ids,
FieldIn interpolation_weights,
WholeArrayIn inputField,
FieldOut output);
using ExecutionSignature = void(_1, _2, _3, _4);
using InputDomain = _1;
@ -260,7 +259,7 @@ template <typename ImplicitFunction>
class EvaluateImplicitFunction : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
EvaluateImplicitFunction(const ImplicitFunction* function)
@ -282,7 +281,7 @@ template <typename T1, typename T2>
class Evaluate2ImplicitFunctions : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
Evaluate2ImplicitFunctions(const T1* f1, const T2* f2)

@ -799,7 +799,7 @@ public:
struct PointVectorGenerator : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
vtkm::Bounds Bounds;

@ -55,9 +55,7 @@ enum BenchmarkName
class AveragePointToCell : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(FieldInPoint<> inPoints,
CellSetIn cellset,
FieldOutCell<> outCells);
using ControlSignature = void(FieldInPoint inPoints, CellSetIn cellset, FieldOutCell outCells);
using ExecutionSignature = void(_1, PointCount, _3);
using InputDomain = _2;
@ -79,7 +77,7 @@ public:
class AverageCellToPoint : public vtkm::worklet::WorkletMapCellToPoint
{
public:
using ControlSignature = void(FieldInCell<> inCells, CellSetIn topology, FieldOut<> outPoints);
using ControlSignature = void(FieldInCell inCells, CellSetIn topology, FieldOut outPoints);
using ExecutionSignature = void(_1, _3, CellCount);
using InputDomain = _2;
@ -106,9 +104,7 @@ template <typename T>
class Classification : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(FieldInPoint<> inNodes,
CellSetIn cellset,
FieldOutCell<IdComponentType> outCaseId);
using ControlSignature = void(FieldInPoint inNodes, CellSetIn cellset, FieldOutCell outCaseId);
using ExecutionSignature = void(_1, _3);
using InputDomain = _2;

@ -72,9 +72,9 @@ struct UpdateLifeState : public vtkm::worklet::WorkletPointNeighborhood
using CountingHandle = vtkm::cont::ArrayHandleCounting<vtkm::Id>;
using ControlSignature = void(CellSetIn,
FieldInNeighborhood<> prevstate,
FieldOut<> state,
FieldOut<> color);
FieldInNeighborhood prevstate,
FieldOut state,
FieldOut color);
using ExecutionSignature = void(_2, _3, _4);

@ -139,7 +139,7 @@ struct HelloVTKMInterop
{
}
using ControlSignature = void(FieldIn<>, FieldOut<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut, FieldOut);
using ExecutionSignature = void(_1, _2, _3);
VTKM_EXEC

@ -62,7 +62,7 @@ namespace
class TangleField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> vertexId, FieldOut<Scalar> v);
using ControlSignature = void(FieldIn vertexId, FieldOut v);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;

@ -34,7 +34,7 @@
struct WaveField : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T>

@ -68,7 +68,7 @@ using DeviceAdapter = VTKM_DEFAULT_DEVICE_ADAPTER_TAG;
class TangleField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> vertexId, FieldOut<Scalar> v);
using ControlSignature = void(FieldIn vertexId, FieldOut v);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;

@ -37,7 +37,7 @@ namespace worklet
class SineWorklet : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1, WorkIndex);
VTKM_EXEC

@ -79,11 +79,11 @@ public:
DIM>;
public:
using ControlSignature = void(FieldIn<Vec3> points,
using ControlSignature = void(FieldIn points,
WholeCellSetIn<> cellSet,
WholeArrayIn<Vec3> coordinates,
FieldOut<IdType> cellIds,
FieldOut<Vec3> parametricCoordinates);
WholeArrayIn coordinates,
FieldOut cellIds,
FieldOut parametricCoordinates);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
template <typename CoordsPortalType, vtkm::IdComponent DIM>

@ -280,9 +280,7 @@ public:
class CountBinsL1 : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> coords,
FieldOutCell<IdType> bincount);
using ControlSignature = void(CellSetIn cellset, FieldInPoint coords, FieldOutCell bincount);
using ExecutionSignature = void(_2, _3);
CountBinsL1(const vtkm::exec::twolevelgrid::Grid& grid)
@ -306,9 +304,9 @@ public:
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> coords,
FieldInCell<IdType> offsets,
WholeArrayOut<IdType> binIds);
FieldInPoint coords,
FieldInCell offsets,
WholeArrayOut binIds);
using ExecutionSignature = void(_2, _3, _4);
FindBinsL1(const vtkm::exec::twolevelgrid::Grid& grid)
@ -338,9 +336,7 @@ public:
class GenerateBinsL1 : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> binIds,
FieldIn<IdType> cellCounts,
WholeArrayOut<vtkm::ListTagBase<DimVec3>> dimensions);
using ControlSignature = void(FieldIn binIds, FieldIn cellCounts, WholeArrayOut dimensions);
using ExecutionSignature = void(_1, _2, _3);
using InputDomain = _1;
@ -368,9 +364,9 @@ public:
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> coords,
WholeArrayIn<vtkm::ListTagBase<DimVec3>> binDimensions,
FieldOutCell<IdType> bincount);
FieldInPoint coords,
WholeArrayIn binDimensions,
FieldOutCell bincount);
using ExecutionSignature = void(_2, _3, _4);
CountBinsL2(const vtkm::exec::twolevelgrid::Grid& grid)
@ -404,12 +400,12 @@ public:
{
public:
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);
FieldInPoint coords,
WholeArrayIn binDimensions,
WholeArrayIn binStarts,
FieldInCell offsets,
WholeArrayOut binIds,
WholeArrayOut cellIds);
using ExecutionSignature = void(InputIndex, _2, _3, _4, _5, _6, _7);
FindBinsL2(const vtkm::exec::twolevelgrid::Grid& grid)
@ -456,11 +452,11 @@ public:
class GenerateBinsL2 : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> binIds,
FieldIn<IdType> startsIn,
FieldIn<IdType> countsIn,
WholeArrayOut<IdType> startsOut,
WholeArrayOut<IdType> countsOut);
using ControlSignature = void(FieldIn binIds,
FieldIn startsIn,
FieldIn countsIn,
WholeArrayOut startsOut,
WholeArrayOut countsOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
using InputDomain = _1;
@ -622,12 +618,12 @@ public:
class FindCellWorklet : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3> points,
using ControlSignature = void(FieldIn points,
WholeCellSetIn<> cellSet,
WholeArrayIn<Vec3> coordinates,
WholeArrayIn coordinates,
ExecObject lookupStruct,
FieldOut<IdType> cellIds,
FieldOut<Vec3> parametricCoordinates);
FieldOut cellIds,
FieldOut parametricCoordinates);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6);
using InputDomain = _1;

@ -46,9 +46,7 @@ namespace internal
struct WriteConnectivity : public vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn cellset,
FieldInCell<IdType> offset,
WholeArrayOut<> connectivity);
using ControlSignature = void(CellSetIn cellset, FieldInCell offset, WholeArrayOut connectivity);
using ExecutionSignature = void(PointCount, PointIndices, _2, _3);
using InputDomain = _1;

@ -49,7 +49,7 @@ public:
class BinPointsWorklet : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<> coord, FieldOut<> label);
using ControlSignature = void(FieldIn coord, FieldOut label);
using ExecutionSignature = void(_1, _2);

@ -27,14 +27,14 @@ namespace
void TestControlSignatures()
{
VTKM_IS_CONTROL_SIGNATURE_TAG(vtkm::worklet::WorkletMapField::FieldIn<vtkm::Float32>);
VTKM_IS_CONTROL_SIGNATURE_TAG(vtkm::worklet::WorkletMapField::FieldIn);
VTKM_TEST_ASSERT(vtkm::cont::arg::internal::ControlSignatureTagCheck<
vtkm::worklet::WorkletMapField::FieldIn<vtkm::Id>>::Valid,
vtkm::worklet::WorkletMapField::FieldIn>::Valid,
"Bad check for FieldIn");
VTKM_TEST_ASSERT(vtkm::cont::arg::internal::ControlSignatureTagCheck<
vtkm::worklet::WorkletMapField::FieldOut<vtkm::Id>>::Valid,
vtkm::worklet::WorkletMapField::FieldOut>::Valid,
"Bad check for FieldOut");
VTKM_TEST_ASSERT(

@ -45,7 +45,7 @@ namespace
struct TriggerICE : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut);
using ExecutionSignature = _3(_1, _2, WorkIndex);
#if __CUDA_ARCH__

@ -39,7 +39,7 @@ namespace
struct CopyWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<FieldCommon> in, FieldOut<FieldCommon> out);
using ControlSignature = void(FieldIn in, FieldOut out);
using ExecutionSignature = _2(_1);
template <typename T>
@ -52,7 +52,7 @@ struct CopyWorklet : public vtkm::worklet::WorkletMapField
// A dummy worklet
struct DoubleWorklet : public vtkm::worklet::WorkletMapField
{
typedef void ControlSignature(FieldIn<FieldCommon> in);
typedef void ControlSignature(FieldIn in);
typedef void ExecutionSignature(_1);
using InputDomain = _1;

@ -90,7 +90,7 @@ struct TestingArrayHandles
struct PassThrough : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
template <class ValueType>

@ -55,11 +55,8 @@ public:
zAxis = coordsPortal.GetThirdPortal();
}
using ControlSignature = void(FieldIn<> pointIn,
ExecObject locator,
FieldOut<> cellId,
FieldOut<> parametric,
FieldOut<> match);
using ControlSignature =
void(FieldIn pointIn, ExecObject locator, FieldOut cellId, FieldOut parametric, FieldOut match);
using ExecutionSignature = void(_1, _2, _3, _4, _5);

@ -49,9 +49,9 @@ class ParametricToWorldCoordinates : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> coords,
FieldInOutCell<Vec3> pcs,
FieldOutCell<Vec3> wcs);
FieldInPoint coords,
FieldInOutCell pcs,
FieldOutCell wcs);
using ExecutionSignature = void(CellShape, _2, _3, _4);
using ScatterType = vtkm::worklet::ScatterPermutation<>;

@ -43,11 +43,8 @@ public:
{
}
using ControlSignature = void(FieldIn<> pointIn,
ExecObject locator,
FieldOut<> cellId,
FieldOut<> parametric,
FieldOut<> match);
using ControlSignature =
void(FieldIn pointIn, ExecObject locator, FieldOut cellId, FieldOut parametric, FieldOut match);
using ExecutionSignature = void(_1, _2, _3, _4, _5);

@ -230,7 +230,7 @@ private:
public:
struct PassThrough : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
template <class ValueType>
@ -242,7 +242,7 @@ public:
struct InplaceFunctorPair : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldInOut<>);
using ControlSignature = void(FieldInOut);
using ExecutionSignature = void(_1);
template <typename T>
@ -795,7 +795,7 @@ private:
// worklets.
struct GroupVariableInputWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>);
using ControlSignature = void(FieldIn);
using ExecutionSignature = void(_1, WorkIndex);
template <typename InputType>
@ -850,7 +850,7 @@ private:
// worklets.
struct GroupVariableOutputWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_2, WorkIndex);
template <typename OutputType>

@ -47,7 +47,7 @@ namespace implicit_function_detail
class EvaluateImplicitFunction : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
EvaluateImplicitFunction(const vtkm::ImplicitFunction* function)

@ -56,10 +56,10 @@ VTKM_EXEC_CONT vtkm::Id NNSVerify3D(CoordiVecT qc, CoordiPortalT coordiPortal, C
class NearestNeighborSearchBruteForce3DWorklet : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<> qcIn,
WholeArrayIn<> treeCoordiIn,
FieldOut<> nnIdOut,
FieldOut<> nnDisOut);
using ControlSignature = void(FieldIn qcIn,
WholeArrayIn treeCoordiIn,
FieldOut nnIdOut,
FieldOut nnDisOut);
using ExecutionSignature = void(_1, _2, _3, _4);
VTKM_CONT
@ -80,10 +80,10 @@ public:
class PointLocatorUniformGridWorklet : public vtkm::worklet::WorkletMapField
{
public:
typedef void ControlSignature(FieldIn<> qcIn,
typedef void ControlSignature(FieldIn qcIn,
ExecObject locator,
FieldOut<> nnIdOut,
FieldOut<> nnDistOut);
FieldOut nnIdOut,
FieldOut nnDistOut);
typedef void ExecutionSignature(_1, _2, _3, _4);

@ -77,7 +77,7 @@ vtkm::cont::CellSetExplicit<> MakeTestCellSet2()
struct WorkletPointToCell : public vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn cellset, FieldOutCell<IdType> numPoints);
using ControlSignature = void(CellSetIn cellset, FieldOutCell numPoints);
using ExecutionSignature = void(PointIndices, _2);
using InputDomain = _1;
@ -90,7 +90,7 @@ struct WorkletPointToCell : public vtkm::worklet::WorkletMapPointToCell
struct WorkletCellToPoint : public vtkm::worklet::WorkletMapCellToPoint
{
using ControlSignature = void(CellSetIn cellset, FieldOutPoint<IdType> numCells);
using ControlSignature = void(CellSetIn cellset, FieldOutPoint numCells);
using ExecutionSignature = void(CellIndices, _2);
using InputDomain = _1;

@ -32,7 +32,7 @@ namespace
struct WorkletPointToCell : public vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn cellset, FieldOutCell<IdType> numPoints);
using ControlSignature = void(CellSetIn cellset, FieldOutCell numPoints);
using ExecutionSignature = void(PointIndices, _2);
using InputDomain = _1;
@ -45,7 +45,7 @@ struct WorkletPointToCell : public vtkm::worklet::WorkletMapPointToCell
struct WorkletCellToPoint : public vtkm::worklet::WorkletMapCellToPoint
{
using ControlSignature = void(CellSetIn cellset, FieldOutPoint<IdType> numCells);
using ControlSignature = void(CellSetIn cellset, FieldOutPoint numCells);
using ExecutionSignature = void(CellIndices, _2);
using InputDomain = _1;
@ -58,9 +58,7 @@ struct WorkletCellToPoint : public vtkm::worklet::WorkletMapCellToPoint
struct CellsOfPoint : public vtkm::worklet::WorkletMapCellToPoint
{
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<IdType> offset,
WholeArrayOut<IdType> cellIds);
using ControlSignature = void(CellSetIn cellset, FieldInPoint offset, WholeArrayOut cellIds);
using ExecutionSignature = void(CellIndices, _2, _3);
using InputDomain = _1;

@ -48,7 +48,7 @@ static vtkm::cont::ArrayHandle<vtkm::Id> BasisParticlesValidity;
class ValidityCheck : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<> end_point, FieldIn<> steps, FieldInOut<> output);
using ControlSignature = void(FieldIn end_point, FieldIn steps, FieldInOut output);
using ExecutionSignature = void(_1, _2, _3);
using InputDomain = _1;

@ -31,7 +31,7 @@ namespace
class TangleField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> vertexId, FieldOut<Scalar> v);
using ControlSignature = void(FieldIn vertexId, FieldOut v);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;

@ -34,7 +34,7 @@ namespace vtkm_ut_mc_filter
class TangleField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> vertexId, FieldOut<Scalar> v);
using ControlSignature = void(FieldIn vertexId, FieldOut v);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;

@ -44,7 +44,7 @@ namespace internal
struct ClearBuffers : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldOut<>, FieldOut<>);
using ControlSignature = void(FieldOut, FieldOut);
using ExecutionSignature = void(_1, _2);
VTKM_CONT
@ -73,7 +73,7 @@ struct BlendBackground : public vtkm::worklet::WorkletMapField
{
}
using ControlSignature = void(FieldInOut<>);
using ControlSignature = void(FieldInOut);
using ExecutionSignature = void(_1);
VTKM_EXEC void operator()(vtkm::Vec<vtkm::Float32, 4>& color) const
@ -91,7 +91,7 @@ struct BlendBackground : public vtkm::worklet::WorkletMapField
struct DrawColorSwatch : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, WholeArrayInOut<>);
using ControlSignature = void(FieldIn, WholeArrayInOut);
using ExecutionSignature = void(_1, _2);
VTKM_CONT
@ -134,7 +134,7 @@ struct DrawColorSwatch : public vtkm::worklet::WorkletMapField
struct DrawColorBar : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, WholeArrayInOut<>, WholeArrayIn<>);
using ControlSignature = void(FieldIn, WholeArrayInOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3);
VTKM_CONT

@ -45,12 +45,12 @@ public:
{
}
using ControlSignature = void(FieldIn<>,
WholeArrayInOut<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
WholeArrayOut<vtkm::ListTagBase<vtkm::Float32>>,
using ControlSignature = void(FieldIn,
WholeArrayInOut,
FieldIn,
FieldIn,
FieldIn,
WholeArrayOut,
WholeArrayOut<vtkm::ListTagBase<vtkm::Vec<vtkm::Float32, 4>>>);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, WorkIndex);
template <typename Precision,

@ -47,7 +47,7 @@ public:
public:
VTKM_CONT
CountSegments() {}
typedef void ControlSignature(CellSetIn cellset, FieldOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldOut);
typedef void ExecutionSignature(CellShape, _2);
VTKM_EXEC
@ -92,7 +92,7 @@ public:
{
public:
typedef void ControlSignature(CellSetIn cellset, FieldInTo<>, WholeArrayOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldInTo, WholeArrayOut);
typedef void ExecutionSignature(FromIndices, _2, _3);
//typedef _1 InputDomain;
VTKM_CONT
@ -210,7 +210,7 @@ public:
public:
VTKM_CONT
Cylinderize() {}
typedef void ControlSignature(CellSetIn cellset, FieldInCell<>, WholeArrayOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldInCell, WholeArrayOut);
typedef void ExecutionSignature(_2, CellShape, PointIndices, WorkIndex, _3);
template <typename VecType, typename OutputPortal>

@ -46,7 +46,7 @@ public:
: eye_pos(_eye_pos)
{
}
typedef void ControlSignature(FieldIn<>, FieldOut<>);
typedef void ControlSignature(FieldIn, FieldOut);
typedef void ExecutionSignature(_1, _2);
template <typename VecType, typename OutType>
VTKM_EXEC inline void operator()(const VecType& pos, OutType& out) const

@ -59,12 +59,12 @@ public:
, SDiff(sDiff)
{
}
using ControlSignature = void(FieldIn<IdType> vertexId,
WholeArrayIn<Id4Type> indices,
WholeArrayIn<Scalar> scalar,
WholeArrayIn<Vec3> verts,
WholeArrayOut<Scalar> out_color,
WholeArrayOut<Scalar> out_vertices);
using ControlSignature = void(FieldIn vertexId,
WholeArrayIn indices,
WholeArrayIn scalar,
WholeArrayIn verts,
WholeArrayOut out_color,
WholeArrayOut out_vertices);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6);
template <typename InputArrayIndexPortalType,

@ -47,7 +47,7 @@ public:
VTKM_CONT
CreateConnectivity() {}
using ControlSignature = void(FieldIn<>, WholeArrayOut<>);
using ControlSignature = void(FieldIn, WholeArrayOut);
using ExecutionSignature = void(_1, _2);
@ -73,10 +73,7 @@ public:
{
}
using ControlSignature = void(FieldIn<>,
FieldIn<vtkm::TypeListTagScalarAll>,
FieldOut<>,
FieldOut<>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut, FieldOut);
using ExecutionSignature = void(_1, _2, _3, _4);
template <typename ScalarType>
@ -114,7 +111,7 @@ public:
#endif
struct EdgesCounter : public vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn cellSet, FieldOutCell<> numEdges);
using ControlSignature = void(CellSetIn cellSet, FieldOutCell numEdges);
using ExecutionSignature = _2(CellShape shape, PointCount numPoints);
using InputDomain = _1;
@ -135,7 +132,7 @@ struct EdgesCounter : public vtkm::worklet::WorkletMapPointToCell
struct EdgesExtracter : public vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn cellSet, FieldOutCell<> edgeIndices);
using ControlSignature = void(CellSetIn cellSet, FieldOutCell edgeIndices);
using ExecutionSignature = void(CellShape, PointIndices, VisitIndex, _2);
using InputDomain = _1;
using ScatterType = vtkm::worklet::ScatterCounting;

@ -46,7 +46,7 @@ public:
public:
VTKM_CONT
CountQuads() {}
typedef void ControlSignature(CellSetIn cellset, FieldOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldOut);
typedef void ExecutionSignature(CellShape, _2);
VTKM_EXEC
@ -86,7 +86,7 @@ public:
{
public:
typedef void ControlSignature(CellSetIn cellset, FieldInTo<>, WholeArrayOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldInTo, WholeArrayOut);
typedef void ExecutionSignature(FromIndices, _2, _3);
//typedef _1 InputDomain;
VTKM_CONT
@ -179,7 +179,7 @@ public:
public:
VTKM_CONT
Quadralize() {}
typedef void ControlSignature(CellSetIn cellset, FieldInCell<>, WholeArrayOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldInCell, WholeArrayOut);
typedef void ExecutionSignature(_2, CellShape, PointIndices, WorkIndex, _3);
template <typename VecType, typename OutputPortal>

@ -38,8 +38,7 @@ struct RenderBitmapFont : public vtkm::worklet::WorkletMapField
using DepthBufferType = vtkm::rendering::Canvas::DepthBufferType;
using FontTextureType = vtkm::rendering::Canvas::FontTextureType;
using ControlSignature =
void(FieldIn<>, FieldIn<>, ExecObject, WholeArrayInOut<>, WholeArrayInOut<>);
using ControlSignature = void(FieldIn, FieldIn, ExecObject, WholeArrayInOut, WholeArrayInOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
using InputDomain = _1;

@ -47,7 +47,7 @@ public:
public:
VTKM_CONT
CountTriangles() {}
using ControlSignature = void(CellSetIn cellset, FieldOut<>);
using ControlSignature = void(CellSetIn cellset, FieldOut);
using ExecutionSignature = void(CellShape, _2);
VTKM_EXEC
@ -87,7 +87,7 @@ public:
{
public:
using ControlSignature = void(CellSetIn cellset, FieldInTo<>, WholeArrayOut<>);
using ControlSignature = void(CellSetIn cellset, FieldInTo, WholeArrayOut);
using ExecutionSignature = void(FromIndices, _2, _3);
VTKM_CONT
TrianglulateStructured() {}
@ -192,7 +192,7 @@ public:
public:
VTKM_CONT
IndicesSort() {}
using ControlSignature = void(FieldInOut<>);
using ControlSignature = void(FieldInOut);
using ExecutionSignature = void(_1);
VTKM_EXEC
void operator()(vtkm::Vec<vtkm::Id, 4>& triangleIndices) const
@ -247,7 +247,7 @@ public:
UniqueTriangles() {}
using ControlSignature = void(WholeArrayIn<vtkm::ListTagBase<vtkm::Vec<vtkm::Id, 4>>>,
WholeArrayOut<vtkm::ListTagBase<vtkm::UInt8>>);
WholeArrayOut);
using ExecutionSignature = void(_1, _2, WorkIndex);
VTKM_EXEC
@ -278,7 +278,7 @@ public:
public:
VTKM_CONT
Trianglulate() {}
using ControlSignature = void(CellSetIn cellset, FieldInCell<>, WholeArrayOut<>);
using ControlSignature = void(CellSetIn cellset, FieldInCell, WholeArrayOut);
using ExecutionSignature = void(_2, CellShape, PointIndices, WorkIndex, _3);
template <typename VecType, typename OutputPortal>

@ -135,7 +135,7 @@ union PackedValue {
struct CopyIntoFrameBuffer : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2, _3);
VTKM_CONT
@ -161,7 +161,7 @@ public:
vtkm::exec::AtomicArrayExecutionObject<vtkm::Int64, DeviceTag>;
using AtomicPackedFrameBuffer = vtkm::cont::AtomicArray<vtkm::Int64>;
using ControlSignature = void(FieldIn<Id2Type>, WholeArrayIn<Vec3>, WholeArrayIn<Scalar>);
using ControlSignature = void(FieldIn, WholeArrayIn, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3);
using InputDomain = _1;
@ -397,8 +397,8 @@ public:
VTKM_CONT
BufferConverter() {}
using ControlSignature = void(FieldIn<>,
WholeArrayOut<vtkm::ListTagBase<vtkm::Float32>>,
using ControlSignature = void(FieldIn,
WholeArrayOut,
WholeArrayOut<vtkm::ListTagBase<vtkm::Vec<vtkm::Float32, 4>>>);
using ExecutionSignature = void(_1, _2, _3, WorkIndex);

@ -102,18 +102,18 @@ public:
public:
VTKM_CONT
Intersector() {}
using ControlSignature = void(FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>,
using ControlSignature = void(FieldIn,
FieldIn,
FieldOut,
FieldIn,
FieldIn,
FieldOut,
FieldOut,
FieldOut,
WholeArrayIn,
ExecObject leafIntersector,
WholeArrayIn<>,
WholeArrayIn<>);
WholeArrayIn,
WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12);

@ -90,7 +90,7 @@ class LinearBVHBuilder::CountingIterator : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
CountingIterator() {}
using ControlSignature = void(FieldOut<>);
using ControlSignature = void(FieldOut);
using ExecutionSignature = void(WorkIndex, _1);
VTKM_EXEC
void operator()(const vtkm::Id& index, vtkm::Id& outId) const { outId = index; }
@ -115,7 +115,7 @@ public:
{
this->OutputPortal = outputPortal.PrepareForOutput(size, Device());
}
using ControlSignature = void(FieldIn<>);
using ControlSignature = void(FieldIn);
using ExecutionSignature = void(WorkIndex, _1);
VTKM_EXEC
void operator()(const vtkm::Id& outIndex, const vtkm::Id& inIndex) const
@ -131,7 +131,7 @@ public:
VTKM_CONT
CreateLeafs() {}
typedef void ControlSignature(FieldIn<>, WholeArrayOut<>);
typedef void ControlSignature(FieldIn, WholeArrayOut);
typedef void ExecutionSignature(_1, _2, WorkIndex);
template <typename LeafPortalType>
@ -167,7 +167,7 @@ public:
{
this->OutputPortal = outputPortal.PrepareForOutput(size, Device());
}
using ControlSignature = void(FieldIn<>);
using ControlSignature = void(FieldIn);
using ExecutionSignature = void(WorkIndex, _1);
VTKM_EXEC
void operator()(const vtkm::Id& outIndex, const vtkm::Id& inIndex) const
@ -258,13 +258,13 @@ public:
{
this->FlatBVH = flatBVH.PrepareForOutput((LeafCount - 1) * 4, Device());
}
using ControlSignature = void(WholeArrayIn<Scalar>,
WholeArrayIn<Scalar>,
WholeArrayIn<Scalar>,
WholeArrayIn<Scalar>,
WholeArrayIn<Scalar>,
WholeArrayIn<Scalar>,
WholeArrayIn<>);
using ControlSignature = void(WholeArrayIn,
WholeArrayIn,
WholeArrayIn,
WholeArrayIn,
WholeArrayIn,
WholeArrayIn,
WholeArrayIn);
using ExecutionSignature = void(WorkIndex, _1, _2, _3, _4, _5, _6, _7);
template <typename InputPortalType, typename OffsetPortalType>
@ -483,7 +483,7 @@ public:
InnerCount = LeafCount - 1;
this->ParentPortal = parentHandle.PrepareForOutput(InnerCount + LeafCount, Device());
}
using ControlSignature = void(FieldOut<>, FieldOut<>);
using ControlSignature = void(FieldOut, FieldOut);
using ExecutionSignature = void(WorkIndex, _1, _2);
VTKM_EXEC
void operator()(const vtkm::Id& index, vtkm::Id& leftChild, vtkm::Id& rightChild) const

@ -108,7 +108,7 @@ public:
return rcp((fabs(f) < 1e-8f) ? 1e-8f : f);
}
using ControlSignature = void(FieldOut<>, FieldOut<>);
using ControlSignature = void(FieldOut, FieldOut);
using ExecutionSignature = void(WorkIndex, _1, _2);
VTKM_EXEC
@ -209,7 +209,7 @@ public:
CurrentSample = currentSample;
}
typedef void ControlSignature(FieldOut<>, FieldOut<>, FieldOut<>, FieldIn<>);
typedef void ControlSignature(FieldOut, FieldOut, FieldOut, FieldIn);
typedef void ExecutionSignature(WorkIndex, _1, _2, _3, _4);
VTKM_EXEC
@ -295,7 +295,7 @@ public:
}
using ControlSignature =
void(FieldOut<>, FieldOut<>, FieldOut<>, FieldOut<>, FieldOut<>, FieldOut<>, FieldOut<>);
void(FieldOut, FieldOut, FieldOut, FieldOut, FieldOut, FieldOut, FieldOut);
using ExecutionSignature = void(WorkIndex, _1, _2, _3, _4, _5, _6, _7);
template <typename Precision>
@ -386,7 +386,7 @@ public:
vtkm::Normalize(nlook);
}
using ControlSignature = void(FieldOut<>, FieldOut<>, FieldOut<>, FieldOut<>);
using ControlSignature = void(FieldOut, FieldOut, FieldOut, FieldOut);
using ExecutionSignature = void(WorkIndex, _1, _2, _3, _4);
template <typename Precision>

@ -44,7 +44,7 @@ class BufferAddition : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
BufferAddition() {}
using ControlSignature = void(FieldIn<>, FieldInOut<>);
using ControlSignature = void(FieldIn, FieldInOut);
using ExecutionSignature = void(_1, _2);
template <typename ValueType>
@ -59,7 +59,7 @@ class BufferMultiply : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
BufferMultiply() {}
using ControlSignature = void(FieldIn<>, FieldInOut<>);
using ControlSignature = void(FieldIn, FieldInOut);
using ExecutionSignature = void(_1, _2);
template <typename ValueType>
@ -166,7 +166,7 @@ public:
, ChannelNum(channel)
{
}
using ControlSignature = void(FieldOut<>, WholeArrayIn<>);
using ControlSignature = void(FieldOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, WorkIndex);
template <typename T, typename BufferPortalType>
VTKM_EXEC void operator()(T& outValue,
@ -236,7 +236,7 @@ public:
: NumChannels(numChannels)
{
}
using ControlSignature = void(FieldIn<>, WholeArrayIn<>, WholeArrayOut<>);
using ControlSignature = void(FieldIn, WholeArrayIn, WholeArrayOut);
using ExecutionSignature = void(_1, _2, _3, WorkIndex);
template <typename T, typename IndexPortalType, typename BufferPortalType>
VTKM_EXEC void operator()(const T& inValue,
@ -358,7 +358,7 @@ public:
InvDeltaScalar = 1.f / (maxScalar - minScalar);
}
}
using ControlSignature = void(FieldInOut<>);
using ControlSignature = void(FieldInOut);
using ExecutionSignature = void(_1);
VTKM_EXEC

@ -51,7 +51,7 @@ public:
: NumChannels(numChannels)
{
}
using ControlSignature = void(FieldIn<>, WholeArrayIn<>, FieldIn<>, WholeArrayOut<>);
using ControlSignature = void(FieldIn, WholeArrayIn, FieldIn, WholeArrayOut);
using ExecutionSignature = void(_1, _2, _3, _4, WorkIndex);
template <typename InBufferPortalType, typename OutBufferPortalType>
VTKM_EXEC void operator()(const vtkm::UInt8& mask,
@ -86,7 +86,7 @@ public:
: NumChannels(numChannels)
{
}
using ControlSignature = void(FieldOut<>, WholeArrayIn<>);
using ControlSignature = void(FieldOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, WorkIndex);
template <typename ValueType, typename PortalType>
VTKM_EXEC void operator()(ValueType& outValue,

@ -70,7 +70,7 @@ public:
: SampleDistance(sampleDistance)
{
}
using ControlSignature = void(FieldIn<>, FieldInOut<>);
using ControlSignature = void(FieldIn, FieldInOut);
using ExecutionSignature = void(_1, _2);
template <typename FloatType>
VTKM_EXEC inline void operator()(const vtkm::UInt8& status, FloatType& currentDistance) const
@ -356,7 +356,7 @@ public:
: Offset(offset)
{
}
using ControlSignature = void(FieldIn<>, FieldInOut<>);
using ControlSignature = void(FieldIn, FieldInOut);
using ExecutionSignature = void(_1, _2);
VTKM_EXEC inline void operator()(const vtkm::UInt8& status, FloatType& distance) const
@ -374,14 +374,14 @@ private:
public:
LocateCell() {}
using ControlSignature = void(FieldInOut<>,
WholeArrayIn<>,
FieldIn<>,
FieldInOut<>,
FieldInOut<>,
FieldInOut<>,
FieldInOut<>,
FieldIn<>,
using ControlSignature = void(FieldInOut,
WholeArrayIn,
FieldIn,
FieldInOut,
FieldInOut,
FieldInOut,
FieldInOut,
FieldIn,
ExecObject meshConnectivity);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8, _9);
@ -481,14 +481,14 @@ public:
}
using ControlSignature = void(FieldInOut<>,
WholeArrayIn<>,
FieldInOut<>,
FieldInOut<>,
FieldInOut<>,
FieldInOut<>,
FieldIn<>,
FieldInOut<>,
using ControlSignature = void(FieldInOut,
WholeArrayIn,
FieldInOut,
FieldInOut,
FieldInOut,
FieldInOut,
FieldIn,
FieldInOut,
ExecObject meshConnectivity);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8, _9);
@ -595,10 +595,10 @@ public:
VTKM_CONT
AddPathLengths() {}
using ControlSignature = void(FieldIn<RayStatusType>, // ray status
FieldIn<ScalarRenderingTypes>, // cell enter distance
FieldIn<ScalarRenderingTypes>, // cell exit distance
FieldInOut<ScalarRenderingTypes>); // ray absorption data
using ControlSignature = void(FieldIn, // ray status
FieldIn, // cell enter distance
FieldIn, // cell exit distance
FieldInOut); // ray absorption data
using ExecutionSignature = void(_1, _2, _3, _4);
@ -637,13 +637,13 @@ public:
{
}
using ControlSignature = void(FieldIn<RayStatusType>, // ray status
FieldIn<ScalarRenderingTypes>, // cell enter distance
FieldIn<ScalarRenderingTypes>, // cell exit distance
FieldInOut<ScalarRenderingTypes>, // current distance
WholeArrayIn<ScalarRenderingTypes>, // cell absorption data array
WholeArrayInOut<ScalarRenderingTypes>, // ray absorption data
FieldIn<IdType>); // current cell
using ControlSignature = void(FieldIn, // ray status
FieldIn, // cell enter distance
FieldIn, // cell exit distance
FieldInOut, // current distance
WholeArrayIn, // cell absorption data array
WholeArrayInOut, // ray absorption data
FieldIn); // current cell
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, WorkIndex);
@ -702,15 +702,15 @@ public:
{
}
using ControlSignature = void(FieldIn<>, // ray status
FieldIn<>, // cell enter distance
FieldIn<>, // cell exit distance
FieldInOut<>, // current distance
WholeArrayIn<ScalarRenderingTypes>, // cell absorption data array
WholeArrayIn<ScalarRenderingTypes>, // cell emission data array
WholeArrayInOut<>, // ray absorption data
WholeArrayInOut<>, // ray emission data
FieldIn<>); // current cell
using ControlSignature = void(FieldIn, // ray status
FieldIn, // cell enter distance
FieldIn, // cell exit distance
FieldInOut, // current distance
WholeArrayIn, // cell absorption data array
WholeArrayIn, // cell emission data array
WholeArrayInOut, // ray absorption data
WholeArrayInOut, // ray emission data
FieldIn); // current cell
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8, _9, WorkIndex);
@ -805,7 +805,7 @@ public:
, BGColor(bgcolor)
{
}
using ControlSignature = void(FieldIn<>, WholeArrayIn<>);
using ControlSignature = void(FieldIn, WholeArrayIn);
using ExecutionSignature = void(_1, _2);
@ -890,14 +890,14 @@ public:
}
using ControlSignature = void(FieldIn<>,
WholeArrayIn<ScalarRenderingTypes>,
FieldIn<>,
FieldIn<>,
FieldInOut<>,
FieldInOut<>,
WholeArrayIn<>,
WholeArrayInOut<>);
using ControlSignature = void(FieldIn,
WholeArrayIn,
FieldIn,
FieldIn,
FieldInOut,
FieldInOut,
WholeArrayIn,
WholeArrayInOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8, WorkIndex);
template <typename ScalarPortalType, typename ColorMapType, typename FrameBufferType>
@ -996,18 +996,18 @@ public:
}
using ControlSignature = void(FieldIn<>,
WholeArrayIn<Vec3>,
WholeArrayIn<ScalarRenderingTypes>,
FieldIn<>,
FieldIn<>,
FieldInOut<>,
FieldIn<>,
FieldInOut<>,
FieldIn<>,
using ControlSignature = void(FieldIn,
WholeArrayIn,
WholeArrayIn,
FieldIn,
FieldIn,
FieldInOut,
FieldIn,
FieldInOut,
FieldIn,
ExecObject meshConnectivity,
WholeArrayIn<>,
WholeArrayInOut<>);
WholeArrayIn,
WholeArrayInOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8, WorkIndex, _9, _10, _11, _12);
template <typename PointPortalType,

@ -41,7 +41,7 @@ class CountSegments : public vtkm::worklet::WorkletMapPointToCell
public:
VTKM_CONT
CountSegments() {}
typedef void ControlSignature(CellSetIn cellset, FieldOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldOut);
typedef void ExecutionSignature(CellShape, _2);
VTKM_EXEC
@ -77,7 +77,7 @@ class Pointify : public vtkm::worklet::WorkletMapPointToCell
public:
VTKM_CONT
Pointify() {}
typedef void ControlSignature(CellSetIn cellset, FieldInCell<>, WholeArrayOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldInCell, WholeArrayOut);
typedef void ExecutionSignature(_2, CellShape, PointIndices, WorkIndex, _3);
template <typename VecType, typename OutputPortal>
@ -160,7 +160,7 @@ class Iterator : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
Iterator() {}
typedef void ControlSignature(FieldOut<>);
typedef void ControlSignature(FieldOut);
typedef void ExecutionSignature(_1, WorkIndex);
VTKM_EXEC
void operator()(vtkm::Id2& index, const vtkm::Id2& idx) const { index = idx; }
@ -190,7 +190,7 @@ public:
InverseDelta = 0.f; // just map scalar to 0;
}
typedef void ControlSignature(FieldIn<>, FieldOut<>, WholeArrayIn<Scalar>);
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3);
template <typename ScalarPortalType>

@ -39,15 +39,15 @@ class FindCylinderAABBs : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
FindCylinderAABBs() {}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>);
typedef void ControlSignature(FieldIn,
FieldIn,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7, _8, _9);
template <typename PointPortalType>
VTKM_EXEC void operator()(const vtkm::Id3 cylId,
@ -330,13 +330,8 @@ class CalculateNormals : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
CalculateNormals() {}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>,
WholeArrayIn<>);
typedef void
ControlSignature(FieldIn, FieldIn, FieldOut, FieldOut, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7);
template <typename Precision, typename PointPortalType, typename IndicesPortalType>
VTKM_EXEC inline void operator()(const vtkm::Id& hitIndex,
@ -396,10 +391,7 @@ public:
else
invDeltaScalar = 1.f / minScalar;
}
typedef void ControlSignature(FieldIn<>,
FieldInOut<>,
WholeArrayIn<ScalarRenderingTypes>,
WholeArrayIn<>);
typedef void ControlSignature(FieldIn, FieldInOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4);
template <typename ScalarPortalType, typename IndicesPortalType>
VTKM_EXEC void operator()(const vtkm::Id& hitIndex,

@ -51,7 +51,7 @@ class CountFaces : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
CountFaces() {}
using ControlSignature = void(WholeArrayIn<>, FieldOut<>);
using ControlSignature = void(WholeArrayIn, FieldOut);
using ExecutionSignature = void(_1, _2, WorkIndex);
template <typename ShapePortalType>
VTKM_EXEC inline void operator()(const ShapePortalType& shapes,
@ -88,13 +88,13 @@ class MortonNeighbor : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
MortonNeighbor() {}
using ControlSignature = void(WholeArrayIn<>,
WholeArrayInOut<Id3Type>,
WholeArrayIn<>,
WholeArrayIn<>,
WholeArrayIn<>,
WholeArrayOut<>,
WholeArrayInOut<>);
using ControlSignature = void(WholeArrayIn,
WholeArrayInOut,
WholeArrayIn,
WholeArrayIn,
WholeArrayIn,
WholeArrayOut,
WholeArrayInOut);
using ExecutionSignature = void(_1, _2, WorkIndex, _3, _4, _5, _6, _7);
VTKM_EXEC
@ -269,7 +269,7 @@ public:
VTKM_CONT
ExternalTriangles() {}
using ControlSignature =
void(FieldIn<>, WholeArrayIn<>, WholeArrayIn<>, WholeArrayIn<>, WholeArrayOut<>, FieldIn<>);
void(FieldIn, WholeArrayIn, WholeArrayIn, WholeArrayIn, WholeArrayOut, FieldIn);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6);
template <typename ShapePortalType,
typename InIndicesPortalType,
@ -331,7 +331,7 @@ public:
class WriteFaceConn : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<>, WholeArrayIn<>, WholeArrayOut<IdType>);
using ControlSignature = void(FieldIn, WholeArrayIn, WholeArrayOut);
using ExecutionSignature = void(_1, _2, _3);
VTKM_CONT
@ -383,7 +383,7 @@ public:
Segments[5] = Segments[4] + cellDims[1] * cellDims[0];
Segments[6] = Segments[5] + cellDims[1] * cellDims[0];
}
using ControlSignature = void(FieldIn<>, WholeArrayOut<>);
using ControlSignature = void(FieldIn, WholeArrayOut);
using ExecutionSignature = void(_1, _2);
template <typename TrianglePortalType>
VTKM_EXEC inline void operator()(const vtkm::Id& index, TrianglePortalType& triangles) const
@ -489,7 +489,7 @@ class CountExternalTriangles : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
CountExternalTriangles() {}
using ControlSignature = void(FieldIn<>, WholeArrayIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, WholeArrayIn, FieldOut);
using ExecutionSignature = void(_1, _2, _3);
template <typename ShapePortalType>
VTKM_EXEC inline void operator()(const vtkm::Vec<vtkm::Id, 3>& faceIdPair,

@ -151,7 +151,7 @@ public:
}
using ControlSignature =
void(CellSetIn cellset, WholeArrayIn<>, FieldInTo<>, WholeArrayOut<>, WholeArrayOut<>);
void(CellSetIn cellset, WholeArrayIn, FieldInTo, WholeArrayOut, WholeArrayOut);
using ExecutionSignature = void(CellShape, FromIndices, WorkIndex, _2, _3, _4, _5);
@ -262,8 +262,7 @@ public:
{
}
using ControlSignature =
void(FieldIn<>, FieldIn<>, FieldIn<>, FieldIn<>, FieldIn<>, FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldIn, FieldIn, FieldIn, FieldIn, FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7);
typedef _7 InputDomain;

@ -41,7 +41,7 @@ class CountQuads : public vtkm::worklet::WorkletMapPointToCell
public:
VTKM_CONT
CountQuads() {}
typedef void ControlSignature(CellSetIn cellset, FieldOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldOut);
typedef void ExecutionSignature(CellShape, _2);
VTKM_EXEC
@ -73,7 +73,7 @@ class Pointify : public vtkm::worklet::WorkletMapPointToCell
public:
VTKM_CONT
Pointify() {}
typedef void ControlSignature(CellSetIn cellset, FieldInCell<>, WholeArrayOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldInCell, WholeArrayOut);
typedef void ExecutionSignature(_2, CellShape, PointIndices, WorkIndex, _3);
template <typename VecType, typename OutputPortal>
@ -148,7 +148,7 @@ class Iterator : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
Iterator() {}
typedef void ControlSignature(FieldOut<>);
typedef void ControlSignature(FieldOut);
typedef void ExecutionSignature(_1, WorkIndex);
VTKM_EXEC
void operator()(vtkm::Id2& index, const vtkm::Id2& idx) const { index = idx; }
@ -178,7 +178,7 @@ public:
InverseDelta = 0.f; // just map scalar to 0;
}
typedef void ControlSignature(FieldIn<>, FieldOut<>, WholeArrayIn<Scalar>);
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3);
template <typename ScalarPortalType>

@ -40,14 +40,14 @@ class FindQuadAABBs : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
FindQuadAABBs() {}
typedef void ControlSignature(FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>);
typedef void ControlSignature(FieldIn,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7, _8);
template <typename PointPortalType>
VTKM_EXEC void operator()(const vtkm::Vec<vtkm::Id, 5> quadId,
@ -327,13 +327,8 @@ class CalculateNormals : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
CalculateNormals() {}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>,
WholeArrayIn<>);
typedef void
ControlSignature(FieldIn, FieldIn, FieldOut, FieldOut, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7);
template <typename Precision, typename PointPortalType, typename IndicesPortalType>
VTKM_EXEC inline void operator()(const vtkm::Id& hitIndex,
@ -386,10 +381,7 @@ public:
else
invDeltaScalar = 1.f / minScalar;
}
typedef void ControlSignature(FieldIn<>,
FieldOut<>,
WholeArrayIn<ScalarRenderingTypes>,
WholeArrayIn<>);
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4);
template <typename ScalarPortalType, typename IndicesPortalType>
VTKM_EXEC void operator()(const vtkm::Id& hitIndex,

@ -41,7 +41,7 @@ class RayStatusFilter : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
RayStatusFilter() {}
using ControlSignature = void(FieldIn<>, FieldInOut<>);
using ControlSignature = void(FieldIn, FieldInOut);
using ExecutionSignature = void(_1, _2);
VTKM_EXEC
void operator()(const vtkm::Id& hitIndex, vtkm::UInt8& rayStatus) const
@ -79,7 +79,7 @@ public:
DoubleInvWidth = 2.f / static_cast<vtkm::Float32>(width);
}
using ControlSignature = void(FieldIn<>, FieldInOut<>, WholeArrayIn<>);
using ControlSignature = void(FieldIn, FieldInOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3);
template <typename Precision, typename DepthPortalType>

@ -78,7 +78,7 @@ public:
}
using ControlSignature =
void(FieldIn<>, FieldIn<>, FieldIn<>, FieldIn<>, WholeArrayInOut<>, WholeArrayIn<>);
void(FieldIn, FieldIn, FieldIn, FieldIn, WholeArrayInOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, WorkIndex);
template <typename ColorPortalType, typename Precision, typename ColorMapPortalType>
@ -148,7 +148,7 @@ public:
VTKM_CONT
MapScalarToColor() {}
using ControlSignature = void(FieldIn<>, FieldIn<>, WholeArrayInOut<>, WholeArrayIn<>);
using ControlSignature = void(FieldIn, FieldIn, WholeArrayInOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3, _4, WorkIndex);
template <typename ColorPortalType, typename Precision, typename ColorMapPortalType>

@ -32,14 +32,14 @@ namespace
class IntersectionPointMap : public vtkm::worklet::WorkletMapField
{
public:
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldInOut<>,
FieldInOut<>,
FieldInOut<>,
FieldInOut<>);
typedef void ControlSignature(FieldIn,
FieldIn,
FieldIn,
FieldIn,
FieldInOut,
FieldInOut,
FieldInOut,
FieldInOut);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7, _8);
template <typename Precision>
VTKM_EXEC inline void operator()(const vtkm::Id& hitIndex,

@ -40,7 +40,7 @@ class CountPoints : public vtkm::worklet::WorkletMapPointToCell
public:
VTKM_CONT
CountPoints() {}
typedef void ControlSignature(CellSetIn cellset, FieldOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldOut);
typedef void ExecutionSignature(CellShape, _2);
VTKM_EXEC
@ -72,7 +72,7 @@ class Pointify : public vtkm::worklet::WorkletMapPointToCell
public:
VTKM_CONT
Pointify() {}
typedef void ControlSignature(CellSetIn cellset, FieldInCell<>, WholeArrayOut<>);
typedef void ControlSignature(CellSetIn cellset, FieldInCell, WholeArrayOut);
typedef void ExecutionSignature(_2, CellShape, PointIndices, WorkIndex, _3);
template <typename VecType, typename OutputPortal>
@ -114,7 +114,7 @@ class Iterator : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
Iterator() {}
typedef void ControlSignature(FieldOut<>);
typedef void ControlSignature(FieldOut);
typedef void ExecutionSignature(_1, WorkIndex);
VTKM_EXEC
void operator()(vtkm::Id& index, const vtkm::Id& idx) const { index = idx; }
@ -144,7 +144,7 @@ public:
InverseDelta = 0.f; // just map scalar to 0;
}
typedef void ControlSignature(FieldIn<>, FieldOut<>, WholeArrayIn<Scalar>);
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3);
template <typename ScalarPortalType>

@ -41,15 +41,15 @@ class FindSphereAABBs : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
FindSphereAABBs() {}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>);
typedef void ControlSignature(FieldIn,
FieldIn,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7, _8, _9);
template <typename PointPortalType>
VTKM_EXEC void operator()(const vtkm::Id pointId,
@ -222,13 +222,8 @@ class CalculateNormals : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
CalculateNormals() {}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>,
WholeArrayIn<>);
typedef void
ControlSignature(FieldIn, FieldIn, FieldOut, FieldOut, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7);
template <typename Precision, typename PointPortalType, typename IndicesPortalType>
VTKM_EXEC inline void operator()(const vtkm::Id& hitIndex,
@ -274,10 +269,7 @@ public:
else
invDeltaScalar = 1.f / minScalar;
}
typedef void ControlSignature(FieldIn<>,
FieldOut<>,
WholeArrayIn<ScalarRenderingTypes>,
WholeArrayIn<>);
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4);
template <typename ScalarPortalType, typename IndicesPortalType>
VTKM_EXEC void operator()(const vtkm::Id& hitIndex,

@ -188,7 +188,7 @@ class CellIndexFilter : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
CellIndexFilter() {}
typedef void ControlSignature(FieldInOut<>, WholeArrayIn<>);
typedef void ControlSignature(FieldInOut, WholeArrayIn);
typedef void ExecutionSignature(_1, _2);
template <typename TrianglePortalType>
VTKM_EXEC void operator()(vtkm::Id& hitIndex, TrianglePortalType& triangles) const
@ -213,13 +213,8 @@ public:
public:
VTKM_CONT
CalculateNormals() {}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>,
WholeArrayIn<>);
typedef void
ControlSignature(FieldIn, FieldIn, FieldOut, FieldOut, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7);
template <typename Precision, typename PointPortalType, typename IndicesPortalType>
VTKM_EXEC inline void operator()(const vtkm::Id& hitIndex,
@ -269,12 +264,12 @@ public:
else
invDeltaScalar = 0.f;
}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldInOut<>,
WholeArrayIn<ScalarRenderingTypes>,
WholeArrayIn<>);
typedef void ControlSignature(FieldIn,
FieldIn,
FieldIn,
FieldInOut,
WholeArrayIn,
WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6);
template <typename ScalarPortalType, typename IndicesPortalType>
VTKM_EXEC void operator()(const vtkm::Id& hitIndex,
@ -319,10 +314,7 @@ public:
invDeltaScalar = 1.f / minScalar;
}
typedef void ControlSignature(FieldIn<>,
FieldOut<>,
WholeArrayIn<ScalarRenderingTypes>,
WholeArrayIn<>);
typedef void ControlSignature(FieldIn, FieldOut, WholeArrayIn, WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4);
template <typename ScalarPortalType, typename IndicesPortalType>
@ -386,14 +378,14 @@ class FindTriangleAABBs : public vtkm::worklet::WorkletMapField
public:
VTKM_CONT
FindTriangleAABBs() {}
typedef void ControlSignature(FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
WholeArrayIn<Vec3RenderingTypes>);
typedef void ControlSignature(FieldIn,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
FieldOut,
WholeArrayIn);
typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7, _8);
template <typename PointPortalType>
VTKM_EXEC void operator()(const vtkm::Vec<vtkm::Id, 4> indices,

@ -340,12 +340,7 @@ public:
}
}
using ControlSignature = void(FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
WholeArrayInOut<>,
WholeArrayIn<ScalarRenderingTypes>);
using ControlSignature = void(FieldIn, FieldIn, FieldIn, FieldIn, WholeArrayInOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, WorkIndex);
template <typename ScalarPortalType, typename ColorBufferType>
@ -537,12 +532,7 @@ public:
InverseDeltaScalar = 1.f / (maxScalar - minScalar);
}
}
using ControlSignature = void(FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
WholeArrayInOut<>,
WholeArrayIn<ScalarRenderingTypes>);
using ControlSignature = void(FieldIn, FieldIn, FieldIn, FieldIn, WholeArrayInOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, WorkIndex);
template <typename ScalarPortalType, typename ColorBufferType>
@ -684,7 +674,7 @@ public:
VTKM_EXEC
vtkm::Float32 rcp_safe(vtkm::Float32 f) const { return rcp((fabs(f) < 1e-8f) ? 1e-8f : f); }
using ControlSignature = void(FieldIn<>, FieldOut<>, FieldInOut<>, FieldInOut<>, FieldIn<>);
using ControlSignature = void(FieldIn, FieldOut, FieldInOut, FieldInOut, FieldIn);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
template <typename Precision>
VTKM_EXEC void operator()(const vtkm::Vec<Precision, 3>& rayDir,

@ -40,7 +40,7 @@ public:
: Value(value)
{
}
using ControlSignature = void(FieldOut<>);
using ControlSignature = void(FieldOut);
using ExecutionSignature = void(_1);
VTKM_EXEC
void operator()(T& outValue) const { outValue = Value; }
@ -57,7 +57,7 @@ public:
: Offset(offset)
{
}
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
VTKM_EXEC inline void operator()(const FloatType& inValue, FloatType& outValue) const
@ -79,7 +79,7 @@ public:
, MaskValue(mask)
{
}
using ControlSignature = void(FieldIn<>, FieldInOut<>, FieldIn<>);
using ControlSignature = void(FieldIn, FieldInOut, FieldIn);
using ExecutionSignature = void(_1, _2, _3);
template <typename MaskType>
@ -103,7 +103,7 @@ public:
: Value(value)
{
}
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename O>
@ -127,7 +127,7 @@ public:
: Values(values)
{
}
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename O>

@ -43,7 +43,7 @@ struct AverageByKey
{
struct AverageWorklet : public vtkm::worklet::WorkletReduceByKey
{
using ControlSignature = void(KeysIn keys, ValuesIn<> valuesIn, ReducedValuesOut<> averages);
using ControlSignature = void(KeysIn keys, ValuesIn valuesIn, ReducedValuesOut averages);
using ExecutionSignature = _3(_2);
using InputDomain = _1;
@ -109,7 +109,7 @@ struct AverageByKey
struct DivideWorklet : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2, _3);
template <class ValueType>

@ -34,9 +34,7 @@ namespace worklet
class CellAverage : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<> inPoints,
FieldOutCell<> outCells);
using ControlSignature = void(CellSetIn cellset, FieldInPoint inPoints, FieldOutCell outCells);
using ExecutionSignature = void(PointCount, _2, _3);
using InputDomain = _1;

@ -40,7 +40,7 @@ struct CellDeepCopy
{
struct CountCellPoints : vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn inputTopology, FieldOut<> numPointsInCell);
using ControlSignature = void(CellSetIn inputTopology, FieldOut numPointsInCell);
using ExecutionSignature = _2(PointCount);
VTKM_EXEC
@ -49,9 +49,7 @@ struct CellDeepCopy
struct PassCellStructure : vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn inputTopology,
FieldOut<> shapes,
FieldOut<> pointIndices);
using ControlSignature = void(CellSetIn inputTopology, FieldOut shapes, FieldOut pointIndices);
using ExecutionSignature = void(CellShape, PointIndices, _2, _3);
template <typename CellShape, typename InPointIndexType, typename OutPointIndexType>

@ -74,8 +74,8 @@ class CellMeasure : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> pointCoords,
FieldOutCell<Scalar> volumesOut);
FieldInPoint pointCoords,
FieldOutCell volumesOut);
using ExecutionSignature = void(CellShape, PointCount, _2, _3);
using InputDomain = _1;

@ -245,11 +245,8 @@ public:
{
}
using ControlSignature = void(CellSetIn,
FieldInPoint<ScalarAll>,
ExecObject clippingData,
FieldOutCell<TypeClipStats>,
FieldOutCell<IdType>);
using ControlSignature =
void(CellSetIn, FieldInPoint, ExecObject clippingData, FieldOutCell, FieldOutCell);
using ExecutionSignature = void(CellShape, PointCount, _2, _3, _4, _5);
@ -337,19 +334,19 @@ public:
}
using ControlSignature = void(CellSetIn,
FieldInPoint<ScalarAll>,
FieldInCell<IdType> clipTableIndices,
FieldInCell<TypeClipStats> clipStats,
FieldInPoint,
FieldInCell clipTableIndices,
FieldInCell clipStats,
ExecObject clipTables,
ExecObject connectivityObject,
WholeArrayOut<IdType> edgePointReverseConnectivity,
WholeArrayOut<TypeEdgeInterp> edgePointInterpolation,
WholeArrayOut<IdType> inCellReverseConnectivity,
WholeArrayOut<IdType> inCellEdgeReverseConnectivity,
WholeArrayOut<TypeEdgeInterp> inCellEdgeInterpolation,
WholeArrayOut<IdType> inCellInterpolationKeys,
WholeArrayOut<IdType> inCellInterpolationInfo,
WholeArrayOut<IdType> cellMapOutputToInput);
WholeArrayOut edgePointReverseConnectivity,
WholeArrayOut edgePointInterpolation,
WholeArrayOut inCellReverseConnectivity,
WholeArrayOut inCellEdgeReverseConnectivity,
WholeArrayOut inCellEdgeInterpolation,
WholeArrayOut inCellInterpolationKeys,
WholeArrayOut inCellInterpolationInfo,
WholeArrayOut cellMapOutputToInput);
using ExecutionSignature = void(CellShape,
WorkIndex,
@ -540,9 +537,9 @@ public:
{
}
using ControlSignature = void(FieldIn<IdType> sourceValue,
FieldIn<IdType> destinationIndices,
WholeArrayOut<IdType> destinationData);
using ControlSignature = void(FieldIn sourceValue,
FieldIn destinationIndices,
WholeArrayOut destinationData);
using ExecutionSignature = void(_1, _2, _3);
@ -569,8 +566,7 @@ public:
{
}
using ControlSignature = void(FieldIn<IdType> destinationIndices,
WholeArrayOut<IdType> destinationData);
using ControlSignature = void(FieldIn destinationIndices, WholeArrayOut destinationData);
using ExecutionSignature = void(_1, _2);
@ -794,8 +790,7 @@ public:
{
}
using ControlSignature = void(FieldIn<TypeEdgeInterp> edgeInterpolations,
WholeArrayInOut<> outputField);
using ControlSignature = void(FieldIn edgeInterpolations, WholeArrayInOut outputField);
using ExecutionSignature = void(_1, _2, WorkIndex);
@ -818,9 +813,7 @@ public:
class PerformInCellInterpolations : public vtkm::worklet::WorkletReduceByKey
{
public:
using ControlSignature = void(KeysIn keys,
ValuesIn<TypeMappedValue> toReduce,
ReducedValuesOut<TypeMappedValue> centroid);
using ControlSignature = void(KeysIn keys, ValuesIn toReduce, ReducedValuesOut centroid);
using ExecutionSignature = void(_2, _3);

@ -37,7 +37,7 @@ namespace detail
template <typename T>
struct CylToCar : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
//Functor
@ -53,7 +53,7 @@ struct CylToCar : public vtkm::worklet::WorkletMapField
template <typename T>
struct CarToCyl : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
//Functor
@ -77,7 +77,7 @@ struct CarToCyl : public vtkm::worklet::WorkletMapField
template <typename T>
struct SphereToCar : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
//Functor
@ -104,7 +104,7 @@ struct SphereToCar : public vtkm::worklet::WorkletMapField
template <typename T>
struct CarToSphere : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
//Functor

@ -32,7 +32,7 @@ namespace worklet
class CrossProduct : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<VecAll>, FieldIn<VecAll>, FieldOut<VecAll>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2, _3);
template <typename T>

@ -32,7 +32,7 @@ namespace worklet
class DotProduct : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<VecAll>, FieldIn<VecAll>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2, _3);
template <typename T, vtkm::IdComponent Size>

@ -60,8 +60,8 @@ struct ExternalFaces
{
public:
using ControlSignature = void(CellSetIn inCellSet,
FieldOut<> numFacesInCell,
FieldInPoint<Vec3> pointCoordinates);
FieldOut numFacesInCell,
FieldInPoint pointCoordinates);
using ExecutionSignature = _2(CellShape, _3);
using InputDomain = _1;
@ -133,10 +133,10 @@ struct ExternalFaces
public:
using ControlSignature = void(CellSetIn inCellSet,
WholeCellSetIn<> inputCell,
FieldOut<> faceShapes,
FieldOut<> facePointCount,
FieldOut<> faceConnectivity,
FieldInPoint<Vec3> pointCoordinates);
FieldOut faceShapes,
FieldOut facePointCount,
FieldOut faceConnectivity,
FieldInPoint pointCoordinates);
using ExecutionSignature = void(CellShape, VisitIndex, InputIndex, _2, _3, _4, _5, _6);
using InputDomain = _1;
@ -322,7 +322,7 @@ struct ExternalFaces
class NumFacesPerCell : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn inCellSet, FieldOut<> numFacesInCell);
using ControlSignature = void(CellSetIn inCellSet, FieldOut numFacesInCell);
using ExecutionSignature = _2(CellShape);
using InputDomain = _1;
@ -338,9 +338,9 @@ struct ExternalFaces
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldOut<> faceHashes,
FieldOut<> originCells,
FieldOut<> originFaces);
FieldOut faceHashes,
FieldOut originCells,
FieldOut originFaces);
using ExecutionSignature = void(_2, _3, _4, CellShape, FromIndices, InputIndex, VisitIndex);
using InputDomain = _1;
@ -371,9 +371,9 @@ struct ExternalFaces
public:
using ControlSignature = void(KeysIn keys,
WholeCellSetIn<> inputCells,
ValuesIn<> originCells,
ValuesIn<> originFaces,
ReducedValuesOut<> numOutputCells);
ValuesIn originCells,
ValuesIn originFaces,
ReducedValuesOut numOutputCells);
using ExecutionSignature = _5(_2, _3, _4);
using InputDomain = _1;
@ -488,9 +488,9 @@ public:
public:
using ControlSignature = void(KeysIn keys,
WholeCellSetIn<> inputCells,
ValuesIn<> originCells,
ValuesIn<> originFaces,
ReducedValuesOut<> numPointsInFace);
ValuesIn originCells,
ValuesIn originFaces,
ReducedValuesOut numPointsInFace);
using ExecutionSignature = _5(_2, _3, _4, VisitIndex);
using InputDomain = _1;
@ -523,11 +523,11 @@ public:
public:
using ControlSignature = void(KeysIn keys,
WholeCellSetIn<> inputCells,
ValuesIn<> originCells,
ValuesIn<> originFaces,
ReducedValuesOut<> shapesOut,
ReducedValuesOut<> connectivityOut,
ReducedValuesOut<> cellIdMapOut);
ValuesIn originCells,
ValuesIn originFaces,
ReducedValuesOut shapesOut,
ReducedValuesOut connectivityOut,
ReducedValuesOut cellIdMapOut);
using ExecutionSignature = void(_2, _3, _4, VisitIndex, _5, _6, _7);
using InputDomain = _1;
@ -572,7 +572,7 @@ public:
class IsPolyDataCell : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn inCellSet, FieldOut<> isPolyDataCell);
using ControlSignature = void(CellSetIn inCellSet, FieldOut isPolyDataCell);
using ExecutionSignature = _2(CellShape);
using InputDomain = _1;
@ -588,7 +588,7 @@ public:
public:
using ScatterType = vtkm::worklet::ScatterCounting;
using ControlSignature = void(CellSetIn inCellSet, FieldOut<> numPoints);
using ControlSignature = void(CellSetIn inCellSet, FieldOut numPoints);
using ExecutionSignature = _2(PointCount);
using InputDomain = _1;
@ -601,9 +601,9 @@ public:
using ScatterType = vtkm::worklet::ScatterCounting;
using ControlSignature = void(CellSetIn inputTopology,
FieldOut<> shapes,
FieldOut<> pointIndices,
FieldOut<> cellIdMapOut);
FieldOut shapes,
FieldOut pointIndices,
FieldOut cellIdMapOut);
using ExecutionSignature = void(CellShape, PointIndices, InputIndex, _2, _3, _4);
template <typename CellShape, typename InPointIndexType, typename OutPointIndexType>

@ -49,9 +49,9 @@ public:
{
public:
using ControlSignature = void(CellSetIn cellset,
WholeArrayIn<Vec3> coordinates,
WholeArrayIn coordinates,
ExecObject implicitFunction,
FieldOutCell<BoolType> passFlags);
FieldOutCell passFlags);
using ExecutionSignature = _4(PointCount, PointIndices, _2, _3);
ExtractCellsByVOI() = default;

@ -48,9 +48,9 @@ public:
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> coordinates,
FieldInPoint coordinates,
ExecObject function,
FieldOutPoint<BoolType> passFlags);
FieldOutPoint passFlags);
using ExecutionSignature = _4(_2, _3);
VTKM_CONT

@ -44,7 +44,7 @@ public:
class SetBinInformationContent : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<> freq, FieldOut<> informationContent);
using ControlSignature = void(FieldIn freq, FieldOut informationContent);
using ExecutionSignature = void(_1, _2);
vtkm::Float64 FreqSum;

@ -67,7 +67,7 @@ public:
class SetHistogramBin : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<> value, FieldOut<> binIndex);
using ControlSignature = void(FieldIn value, FieldOut binIndex);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;
@ -98,9 +98,7 @@ public:
class AdjacentDifference : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> inputIndex,
WholeArrayIn<IdType> counts,
FieldOut<IdType> outputCount);
using ControlSignature = void(FieldIn inputIndex, WholeArrayIn counts, FieldOut outputCount);
using ExecutionSignature = void(_1, _2, _3);
using InputDomain = _1;

@ -66,11 +66,11 @@ public:
class CalculatePowers : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<> value,
FieldOut<> pow1Array,
FieldOut<> pow2Array,
FieldOut<> pow3Array,
FieldOut<> pow4Array);
using ControlSignature = void(FieldIn value,
FieldOut pow1Array,
FieldOut pow2Array,
FieldOut pow3Array,
FieldOut pow4Array);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
using InputDomain = _1;
@ -99,7 +99,7 @@ public:
class SubtractConst : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<> value, FieldOut<> diff);
using ControlSignature = void(FieldIn value, FieldOut diff);
using ExecutionSignature = _2(_1);
using InputDomain = _1;

@ -167,7 +167,7 @@ struct KernelSplatterFilterUniformGrid
//-----------------------------------------------------------------------
struct zero_voxel : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, WorkIndex, _2);
//
VTKM_CONT
@ -197,14 +197,8 @@ struct KernelSplatterFilterUniformGrid
Kernel kernel_;
public:
using ControlSignature = void(FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>,
FieldOut<>,
FieldOut<>);
using ControlSignature =
void(FieldIn, FieldIn, FieldIn, FieldIn, FieldOut, FieldOut, FieldOut, FieldOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8);
VTKM_CONT
@ -263,7 +257,7 @@ struct KernelSplatterFilterUniformGrid
class ComputeLocalNeighborId : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<>, FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2, WorkIndex, _3);
VTKM_CONT
@ -295,14 +289,8 @@ struct KernelSplatterFilterUniformGrid
Kernel kernel;
public:
using ControlSignature = void(FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldIn<>,
FieldOut<>,
FieldOut<>);
using ControlSignature =
void(FieldIn, FieldIn, FieldIn, FieldIn, FieldIn, FieldIn, FieldOut, FieldOut);
using ExecutionSignature = void(_1, _2, _3, _4, _5, _6, _7, _8);
VTKM_CONT
@ -360,7 +348,7 @@ struct KernelSplatterFilterUniformGrid
class UpdateVoxelSplats : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<>, FieldIn<>, WholeArrayOut<Scalar>);
using ControlSignature = void(FieldIn, FieldIn, WholeArrayOut);
using ExecutionSignature = void(_1, _2, _3);
VTKM_CONT

@ -32,7 +32,7 @@ namespace worklet
class Magnitude : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<VecAll>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T, typename T2>

@ -115,11 +115,11 @@ public:
{
};
using ControlSignature = void(WholeArrayIn<ClassifyCellTagType> isoValues,
FieldInPoint<ClassifyCellTagType> fieldIn,
using ControlSignature = void(WholeArrayIn isoValues,
FieldInPoint fieldIn,
CellSetIn cellset,
FieldOutCell<IdComponentType> outNumTriangles,
WholeArrayIn<IdComponentType> numTrianglesTable);
FieldOutCell outNumTriangles,
WholeArrayIn numTrianglesTable);
using ExecutionSignature = void(CellShape, _1, _2, _4, _5);
using InputDomain = _3;
@ -286,12 +286,11 @@ public:
return ScatterType(numOutputTrisPerCell);
}
typedef void ControlSignature(
CellSetIn cellset, // Cell set
WholeArrayIn<ClassifyCellTagType> isoValues,
FieldInPoint<ClassifyCellTagType> fieldIn, // Input point field defining the contour
ExecObject metaData // Metadata for edge weight generation
);
typedef void ControlSignature(CellSetIn cellset, // Cell set
WholeArrayIn isoValues,
FieldInPoint fieldIn, // Input point field defining the contour
ExecObject metaData // Metadata for edge weight generation
);
using ExecutionSignature =
void(CellShape, _2, _3, _4, InputIndex, WorkIndex, VisitIndex, FromIndices);
@ -410,10 +409,10 @@ private:
class MapPointField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Id2Type> interpolation_ids,
FieldIn<Scalar> interpolation_weights,
WholeArrayIn<> inputField,
FieldOut<> output);
using ControlSignature = void(FieldIn interpolation_ids,
FieldIn interpolation_weights,
WholeArrayIn inputField,
FieldOut output);
using ExecutionSignature = void(_1, _2, _3, _4);
using InputDomain = _1;
@ -460,10 +459,10 @@ struct MultiContourLess
struct MergeDuplicateValues : vtkm::worklet::WorkletReduceByKey
{
using ControlSignature = void(KeysIn keys,
ValuesIn<> valuesIn1,
ValuesIn<> valuesIn2,
ReducedValuesOut<> valueOut1,
ReducedValuesOut<> valueOut2);
ValuesIn valuesIn1,
ValuesIn valuesIn2,
ReducedValuesOut valueOut1,
ReducedValuesOut valueOut2);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
using InputDomain = _1;
@ -486,7 +485,7 @@ struct MergeDuplicateValues : vtkm::worklet::WorkletReduceByKey
// ---------------------------------------------------------------------------
struct CopyEdgeIds : vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;
@ -548,9 +547,9 @@ private:
public:
using ControlSignature = void(CellSetIn,
WholeCellSetIn<Point, Cell>,
WholeArrayIn<Vec3> pointCoordinates,
WholeArrayIn<Scalar> inputField,
FieldOutPoint<Vec3> normals);
WholeArrayIn pointCoordinates,
WholeArrayIn inputField,
FieldOutPoint normals);
using ExecutionSignature = void(CellCount, CellIndices, InputIndex, _2, _3, _4, _5);
@ -620,10 +619,10 @@ private:
public:
typedef void ControlSignature(CellSetIn,
WholeCellSetIn<Point, Cell>,
WholeArrayIn<Vec3> pointCoordinates,
WholeArrayIn<Scalar> inputField,
WholeArrayIn<Scalar> weights,
FieldInOutPoint<Vec3> normals);
WholeArrayIn pointCoordinates,
WholeArrayIn inputField,
WholeArrayIn weights,
FieldInOutPoint normals);
using ExecutionSignature =
void(CellCount, CellIndices, InputIndex, _2, _3, _4, WorkIndex, _5, _6);

@ -32,7 +32,7 @@ namespace worklet
class Normal : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<VecAll>, FieldOut<VecAll>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
template <typename T, typename T2>
@ -45,7 +45,7 @@ public:
class Normalize : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldInOut<VecAll>);
using ControlSignature = void(FieldInOut);
using ExecutionSignature = void(_1);
template <typename T>

@ -59,7 +59,7 @@ struct Oscillator
class OscillatorSource : public vtkm::worklet::WorkletMapField
{
public:
typedef void ControlSignature(FieldIn<Vec3>, FieldOut<Scalar>);
typedef void ControlSignature(FieldIn, FieldOut);
typedef _2 ExecutionSignature(_1);
VTKM_CONT

@ -36,8 +36,8 @@ class PointAverage : public vtkm::worklet::WorkletMapCellToPoint
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInCell<> inCellField,
FieldOutPoint<> outPointField);
FieldInCell inCellField,
FieldOutPoint outPointField);
using ExecutionSignature = void(CellCount, _2, _3);
using InputDomain = _1;

@ -43,7 +43,7 @@ VTKM_EXEC T clamp(const T& val, const T& min, const T& max)
class PointElevation : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Scalar>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
VTKM_CONT

@ -35,7 +35,7 @@ template <typename T>
class PointTransform : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = _2(_1);
VTKM_CONT

@ -72,10 +72,10 @@ public:
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> coords,
WholeArrayIn<Vec3> points,
WholeArrayOut<IdType> cellIds,
WholeArrayOut<Vec3> parametricCoords);
FieldInPoint coords,
WholeArrayIn points,
WholeArrayOut cellIds,
WholeArrayOut parametricCoords);
using ExecutionSignature = void(InputIndex, CellShape, _2, _3, _4, _5);
using InputDomain = _1;
@ -177,11 +177,11 @@ public:
class InterpolatePointField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> cellIds,
FieldIn<Vec3> parametricCoords,
using ControlSignature = void(FieldIn cellIds,
FieldIn parametricCoords,
WholeCellSetIn<> inputCells,
WholeArrayIn<> inputField,
FieldOut<> result);
WholeArrayIn inputField,
FieldOut result);
using ExecutionSignature = void(_1, _2, _3, _4, _5);
template <typename ParametricCoordType, typename CellSetType, typename InputFieldPortalType>
@ -223,9 +223,7 @@ public:
class MapCellField : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> cellIds,
WholeArrayIn<> inputField,
FieldOut<> result);
using ControlSignature = void(FieldIn cellIds, WholeArrayIn inputField, FieldOut result);
using ExecutionSignature = void(_1, _2, _3);
template <typename InputFieldPortalType>
@ -258,8 +256,7 @@ public:
//============================================================================
struct HiddenPointsWorklet : public WorkletMapField
{
using ControlSignature = void(FieldIn<IdType> cellids,
FieldOut<vtkm::ListTagBase<vtkm::UInt8>> hfield);
using ControlSignature = void(FieldIn cellids, FieldOut hfield);
using ExecutionSignature = _2(_1);
VTKM_EXEC vtkm::UInt8 operator()(vtkm::Id cellId) const { return (cellId == -1) ? HIDDEN : 0; }
@ -279,9 +276,7 @@ public:
//============================================================================
struct HiddenCellsWorklet : public WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<IdType> cellids,
FieldOutCell<vtkm::ListTagBase<vtkm::UInt8>>);
using ControlSignature = void(CellSetIn cellset, FieldInPoint cellids, FieldOutCell);
using ExecutionSignature = _3(_2, PointCount);
template <typename CellIdsVecType>

@ -52,7 +52,7 @@ public:
///
struct GeneratePointMask : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> pointIndices, WholeArrayInOut<> pointMask);
using ControlSignature = void(FieldIn pointIndices, WholeArrayInOut pointMask);
using ExecutionSignature = void(_1, _2);
template <typename PointMaskPortalType>
@ -69,9 +69,7 @@ public:
///
struct TransformPointIndices : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<IdType> pointIndex,
WholeArrayIn<IdType> indexMap,
FieldOut<IdType> mappedPoints);
using ControlSignature = void(FieldIn pointIndex, WholeArrayIn indexMap, FieldOut mappedPoints);
using ExecutionSignature = _3(_1, _2);
template <typename IndexMapPortalType>

@ -60,10 +60,10 @@ ShiftArrayHandleByOne(const vtkm::cont::ArrayHandle<vtkm::Id>& array)
struct ReverseInputToOutputMapWorklet : vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<IdType> outputStartIndices,
FieldIn<IdType> outputEndIndices,
WholeArrayOut<IdType> outputToInputMap,
WholeArrayOut<IdComponentType> visit);
using ControlSignature = void(FieldIn outputStartIndices,
FieldIn outputEndIndices,
WholeArrayOut outputToInputMap,
WholeArrayOut visit);
using ExecutionSignature = void(_1, _2, _3, _4, InputIndex);
using InputDomain = _2;
@ -98,8 +98,7 @@ struct ReverseInputToOutputMapWorklet : vtkm::worklet::WorkletMapField
struct SubtractToVisitIndexWorklet : vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<IdType> startsOfGroup,
WholeArrayOut<IdComponentType> visit);
using ControlSignature = void(FieldIn startsOfGroup, WholeArrayOut visit);
using ExecutionSignature = void(InputIndex, _1, _2);
using InputDomain = _1;

@ -161,9 +161,9 @@ public:
}
using ControlSignature = void(CellSetIn intputCells,
WholeCellSetIn<Point, Cell>, // Query points from cell
FieldInCell<Vec3> faceNormals,
FieldOutPoint<IdType> newPointNum,
FieldOutPoint<IdType> cellNum);
FieldInCell faceNormals,
FieldOutPoint newPointNum,
FieldOutPoint cellNum);
using ExecutionSignature = void(CellIndices incidentCells,
InputIndex pointIndex,
_2 pFromCellSet,
@ -304,10 +304,10 @@ public:
}
using ControlSignature = void(CellSetIn intputCells,
WholeCellSetIn<Point, Cell>, // Query points from cell
FieldInCell<Vec3> faceNormals,
FieldInPoint<IdType> newPointStartingIndex,
FieldInPoint<IdType> pointCellsStartingIndex,
WholeArrayOut<Id3Type> cellTopologyUpdateTuples);
FieldInCell faceNormals,
FieldInPoint newPointStartingIndex,
FieldInPoint pointCellsStartingIndex,
WholeArrayOut cellTopologyUpdateTuples);
using ExecutionSignature = void(CellIndices incidentCells,
InputIndex pointIndex,
_2 pFromCellSet,

@ -163,11 +163,11 @@ public:
class MakeStreamLines : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType> seedId,
FieldIn<> position,
WholeArrayOut<IdComponentType> numIndices,
WholeArrayOut<IdComponentType> validPoint,
WholeArrayOut<Vec3> streamLines);
using ControlSignature = void(FieldIn seedId,
FieldIn position,
WholeArrayOut numIndices,
WholeArrayOut validPoint,
WholeArrayOut streamLines);
using ExecutionSignature = void(_1, _2, _3, _4, _5, VisitIndex);
using InputDomain = _1;

@ -62,9 +62,7 @@ public:
class Worklet : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<Vec3> points,
FieldOutCell<Vec3> normals);
using ControlSignature = void(CellSetIn cellset, FieldInPoint points, FieldOutCell normals);
using ExecutionSignature = void(CellShape, _2, _3);
using InputDomain = _1;
@ -170,8 +168,8 @@ public:
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInCell<Vec3> faceNormals,
FieldOutPoint<Vec3> pointNormals);
FieldInCell faceNormals,
FieldOutPoint pointNormals);
using ExecutionSignature = void(CellCount, _2, _3);
using InputDomain = _1;

@ -36,7 +36,7 @@ public:
//
struct DistributeCellData : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> inIndices, FieldOut<> outIndices);
using ControlSignature = void(FieldIn inIndices, FieldOut outIndices);
using ExecutionSignature = void(_1, _2);
using ScatterType = vtkm::worklet::ScatterCounting;

@ -54,9 +54,7 @@ public:
class ThresholdByPointField : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<ScalarAll> scalars,
FieldOutCell<BoolType> passFlags);
using ControlSignature = void(CellSetIn cellset, FieldInPoint scalars, FieldOutCell passFlags);
using ExecutionSignature = _3(_2, PointCount);
@ -91,9 +89,7 @@ public:
class ThresholdByCellField : public vtkm::worklet::WorkletMapPointToCell
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInTo<ScalarAll> scalars,
FieldOut<BoolType> passFlags);
using ControlSignature = void(CellSetIn cellset, FieldInTo scalars, FieldOut passFlags);
using ExecutionSignature = _3(_2);

@ -43,9 +43,7 @@ public:
class ThresholdPointField : public vtkm::worklet::WorkletMapCellToPoint
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<ScalarAll> scalars,
FieldOutPoint<BoolType> passFlags);
using ControlSignature = void(CellSetIn cellset, FieldInPoint scalars, FieldOutPoint passFlags);
using ExecutionSignature = _3(_2);
VTKM_CONT

@ -36,7 +36,7 @@ public:
//
struct DistributeCellData : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> inIndices, FieldOut<> outIndices);
using ControlSignature = void(FieldIn inIndices, FieldOut outIndices);
using ExecutionSignature = void(_1, _2);
using ScatterType = vtkm::worklet::ScatterCounting;

@ -61,7 +61,7 @@ namespace internal
/// in a cluster.
struct SelectRepresentativePoint : public vtkm::worklet::WorkletReduceByKey
{
using ControlSignature = void(KeysIn clusterIds, ValuesIn<> points, ReducedValuesOut<> repPoints);
using ControlSignature = void(KeysIn clusterIds, ValuesIn points, ReducedValuesOut repPoints);
using ExecutionSignature = _3(_2);
using InputDomain = _1;
@ -150,7 +150,7 @@ struct VertexClustering
GridInfo Grid;
public:
using ControlSignature = void(FieldIn<Vec3>, FieldOut<IdType>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
VTKM_CONT
@ -189,8 +189,8 @@ struct VertexClustering
{
public:
using ControlSignature = void(CellSetIn cellset,
FieldInPoint<IdType> pointClusterIds,
FieldOutCell<Id3Type> cellClusterIds);
FieldInPoint pointClusterIds,
FieldOutCell cellClusterIds);
using ExecutionSignature = void(_2, _3);
VTKM_CONT
@ -211,7 +211,7 @@ struct VertexClustering
class IndexingWorklet : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<IdType>, WholeArrayOut<IdType>);
using ControlSignature = void(FieldIn, WholeArrayOut);
using ExecutionSignature = void(WorkIndex, _1, _2); // WorkIndex: use vtkm indexing
template <typename OutPortalType>
@ -237,7 +237,7 @@ struct VertexClustering
}
public:
using ControlSignature = void(FieldIn<Id3Type>, FieldOut<Id3Type>, WholeArrayIn<IdType>);
using ControlSignature = void(FieldIn, FieldOut, WholeArrayIn);
using ExecutionSignature = void(_1, _2, _3);
VTKM_CONT
@ -285,7 +285,7 @@ struct VertexClustering
vtkm::Int64 NPoints;
public:
using ControlSignature = void(FieldIn<Id3Type>, FieldOut<TypeInt64>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
VTKM_CONT
@ -308,7 +308,7 @@ struct VertexClustering
vtkm::Int64 NPoints;
public:
using ControlSignature = void(FieldIn<TypeInt64>, FieldOut<Id3Type>);
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
VTKM_CONT

@ -42,7 +42,7 @@ public:
class WarpScalarImp : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<>, FieldIn<>, FieldIn<>, FieldOut<>);
using ControlSignature = void(FieldIn, FieldIn, FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2, _3, _4);
VTKM_CONT
WarpScalarImp(vtkm::FloatDefault scaleAmount)

@ -43,7 +43,7 @@ public:
class WarpVectorImp : public vtkm::worklet::WorkletMapField
{
public:
using ControlSignature = void(FieldIn<Vec3>, FieldIn<Vec3>, FieldOut<Vec3>);
using ControlSignature = void(FieldIn, FieldIn, FieldOut);
using ExecutionSignature = _3(_1, _2);
VTKM_CONT
WarpVectorImp(vtkm::FloatDefault scale)

@ -33,7 +33,7 @@ namespace colorconversion
struct ConvertToRGB : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> in, FieldOut<> out);
using ControlSignature = void(FieldIn in, FieldOut out);
using ExecutionSignature = _2(_1);
template <typename T>

@ -33,7 +33,7 @@ namespace colorconversion
struct ConvertToRGBA : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> in, FieldOut<> out);
using ControlSignature = void(FieldIn in, FieldOut out);
using ExecutionSignature = _2(_1);
ConvertToRGBA(vtkm::Float32 alpha)

@ -72,9 +72,7 @@ struct LookupTable : public vtkm::worklet::WorkletMapField
this->NumberOfSamples = colorTableSamples.NumberOfSamples;
}
using ControlSignature = void(FieldIn<> in,
WholeArrayIn<LookupTableTypes> lookup,
FieldOut<> color);
using ControlSignature = void(FieldIn in, WholeArrayIn lookup, FieldOut color);
using ExecutionSignature = void(_1, _2, _3);
template <typename T, typename WholeFieldIn, typename U, int N>

@ -35,7 +35,7 @@ namespace colorconversion
struct ShiftScaleToRGB : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> in, FieldOut<> out);
using ControlSignature = void(FieldIn in, FieldOut out);
using ExecutionSignature = _2(_1);
ShiftScaleToRGB(vtkm::Float32 shift, vtkm::Float32 scale)

@ -40,7 +40,7 @@ struct ShiftScaleToRGBA : public vtkm::worklet::WorkletMapField
const vtkm::Float32 Scale;
const vtkm::Float32 Alpha;
using ControlSignature = void(FieldIn<> in, FieldOut<> out);
using ControlSignature = void(FieldIn in, FieldOut out);
using ExecutionSignature = _2(_1);
ShiftScaleToRGBA(vtkm::Float32 shift, vtkm::Float32 scale, vtkm::Float32 alpha)

@ -40,7 +40,7 @@ struct TransferFunction : public vtkm::worklet::WorkletMapField
{
}
using ControlSignature = void(FieldIn<> in, FieldOut<> color);
using ControlSignature = void(FieldIn in, FieldOut color);
using ExecutionSignature = void(_1, _2);
template <typename T>

@ -38,7 +38,7 @@ namespace detail
{
struct EdgeCount : public vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn, FieldOutCell<> numEdgesInCell);
using ControlSignature = void(CellSetIn, FieldOutCell numEdgesInCell);
using ExecutionSignature = _2(CellShape, PointCount);
@ -53,7 +53,7 @@ struct EdgeCount : public vtkm::worklet::WorkletMapPointToCell
struct EdgeExtract : public vtkm::worklet::WorkletMapPointToCell
{
using ControlSignature = void(CellSetIn, FieldOutCell<> cellIndices, FieldOutCell<> edgeIndices);
using ControlSignature = void(CellSetIn, FieldOutCell cellIndices, FieldOutCell edgeIndices);
using ExecutionSignature = void(CellShape, InputIndex, PointIndices, VisitIndex, _2, _3);
@ -80,10 +80,10 @@ struct EdgeExtract : public vtkm::worklet::WorkletMapPointToCell
struct CellToCellConnectivity : public vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn<> index,
WholeArrayIn<> cells,
WholeArrayOut<> from,
WholeArrayOut<> to);
using ControlSignature = void(FieldIn index,
WholeArrayIn cells,
WholeArrayOut from,
WholeArrayOut to);
using ExecutionSignature = void(_1, InputIndex, _2, _3, _4);

Some files were not shown because too many files have changed in this diff Show More