Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Change ExecutionWholeArray interface to match expected for ArrayPortal

Browse Source 
When ExecutionWholeArray is passed to a worklet, it is expected to
behave like an array portal. However, it was missing the
GetNumberOfValues method and the ValueType typedef. These are now added.
This commit is contained in:
Kenneth Moreland 2015-09-09 13:26:51 -06:00
parent b767fc405d
commit 13d4087657
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vtkm/exec/ExecutionWholeArray.h
View File

@ -38,6 +38,9 @@ template<typename T,
>
class ExecutionWholeArray : public vtkm::exec::ExecutionObjectBase
{
typedef vtkm::cont::ArrayHandle<T,StorageTag> HandleType;
typedef typename HandleType::template ExecutionTypes<DeviceAdapterTag>::Portal PortalType;
public:
VTKM_CONT_EXPORT
ExecutionWholeArray( ):
@ -46,18 +49,23 @@ public:
}
VTKM_CONT_EXPORT
ExecutionWholeArray( vtkm::cont::ArrayHandle<T,StorageTag>& handle ):
ExecutionWholeArray( HandleType& handle ):
Portal( handle.PrepareForInPlace( DeviceAdapterTag()) )
{
}
VTKM_CONT_EXPORT
ExecutionWholeArray( vtkm::cont::ArrayHandle<T,StorageTag>& handle,
ExecutionWholeArray( HandleType& handle,
vtkm::Id length ):
Portal( handle.PrepareForOutput( length, DeviceAdapterTag()) )
{
}
typedef typename PortalType::ValueType ValueType;
VTKM_EXEC_EXPORT
vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); }
VTKM_EXEC_EXPORT
T Get(vtkm::Id index) const { return this->Portal.Get(index); }
@ -65,8 +73,6 @@ public:
void Set(vtkm::Id index, const T& t) const { return this->Portal.Set(index, t); }
private:
typedef vtkm::cont::ArrayHandle<T,StorageTag> HandleType;
typedef typename HandleType::template ExecutionTypes<DeviceAdapterTag>::Portal PortalType;
PortalType Portal;
};
@ -81,6 +87,9 @@ template<typename T,
>
class ExecutionWholeArrayConst : public vtkm::exec::ExecutionObjectBase
{
typedef vtkm::cont::ArrayHandle<T,StorageTag> HandleType;
typedef typename HandleType::template ExecutionTypes<DeviceAdapterTag>::PortalConst PortalType;
public:
VTKM_CONT_EXPORT
ExecutionWholeArrayConst( ):
@ -89,17 +98,20 @@ public:
}
VTKM_CONT_EXPORT
ExecutionWholeArrayConst( const vtkm::cont::ArrayHandle<T,StorageTag>& handle):
ExecutionWholeArrayConst( const HandleType& handle):
Portal( handle.PrepareForInput( DeviceAdapterTag() ) )
{
}
typedef typename PortalType::ValueType ValueType;
VTKM_EXEC_EXPORT
vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); }
VTKM_EXEC_EXPORT
T Get(vtkm::Id index) const { return this->Portal.Get(index); }
private:
typedef vtkm::cont::ArrayHandle<T,StorageTag> HandleType;
typedef typename HandleType::template ExecutionTypes<DeviceAdapterTag>::PortalConst PortalType;
PortalType Portal;
};