Commit 2e426ad5 authored by Kenneth Moreland's avatar Kenneth Moreland

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

parent 16c2dfd8
......@@ -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);