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

Contour: Zero-init arrays in Flying Edges

Browse Source 
- It fixes a lingering error triggered with BenchContour
- It reenables BenchContour

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
This commit is contained in:
Vicente Adolfo Bolea Sanchez 2020-10-13 16:19:31 -04:00
parent 0277ff1440
commit b22823a547
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarking/BenchmarkFilters.cxx
View File

@ -405,7 +405,7 @@ void BenchContourGenerator(::benchmark::internal::Benchmark* bm)
}
// :TODO: Disabled until SIGSEGV in Countour when passings field is resolved
//VTKM_BENCHMARK_APPLY(BenchContour, BenchContourGenerator);
VTKM_BENCHMARK_APPLY(BenchContour, BenchContourGenerator);
void BenchExternalFaces(::benchmark::State& state)
{

5
vtkm/worklet/contour/FlyingEdgesPass1.h
View File

@ -141,6 +141,7 @@ struct ComputePass1 : public vtkm::worklet::WorkletVisitPointsWithCells
}
}
}
write_edge(device, startPos + (offset * end), edges, FlyingEdges3D::Below);
}
};
@ -150,7 +151,7 @@ struct launchComputePass1
VTKM_CONT bool operator()(DeviceAdapterTag device,
const ComputePass1<T>& worklet,
const vtkm::cont::ArrayHandle<T, StorageTagField>& inputField,
vtkm::cont::ArrayHandle<vtkm::UInt8> edgeCases,
vtkm::cont::ArrayHandle<vtkm::UInt8>& edgeCases,
vtkm::cont::CellSetStructured<2>& metaDataMesh2D,
Args&&... args) const
{
@ -165,7 +166,7 @@ struct launchComputePass1
VTKM_CONT bool operator()(vtkm::cont::DeviceAdapterTagCuda device,
const ComputePass1<T>& worklet,
const vtkm::cont::ArrayHandle<T, StorageTagField>& inputField,
vtkm::cont::ArrayHandle<vtkm::UInt8> edgeCases,
vtkm::cont::ArrayHandle<vtkm::UInt8>& edgeCases,
vtkm::cont::CellSetStructured<2>& metaDataMesh2D,
Args&&... args) const
{

2
vtkm/worklet/contour/FlyingEdgesPass4Common.h
View File

@ -171,7 +171,7 @@ struct Pass4TrimState
}
if (ijk[AxisToSum::xindex] >= (pdims[AxisToSum::xindex] - 2))
{
boundaryStatus[AxisToSum::yindex] += FlyingEdges3D::MaxBoundary;
boundaryStatus[AxisToSum::xindex] += FlyingEdges3D::MaxBoundary;
}
if (ijk[AxisToSum::yindex] < 1)
{