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

Change vtkmdiyLocalBlockGids to std::vector<int> to avoid warning

Browse Source
This commit is contained in:
Gunther H. Weber 2021-10-08 18:02:38 -07:00
parent 5cb2f0bf1a
commit 0d2036a1ee
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vtkm/filter/ContourTreeUniformDistributed.hxx
View File

@ -763,7 +763,7 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
// ... coordinates of local blocks // ... coordinates of local blocks
auto localBlockIndicesPortal = spatialDecomp.LocalBlockIndices.ReadPortal(); auto localBlockIndicesPortal = spatialDecomp.LocalBlockIndices.ReadPortal();
std::vector<vtkm::Id> vtkmdiyLocalBlockGids(static_cast<size_t>(input.GetNumberOfPartitions())); std::vector<int> vtkmdiyLocalBlockGids(static_cast<size_t>(input.GetNumberOfPartitions()));
for (vtkm::Id bi = 0; bi < input.GetNumberOfPartitions(); bi++) for (vtkm::Id bi = 0; bi < input.GetNumberOfPartitions(); bi++)
{ {
RegularDecomposer::DivisionsVector diyCoords(static_cast<size_t>(numDims)); RegularDecomposer::DivisionsVector diyCoords(static_cast<size_t>(numDims));
@ -779,7 +779,7 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
// copy global block ids into the local data blocks so we can use them in the hierarchical augmentation // copy global block ids into the local data blocks so we can use them in the hierarchical augmentation
for (vtkm::Id bi = 0; bi < input.GetNumberOfPartitions(); bi++) for (vtkm::Id bi = 0; bi < input.GetNumberOfPartitions(); bi++)
{ {
localDataBlocks[bi]->GlobalBlockId = vtkmdiyLocalBlockGids[bi]; localDataBlocks[bi]->GlobalBlockId = vtkm::Id{ vtkmdiyLocalBlockGids[bi] };
} }
// Record time to compute the local block ids // Record time to compute the local block ids
@ -790,13 +790,11 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
// 1.2.2 Add my local blocks to the vtkmdiy master. // 1.2.2 Add my local blocks to the vtkmdiy master.
for (std::size_t bi = 0; bi < static_cast<std::size_t>(input.GetNumberOfPartitions()); bi++) for (std::size_t bi = 0; bi < static_cast<std::size_t>(input.GetNumberOfPartitions()); bi++)
{ {
master.add(static_cast<int>(vtkmdiyLocalBlockGids[bi]), // block id master.add(vtkmdiyLocalBlockGids[bi], localDataBlocks[bi], new vtkmdiy::Link);
localDataBlocks[bi], // NOTE: Use dummy link to make DIY happy. The dummy link is never used, since all
new vtkmdiy::Link); // Use dummy link to make DIY happy. // communication is via RegularDecomposer, which sets up its own links.
// NOTE: The dummy link is never used, since all communication is via RegularDecomposer,
// which sets up its own links
// NOTE: No need to keep the pointer, as DIY will "own" it and delete it when no longer // NOTE: No need to keep the pointer, as DIY will "own" it and delete it when no longer
// needed TODO/FIXME: Confirm that last statement // needed TODO/FIXME: Confirm that last statement.
} }
// Record time for dding data blocks to the master // Record time for dding data blocks to the master
@ -821,8 +819,7 @@ VTKM_CONT void ContourTreeUniformDistributed::DoPostExecute(
comm, static_cast<int>(size), static_cast<int>(spatialDecomp.GetGlobalNumberOfBlocks())); comm, static_cast<int>(size), static_cast<int>(spatialDecomp.GetGlobalNumberOfBlocks()));
for (vtkm::Id bi = 0; bi < input.GetNumberOfPartitions(); bi++) for (vtkm::Id bi = 0; bi < input.GetNumberOfPartitions(); bi++)
{ {
assigner.set_rank(static_cast<int>(rank), assigner.set_rank(static_cast<int>(rank), vtkmdiyLocalBlockGids[static_cast<size_t>(bi)]);
static_cast<int>(vtkmdiyLocalBlockGids[static_cast<size_t>(bi)]));
} }
// Record time for creating the decomposer and assigner // Record time for creating the decomposer and assigner