Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 10:35:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Allow ArrayHandleGroupVec with odd component array size

Browse Source 
The array given to `ArrayHandleGroupVec` should really have a number of
values that divides evenly among the `Vec`s. Previously, if this was not
the case, an error exception was thrown. These changes allow this
condition. Extra components are dropped and a warning is logged.
This commit is contained in:
Kenneth Moreland 2020-11-18 11:15:50 -07:00
parent d472e05eae
commit 41784b31ff
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vtkm/cont/ArrayHandleGroupVec.h
View File

@ -143,11 +143,6 @@ public:
VTKM_CONT static vtkm::Id GetNumberOfValues(const vtkm::cont::internal::Buffer* buffers)
{
vtkm::Id componentsSize = ComponentsStorage::GetNumberOfValues(buffers);
if (componentsSize % NUM_COMPONENTS != 0)
{
throw vtkm::cont::ErrorBadValue(
"ArrayHandleGroupVec's components array does not divide evenly into Vecs.");
}
return componentsSize / NUM_COMPONENTS;
}
@ -155,6 +150,11 @@ public:
vtkm::cont::DeviceAdapterId device,
vtkm::cont::Token& token)
{
if ((ComponentsStorage::GetNumberOfValues(buffers) % NUM_COMPONENTS) != 0)
{
VTKM_LOG_S(vtkm::cont::LogLevel::Warn,
"ArrayHandleGroupVec's components array does not divide evenly into Vecs.");
}
return ReadPortalType(ComponentsStorage::CreateReadPortal(buffers, device, token));
}
@ -162,6 +162,11 @@ public:
vtkm::cont::DeviceAdapterId device,
vtkm::cont::Token& token)
{
if ((ComponentsStorage::GetNumberOfValues(buffers) % NUM_COMPONENTS) != 0)
{
VTKM_LOG_S(vtkm::cont::LogLevel::Warn,
"ArrayHandleGroupVec's components array does not divide evenly into Vecs.");
}
return WritePortalType(ComponentsStorage::CreateWritePortal(buffers, device, token));
}
};
@ -183,6 +188,11 @@ VTKM_ARRAY_HANDLE_NEW_STYLE(T, VTKM_PASS_COMMAS(vtkm::cont::StorageTagGroupVec<S
/// to 3, you get an array that looks like it contains two values of \c Vec
/// values of size 3 with the data [0,1,2], [3,4,5].
///
/// The array of components should have a number of values that divides evenly
/// with the size of the Vec. If the components array does not divide evenly
/// into `Vec`s, then a warning will be logged and the extra component values
/// will be ignored.
///
template <typename ComponentsArrayHandleType, vtkm::IdComponent NUM_COMPONENTS>
class ArrayHandleGroupVec
: public vtkm::cont::ArrayHandle<