fix merge conflict with master branch, update to control signature
This commit is contained in:
parent
2a9439ab1e
commit
746c98e6c8
@ -76,7 +76,7 @@ public:
|
||||
class IsStar : public vtkm::worklet::WorkletMapField
|
||||
{
|
||||
public:
|
||||
typedef void ControlSignature(FieldIn<IdType> index, WholeArrayIn<IdType> comp, FieldOut<bool>);
|
||||
typedef void ControlSignature(FieldIn<IdType> index, WholeArrayIn<IdType> comp, FieldOut<>);
|
||||
typedef _3 ExecutionSignature(_1, _2);
|
||||
typedef _1 InputDomain;
|
||||
|
||||
|
@ -21,7 +21,11 @@
|
||||
#ifndef vtk_m_worklet_connectivity_InnerJoin_h
|
||||
#define vtk_m_worklet_connectivity_InnerJoin_h
|
||||
|
||||
#include <vtkm/cont/ArrayHandleCounting.h>
|
||||
#include <vtkm/cont/DeviceAdapter.h>
|
||||
#include <vtkm/worklet/DispatcherMapField.h>
|
||||
#include <vtkm/worklet/ScatterCounting.h>
|
||||
#include <vtkm/worklet/WorkletMapField.h>
|
||||
|
||||
template <typename DeviceAdapter>
|
||||
class InnerJoin
|
||||
@ -32,7 +36,7 @@ public:
|
||||
typedef void ControlSignature(FieldIn<>,
|
||||
FieldIn<>,
|
||||
FieldIn<>,
|
||||
WholeArrayIn<vtkm::Id>,
|
||||
WholeArrayIn<>,
|
||||
FieldOut<>,
|
||||
FieldOut<>,
|
||||
FieldOut<>);
|
||||
@ -50,19 +54,16 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
template <typename KeyType,
|
||||
typename InValue1,
|
||||
typename InPortalType,
|
||||
typename OutValue1,
|
||||
typename OutValue2>
|
||||
// TODO: type trait for array portal?
|
||||
template <typename KeyType, typename ValueType1, typename InPortalType, typename ValueType2>
|
||||
VTKM_EXEC void operator()(KeyType key,
|
||||
InValue1 value1,
|
||||
ValueType1 value1,
|
||||
vtkm::Id lowerBounds,
|
||||
vtkm::Id visitIndex,
|
||||
const InPortalType& value2,
|
||||
KeyType& keyOut,
|
||||
OutValue1& value1Out,
|
||||
OutValue2& value2Out) const
|
||||
vtkm::Id& keyOut,
|
||||
ValueType1& value1Out,
|
||||
ValueType2& value2Out) const
|
||||
{
|
||||
auto v2 = value2.Get(lowerBounds + visitIndex);
|
||||
keyOut = key;
|
||||
|
@ -2,11 +2,8 @@
|
||||
// Created by ollie on 12/19/17.
|
||||
//
|
||||
|
||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
//#include <vtkm/worklet/ScatterCounting.h>
|
||||
//#include <vtkm/worklet/WorkletMapTopology.h>
|
||||
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
#include <vtkm/worklet/connectivities/InnerJoin.h>
|
||||
|
||||
template <typename DeviceAdapter>
|
||||
|
Loading…
Reference in New Issue
Block a user