mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Port bug fix from distributed to augmented contour tree filter
This commit is contained in:
parent
70f7337f64
commit
3ef95ded23
@ -337,25 +337,33 @@ VTKM_CONT void ContourTreeAugmented::DoPostExecute(
|
||||
);
|
||||
|
||||
// Compute the gids for our local blocks
|
||||
using RegularDecomposer = vtkmdiy::RegularDecomposer<vtkmdiy::DiscreteBounds>;
|
||||
const vtkm::worklet::contourtree_distributed::SpatialDecomposition& spatialDecomp =
|
||||
this->MultiBlockTreeHelper->MultiBlockSpatialDecomposition;
|
||||
const auto numDims = spatialDecomp.NumberOfDimensions();
|
||||
|
||||
// ... division vector
|
||||
RegularDecomposer::DivisionsVector diyDivisions(numDims);
|
||||
for (vtkm::IdComponent d = 0;
|
||||
d < static_cast<vtkm::IdComponent>(spatialDecomp.NumberOfDimensions());
|
||||
++d)
|
||||
{
|
||||
diyDivisions[d] = static_cast<int>(spatialDecomp.BlocksPerDimension[d]);
|
||||
}
|
||||
|
||||
// ... coordinates of local blocks
|
||||
auto localBlockIndicesPortal = spatialDecomp.LocalBlockIndices.ReadPortal();
|
||||
std::vector<vtkm::Id> vtkmdiyLocalBlockGids(static_cast<size_t>(input.GetNumberOfPartitions()));
|
||||
for (vtkm::Id bi = 0; bi < input.GetNumberOfPartitions(); bi++)
|
||||
{
|
||||
std::vector<int> tempCoords; // DivisionsVector type in DIY
|
||||
std::vector<int> tempDivisions; // DivisionsVector type in DIY
|
||||
tempCoords.resize(static_cast<size_t>(spatialDecomp.NumberOfDimensions()));
|
||||
tempDivisions.resize(static_cast<size_t>(spatialDecomp.NumberOfDimensions()));
|
||||
RegularDecomposer::DivisionsVector diyCoords(static_cast<size_t>(numDims));
|
||||
auto currentCoords = localBlockIndicesPortal.Get(bi);
|
||||
for (std::size_t di = 0; di < static_cast<size_t>(spatialDecomp.NumberOfDimensions()); di++)
|
||||
for (vtkm::IdComponent d = 0; d < numDims; ++d)
|
||||
{
|
||||
tempCoords[di] = static_cast<int>(currentCoords[static_cast<vtkm::IdComponent>(di)]);
|
||||
tempDivisions[di] =
|
||||
static_cast<int>(spatialDecomp.BlocksPerDimension[static_cast<vtkm::IdComponent>(di)]);
|
||||
diyCoords[d] = static_cast<int>(currentCoords[d]);
|
||||
}
|
||||
vtkmdiyLocalBlockGids[static_cast<size_t>(bi)] =
|
||||
vtkmdiy::RegularDecomposer<vtkmdiy::DiscreteBounds>::coords_to_gid(tempCoords, tempDivisions);
|
||||
RegularDecomposer::coords_to_gid(diyCoords, diyDivisions);
|
||||
}
|
||||
|
||||
// Add my local blocks to the vtkmdiy master.
|
||||
@ -367,10 +375,16 @@ VTKM_CONT void ContourTreeAugmented::DoPostExecute(
|
||||
}
|
||||
|
||||
// Define the decomposition of the domain into regular blocks
|
||||
vtkmdiy::RegularDecomposer<vtkmdiy::DiscreteBounds> decomposer(
|
||||
static_cast<int>(spatialDecomp.NumberOfDimensions()), // number of dims
|
||||
spatialDecomp.GetVTKmDIYBounds(),
|
||||
static_cast<int>(spatialDecomp.GetGlobalNumberOfBlocks()));
|
||||
RegularDecomposer::BoolVector shareFace(3, true);
|
||||
RegularDecomposer::BoolVector wrap(3, false);
|
||||
RegularDecomposer::CoordinateVector ghosts(3, 1);
|
||||
RegularDecomposer decomposer(static_cast<int>(numDims),
|
||||
spatialDecomp.GetVTKmDIYBounds(),
|
||||
static_cast<int>(spatialDecomp.GetGlobalNumberOfBlocks()),
|
||||
shareFace,
|
||||
wrap,
|
||||
ghosts,
|
||||
diyDivisions);
|
||||
|
||||
// Define which blocks live on which rank so that vtkmdiy can manage them
|
||||
vtkmdiy::DynamicAssigner assigner(
|
||||
@ -381,14 +395,14 @@ VTKM_CONT void ContourTreeAugmented::DoPostExecute(
|
||||
static_cast<int>(vtkmdiyLocalBlockGids[static_cast<size_t>(bi)]));
|
||||
}
|
||||
|
||||
// Fix the vtkmdiy links. TODO Remove changes to the vtkmdiy in VTKM when we update to the new VTK-M
|
||||
// Fix the vtkmdiy links. (NOTE: includes an MPI barrier)
|
||||
vtkmdiy::fix_links(master, assigner);
|
||||
|
||||
// partners for merge over regular block grid
|
||||
vtkmdiy::RegularMergePartners partners(
|
||||
decomposer, // domain decomposition
|
||||
2, // raix of k-ary reduction. TODO check this value
|
||||
true // contiguous: true=distance doubling , false=distnace halving TODO check this value
|
||||
2, // raix of k-ary reduction.
|
||||
true // contiguous: true=distance doubling , false=distnace halving
|
||||
);
|
||||
// reduction
|
||||
vtkmdiy::reduce(
|
||||
|
Loading…
Reference in New Issue
Block a user