mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
Fix input for HyperSweepBlock
This commit is contained in:
parent
db2d5afb30
commit
7c784c3651
@ -850,7 +850,6 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
|
|||||||
timingsStream << " " << std::setw(38) << std::left << "Create DIY Swap Partners"
|
timingsStream << " " << std::setw(38) << std::left << "Create DIY Swap Partners"
|
||||||
<< ": " << timer.GetElapsedTime() << " seconds" << std::endl;
|
<< ": " << timer.GetElapsedTime() << " seconds" << std::endl;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
// 1.3 execute the fan in reduction
|
// 1.3 execute the fan in reduction
|
||||||
const vtkm::worklet::contourtree_distributed::ComputeDistributedContourTreeFunctor<FieldType>
|
const vtkm::worklet::contourtree_distributed::ComputeDistributedContourTreeFunctor<FieldType>
|
||||||
computeDistributedContourTreeFunctor(this->MultiBlockSpatialDecomposition.GlobalSize,
|
computeDistributedContourTreeFunctor(this->MultiBlockSpatialDecomposition.GlobalSize,
|
||||||
@ -858,7 +857,6 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
|
|||||||
this->TimingsLogLevel,
|
this->TimingsLogLevel,
|
||||||
this->TreeLogLevel);
|
this->TreeLogLevel);
|
||||||
vtkmdiy::reduce(master, assigner, partners, computeDistributedContourTreeFunctor);
|
vtkmdiy::reduce(master, assigner, partners, computeDistributedContourTreeFunctor);
|
||||||
|
|
||||||
// Record timing for the actual reduction
|
// Record timing for the actual reduction
|
||||||
timingsStream << " " << std::setw(38) << std::left << "Fan In Reduction"
|
timingsStream << " " << std::setw(38) << std::left << "Fan In Reduction"
|
||||||
<< ": " << timer.GetElapsedTime() << " seconds" << std::endl;
|
<< ": " << timer.GetElapsedTime() << " seconds" << std::endl;
|
||||||
@ -870,7 +868,6 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
|
|||||||
timingsStream << " " << std::setw(38) << std::left << "Post Fan In Barrier"
|
timingsStream << " " << std::setw(38) << std::left << "Post Fan In Barrier"
|
||||||
<< ": " << timer.GetElapsedTime() << " seconds" << std::endl;
|
<< ": " << timer.GetElapsedTime() << " seconds" << std::endl;
|
||||||
timer.Start();
|
timer.Start();
|
||||||
|
|
||||||
// 2. Fan out to update all the tree
|
// 2. Fan out to update all the tree
|
||||||
master.foreach (
|
master.foreach (
|
||||||
[&](
|
[&](
|
||||||
@ -1097,12 +1094,18 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
|
|||||||
for (size_t blockNo = 0; blockNo < localDataBlocks.size(); ++blockNo)
|
for (size_t blockNo = 0; blockNo < localDataBlocks.size(); ++blockNo)
|
||||||
{
|
{
|
||||||
auto currInBlock = localDataBlocks[blockNo];
|
auto currInBlock = localDataBlocks[blockNo];
|
||||||
std::cout << "currInBlock->BlockSize: " << currInBlock->BlockSize << std::endl;
|
// The block size and origin may be modified during the FanIn so we need to use the
|
||||||
|
// size and origin from the original decomposition instead of looking it up in the currInBlock
|
||||||
|
auto currBlockSize = this->MultiBlockSpatialDecomposition.LocalBlockSizes.ReadPortal().Get(
|
||||||
|
static_cast<vtkm::Id>(blockNo));
|
||||||
|
auto currBlockOrigin =
|
||||||
|
this->MultiBlockSpatialDecomposition.LocalBlockOrigins.ReadPortal().Get(
|
||||||
|
static_cast<vtkm::Id>(blockNo));
|
||||||
localHyperSweeperBlocks[blockNo] =
|
localHyperSweeperBlocks[blockNo] =
|
||||||
new vtkm::worklet::contourtree_distributed::HyperSweepBlock<FieldType>(
|
new vtkm::worklet::contourtree_distributed::HyperSweepBlock<FieldType>(
|
||||||
currInBlock->GlobalBlockId, // TODO/FIXME: Check what block ID this should be
|
currInBlock->GlobalBlockId, // TODO/FIXME: Check what block ID this should be
|
||||||
currInBlock->BlockOrigin,
|
currBlockOrigin, //currInBlock->BlockOrigin,
|
||||||
currInBlock->BlockSize,
|
currBlockSize, // currInBlock->BlockSize,
|
||||||
spatialDecomp.GlobalSize,
|
spatialDecomp.GlobalSize,
|
||||||
*currInBlock->HierarchicalAugmenter.AugmentedTree); // currInBlock->HierarchicalTree);
|
*currInBlock->HierarchicalAugmenter.AugmentedTree); // currInBlock->HierarchicalTree);
|
||||||
hierarchical_hyper_sweep_master.add(
|
hierarchical_hyper_sweep_master.add(
|
||||||
|
Loading…
Reference in New Issue
Block a user