Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues with class specialization

Browse Source 
C++ has some weird rules about specializing subclasses.
This commit is contained in:
Kenneth Moreland 2021-02-08 14:31:45 -07:00
parent c55d15f397
commit 3962e73b06
1 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
vtkm/cont/CellSetPermutation.h
View File

@ -268,6 +268,41 @@ struct CellSetPermutationTraits<
using Superclass = CellSetPermutation<OriginalCellSet, PermutationArrayHandleType>;
};
template <typename VisitTopology,
typename IncidentTopology,
typename OriginalCellSetType,
typename PermutationArrayHandleType>
struct CellSetPermutationConnectivityChooser;
template <typename OriginalCellSetType, typename PermutationArrayHandleType>
struct CellSetPermutationConnectivityChooser<vtkm::TopologyElementTagCell,
vtkm::TopologyElementTagPoint,
OriginalCellSetType,
PermutationArrayHandleType>
{
using ExecPortalType = typename PermutationArrayHandleType::ReadPortalType;
using OrigExecObjectType =
typename OriginalCellSetType::template ExecConnectivityType<vtkm::TopologyElementTagCell,
vtkm::TopologyElementTagPoint>;
using ExecConnectivityType =
vtkm::exec::ConnectivityPermutedVisitCellsWithPoints<ExecPortalType, OrigExecObjectType>;
};
template <typename OriginalCellSetType, typename PermutationArrayHandleType>
struct CellSetPermutationConnectivityChooser<vtkm::TopologyElementTagPoint,
vtkm::TopologyElementTagCell,
OriginalCellSetType,
PermutationArrayHandleType>
{
using ConnectivityPortalType = typename vtkm::cont::ArrayHandle<vtkm::Id>::ReadPortalType;
using NumIndicesPortalType = typename vtkm::cont::ArrayHandle<vtkm::IdComponent>::ReadPortalType;
using OffsetPortalType = typename vtkm::cont::ArrayHandle<vtkm::Id>::ReadPortalType;
using ExecConnectivityType =
vtkm::exec::ConnectivityPermutedVisitPointsWithCells<ConnectivityPortalType, OffsetPortalType>;
};
} // internal
template <typename OriginalCellSetType_,
@ -405,47 +440,20 @@ public:
return this->FullCellSet.GetNumberOfPoints();
}
private:
template <typename VisitTopology, typename IncidentTopology>
struct ConnectivityChooser;
template <>
struct ConnectivityChooser<vtkm::TopologyElementTagCell, vtkm::TopologyElementTagPoint>
{
using ExecPortalType = typename PermutationArrayHandleType::ReadPortalType;
using OrigExecObjectType =
typename OriginalCellSetType::template ExecConnectivityType<vtkm::TopologyElementTagCell,
vtkm::TopologyElementTagPoint>;
using ExecConnectivityType =
vtkm::exec::ConnectivityPermutedVisitCellsWithPoints<ExecPortalType, OrigExecObjectType>;
};
template <>
struct ConnectivityChooser<vtkm::TopologyElementTagPoint, vtkm::TopologyElementTagCell>
{
using ConnectivityPortalType = typename vtkm::cont::ArrayHandle<vtkm::Id>::ReadPortalType;
using NumIndicesPortalType =
typename vtkm::cont::ArrayHandle<vtkm::IdComponent>::ReadPortalType;
using OffsetPortalType = typename vtkm::cont::ArrayHandle<vtkm::Id>::ReadPortalType;
using ExecConnectivityType =
vtkm::exec::ConnectivityPermutedVisitPointsWithCells<ConnectivityPortalType,
OffsetPortalType>;
};
public:
template <typename VisitTopology, typename IncidentTopology>
using ExecConnectivityType = typename internal::CellSetPermutationConnectivityChooser<
VisitTopology,
IncidentTopology,
OriginalCellSetType,
PermutationArrayHandleType>::ExecConnectivityType;
template <typename Device, typename VisitTopology, typename IncidentTopology>
struct VTKM_DEPRECATED(1.6, "Use ExecConnectivityType.") ExecutionTypes
{
using ExecObjectType =
typename ConnectivityChooser<VisitTopology, IncidentTopology>::ExecConnectivityType;
using ExecObjectType = ExecConnectivityType<VisitTopology, IncidentTopology>;
};
template <typename VisitTopology, typename IncidentTopology>
using ExecConnectivityType =
typename ConnectivityChooser<VisitTopology, IncidentTopology>::ExecConnectivityType;
VTKM_CONT ExecConnectivityType<vtkm::TopologyElementTagCell, vtkm::TopologyElementTagPoint>
PrepareForInput(vtkm::cont::DeviceAdapterId device,
vtkm::TopologyElementTagCell visitTopology,