Commit ac610444 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'dejagore_warnings'

f848bc35 Correct warnings from switch statements with no case labels.
90bca8a5 Remove unnecessary constructor from IntersectionPointMap
3c96b5a7 Suppress  stack warnings generated by BoundingIntervalHierarchyTester
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1515
parents e72d0d5d f848bc35
......@@ -50,6 +50,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
# disable nvlink warnings about virtual functions. The Stack size warnings can only
# be silenced in CUDA >=9, without disabling all nvlink warnings.
"nvlink warning : Stack size for entry function.*NearestNeighborSearch.*"
"nvlink warning : Stack size for entry function.*BoundingIntervalHierarchyTester.*"
"nvlink warning : Stack size for entry function.*ArrayPortalRef.*"
"nvlink warning : Stack size for entry function.*ArrayPortalWrapper.*"
"nvlink warning : .*ArrayPortalWrapper.* has address taken but no possible call to it"
......
......@@ -133,6 +133,8 @@ const MeshConnectivityBase* UnstructuredContainer::Construct(
}
return Handle.PrepareForExecution(CUDA());
#endif
case VTKM_DEVICE_ADAPTER_SERIAL:
VTKM_FALLTHROUGH;
default:
using SERIAL = vtkm::cont::DeviceAdapterTagSerial;
{
......@@ -242,6 +244,8 @@ const MeshConnectivityBase* UnstructuredSingleContainer::Construct(
}
return Handle.PrepareForExecution(CUDA());
#endif
case VTKM_DEVICE_ADAPTER_SERIAL:
VTKM_FALLTHROUGH;
default:
using SERIAL = vtkm::cont::DeviceAdapterTagSerial;
{
......@@ -294,6 +298,8 @@ const MeshConnectivityBase* StructuredContainer::Construct(
case VTKM_DEVICE_ADAPTER_CUDA:
return Handle.PrepareForExecution(vtkm::cont::DeviceAdapterTagCuda());
#endif
case VTKM_DEVICE_ADAPTER_SERIAL:
VTKM_FALLTHROUGH;
default:
return Handle.PrepareForExecution(vtkm::cont::DeviceAdapterTagSerial());
}
......
......@@ -32,8 +32,6 @@ namespace
class IntersectionPointMap : public vtkm::worklet::WorkletMapField
{
public:
VTKM_CONT
IntersectionPointMap() {}
typedef void ControlSignature(FieldIn<>,
FieldIn<>,
FieldIn<>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment