Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 10:35:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix broken array copy in HierarchicalAugmenter::Initialize

Browse Source
This commit is contained in:
Oliver Ruebel 2021-05-17 15:33:13 -07:00 committed by Gunther H. Weber
parent b16dc73f3d
commit 00e906313f
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vtkm/worklet/contourtree_distributed/HierarchicalAugmenter.h
View File

@ -314,15 +314,18 @@ void HierarchicalAugmenter<FieldType>::Initialize(
// get the ascending flag from the superparent's superarc and transfer to the superparent
// Array decorator to add the IS_ASCENDING flag to our superparent, i.e.,
// if (isAscending(baseTree->superarcs[superparent])){ superparent |= IS_ASCENDING; }
// TODO: FIX The copy call fails bacause VTKm can't get the storage flag fomr the Permutted Array in the ArrayHandleDecorator
throw std::logic_error(
"The last copy call in HierarchicalAugmenter::Initalize is not compiling yet");
/*auto isAscendingSuperparentArr = vtkm::cont::make_ArrayHandleDecorator(
superparents.GetNumberOfValues(),
// TODO: When using the superparenes ArrayHandlePermutation in the ArrayHandleDecorator the compiler
// has issues discovering the StorageType when calling Copy(isAscendingSuperparentArr, superparents)
// by copying superparents to an actual array in tempArrSuperparents we can avoid this issue,
// at the cost of an extra copy.
vtkm::worklet::contourtree_augmented::IdArrayType tempArrSuperparents;
vtkm::cont::Algorithm::Copy(superparents, tempArrSuperparents);
auto isAscendingSuperparentArr = vtkm::cont::make_ArrayHandleDecorator(
tempArrSuperparents.GetNumberOfValues(), //superparents.GetNumberOfValues(),
vtkm::worklet::contourtree_distributed::hierarchical_augmenter::IsAscendingDecorator{},
superparents,
tempArrSuperparents, //superparents,
this->BaseTree->Superarcs);
vtkm::cont::Algorithm::Copy(isAscendingSuperparentArr, superparents);*/
vtkm::cont::Algorithm::Copy(isAscendingSuperparentArr, superparents);
}
// clean up memory