Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Make ArrayPortalRecombineVec trivially copyable

Browse Source 
Using this internal class is a bit tricky because it requires a pointer
to a C array that is expected to contain portals. Both the C array and
the portals must be defined for the expected device. This is already
handled by the associated Storage. Assuming all of this holds, make sure
the `ArrayPortalRecombineVec` is trivially copyable. This is a
requirement for passing objects to the execution environment.
This commit is contained in:
Kenneth Moreland 2021-02-22 08:30:25 -07:00
parent 2bd4805fe0
commit 3813fb515c
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vtkm/cont/ArrayHandleRecombineVec.h
View File

@ -294,24 +294,29 @@ namespace internal
template <typename SourcePortalType> template <typename SourcePortalType>
class ArrayPortalRecombineVec class ArrayPortalRecombineVec
{ {
vtkm::VecCConst<SourcePortalType> Portals; // Note that this ArrayPortal has a pointer to a C array of other portals. We need to
// make sure that the pointer is valid on the device we are using it on. See the
// CreateReadPortal and CreateWritePortal in the Storage below to see how that is
// managed.
const SourcePortalType* Portals;
vtkm::IdComponent NumberOfComponents;
public: public:
using ValueType = vtkm::internal::RecombineVec<SourcePortalType>; using ValueType = vtkm::internal::RecombineVec<SourcePortalType>;
ArrayPortalRecombineVec() = default; ArrayPortalRecombineVec() = default;
ArrayPortalRecombineVec(const vtkm::VecCConst<SourcePortalType>& portals)
: Portals(portals)
{
}
ArrayPortalRecombineVec(const SourcePortalType* portals, vtkm::IdComponent numComponents) ArrayPortalRecombineVec(const SourcePortalType* portals, vtkm::IdComponent numComponents)
: Portals(portals, numComponents) : Portals(portals)
, NumberOfComponents(numComponents)
{ {
} }
VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->Portals[0].GetNumberOfValues(); } VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->Portals[0].GetNumberOfValues(); }
VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return ValueType(this->Portals, index); } VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const
{
return ValueType({ this->Portals, this->NumberOfComponents }, index);
}
VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType& value) const VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType& value) const
{ {
@ -324,8 +329,8 @@ public:
VTKM_EXEC_CONT void Set(vtkm::Id index, const T& value) const VTKM_EXEC_CONT void Set(vtkm::Id index, const T& value) const
{ {
using Traits = vtkm::VecTraits<T>; using Traits = vtkm::VecTraits<T>;
VTKM_ASSERT(Traits::GetNumberOfComponents(value) == this->Portals.GetNumberOfComponents()); VTKM_ASSERT(Traits::GetNumberOfComponents(value) == this->NumberOfComponents);
for (vtkm::IdComponent cIndex = 0; cIndex < this->Portals.GetNumberOfComponents(); ++cIndex) for (vtkm::IdComponent cIndex = 0; cIndex < this->NumberOfComponents; ++cIndex)
{ {
this->Portals[cIndex].Set(index, Traits::GetComponent(value, cIndex)); this->Portals[cIndex].Set(index, Traits::GetComponent(value, cIndex));
} }
@ -441,7 +446,6 @@ public:
vtkm::cont::DeviceAdapterId device, vtkm::cont::DeviceAdapterId device,
vtkm::cont::Token& token) vtkm::cont::Token& token)
{ {
ReadPortalType portal;
vtkm::IdComponent numComponents = NumberOfComponents(buffers); vtkm::IdComponent numComponents = NumberOfComponents(buffers);
// The array portal needs a runtime-allocated array of portals for each component. // The array portal needs a runtime-allocated array of portals for each component.
@ -479,7 +483,6 @@ public:
vtkm::cont::DeviceAdapterId device, vtkm::cont::DeviceAdapterId device,
vtkm::cont::Token& token) vtkm::cont::Token& token)
{ {
WritePortalType portal;
vtkm::IdComponent numComponents = NumberOfComponents(buffers); vtkm::IdComponent numComponents = NumberOfComponents(buffers);
// The array portal needs a runtime-allocated array of portals for each component. // The array portal needs a runtime-allocated array of portals for each component.