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

Fix performance issue with CellSetSingleType reverse connections

Browse Source 
When building the reverse connections (visit points with cells) for
`CellSetSingleType`, the fast path for building these was not built due
to a templating error.
This commit is contained in:
Kenneth Moreland 2021-10-04 16:38:30 -06:00
parent 0f42446698
commit c699a17087
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
vtkm/cont/CellSetExplicit.cxx
View File

@ -57,41 +57,64 @@ void DoBuildReverseConnectivity(
struct BuildReverseConnectivityForCellSetType
{
template <typename ShapeStorage, typename ConnectStorage, typename OffsetStorage>
void operator()(
const vtkm::cont::CellSetExplicit<ShapeStorage, ConnectStorage, OffsetStorage>&,
const vtkm::cont::UnknownArrayHandle& connections,
const vtkm::cont::UnknownArrayHandle& offsets,
void BuildExplicit(
const vtkm::cont::CellSetExplicit<ShapeStorage, ConnectStorage, OffsetStorage>*,
const vtkm::cont::UnknownArrayHandle* connections,
const vtkm::cont::UnknownArrayHandle* offsets,
vtkm::Id numberOfPoints,
vtkm::cont::detail::DefaultVisitPointsWithCellsConnectivityExplicit& visitPointsWithCells,
vtkm::cont::DeviceAdapterId device)
vtkm::cont::detail::DefaultVisitPointsWithCellsConnectivityExplicit* visitPointsWithCells,
vtkm::cont::DeviceAdapterId* device) const
{
if (visitPointsWithCells.ElementsValid)
if (visitPointsWithCells->ElementsValid)
{
return; // Already computed reverse
}
using ConnectArrayType = vtkm::cont::ArrayHandle<vtkm::Id, ConnectStorage>;
using OffsetArrayType = vtkm::cont::ArrayHandle<vtkm::Id, OffsetStorage>;
if (connections.CanConvert<ConnectArrayType>() && offsets.CanConvert<OffsetArrayType>())
if (connections->CanConvert<ConnectArrayType>() && offsets->CanConvert<OffsetArrayType>())
{
DoBuildReverseConnectivity(connections.AsArrayHandle<ConnectArrayType>(),
offsets.AsArrayHandle<OffsetArrayType>(),
DoBuildReverseConnectivity(connections->AsArrayHandle<ConnectArrayType>(),
offsets->AsArrayHandle<OffsetArrayType>(),
numberOfPoints,
visitPointsWithCells,
device);
*visitPointsWithCells,
*device);
}
}
template <typename CellSetType>
void operator()(const CellSetType&,
const vtkm::cont::UnknownArrayHandle&,
const vtkm::cont::UnknownArrayHandle&,
vtkm::Id,
vtkm::cont::detail::DefaultVisitPointsWithCellsConnectivityExplicit&,
vtkm::cont::DeviceAdapterId)
void BuildExplicit(...) const
{
// Not an explicit cell set, so skip.
}
// Note that we are doing something a little weird here. We are taking a method templated
// on the cell set type, getting pointers of many of the arguments, and then calling
// a different overloaded method to do the actual work. Here is why.
//
// Our ultimate goal is to call one method if operating on `CellSetExplict` or
// _any subclass_. We also want to ignore any cell type that is not a `CellSetExplicit`
// or one of its sublcasses. So we want one templated method that specializes on a
// `CellSetExplicit` with its three template arguments and another that is templated on
// any `CellSet`. That works for a class of `CellSetExplicit`, but not of a subclass.
// A subclass will match the more generic class.
//
// We can get around that by use variadic arguments (e.g. `...` for the arguments), which
// we can easily do since we just want to ignore the arguments. C++ will match the arguments
// with templates before matching the C variadic arguments. However, these variadic
// arguments only work for POD types. To convert to POD types, we make a new overloaded
// method that accepts pointers instead. (Not sure why pointers work but references do not.)
template <typename CellSetType>
void operator()(
const CellSetType& cellset,
const vtkm::cont::UnknownArrayHandle& connections,
const vtkm::cont::UnknownArrayHandle& offsets,
vtkm::Id numberOfPoints,
vtkm::cont::detail::DefaultVisitPointsWithCellsConnectivityExplicit& visitPointsWithCells,
vtkm::cont::DeviceAdapterId device) const
{
this->BuildExplicit(
&cellset, &connections, &offsets, numberOfPoints, &visitPointsWithCells, &device);
}
};
} // anonymous namespace