Kenneth Moreland
c55d15f397
Deprecate ArrayHandle::ExecutionTypes
...
The newer version of `ArrayHandle` no longer supports different types of
portals for different devices. Thus, the `ReadPortalType` and
`WritePortalType` are sufficient for all types of portals across all
devices.
This significantly simplifies supporting execution objects on devices,
and thus this change also includes many changes to various execution
objects to remove their dependence on the device adapter tag.
2021-02-08 12:17:37 -07:00
Kenneth Moreland
1faed3712e
Remove the use of ResetTypes for ArrayCopy
...
It used to be the case where you needed to call `ResetTypes` on a
`VariantArrayHandle` before using `ArrayCopy` to limit the types it gets
compiled for. However, there is now a general form for
`UnknownArrayHandle`, so `ResetTypes` no longer does anything useful in
this case. Remove the use of that.
2021-02-02 17:34:08 -07:00
Kenneth Moreland
34412ff298
Deprecate ArrayHandle::Shrink
...
This method has been subsumed by Allocate with vtkm::CopyFlag::On.
2021-02-01 08:07:40 -07:00
Kenneth Moreland
8b133288ce
Fix deprecation warnings
...
There was an error that caused deprecation warnings in VTK-m to be
suppressed, which meant that many uses of deprecated features went
unnoticed. This fixes those deprecation warnings.
The majority of the warnings were caused by the use of the deprecated
`Cast`, `CopyTo`, and `ResetTypes` methods of `UnknownArrayHandle` (or
`VariantArrayHandle`). Both `Cast` and `CopyTo` have been subsumed by
`AsArrayHandle` (to make the functionality more clear). `ResetTypes` now
requires a second template argument to define the storage types to try.
Also fixed some issues with `SerializableField` being deprecated.
This class is no longer necessary because `Field` can now be directly
serialized.
2021-01-26 07:56:39 -07:00
Gunther H. Weber
a10d7be0bf
Revert back from ResizeVector to Allocate but setting vtkm::CopyFlag::On
2020-12-02 14:30:24 -08:00
Gunther H. Weber
76dcacc090
Revert from Allocate to ResizeVector, but initialize with 0 instead of NO_SUCH_ELEMENT
2020-12-02 14:30:24 -08:00
Oliver Ruebel
774d8df370
Renamed ResizeIndexVector to ResizeVector and fixed bad resize call
2020-12-02 14:30:24 -08:00
Gunther H. Weber
94697e0e05
Fix unused variable warnings when logging is disabled
2020-12-02 14:30:24 -08:00
Gunther H. Weber
25bacf9281
Removed return statement that is never reached
2020-12-02 14:30:23 -08:00
Oliver Ruebel
bda234c6ef
Use CopySubRange to ensure arrays are not being shrunk
2020-12-02 14:30:23 -08:00
Gunther H. Weber
c603fe596a
Fix filename of BoundaryTreeNodeComparator.h in CMakeLists.txt.
2020-12-02 14:30:22 -08:00
Oliver Ruebel
a88b2ed4a8
Renamed Bract to BoundaryTree throughout
2020-12-02 14:29:18 -08:00
Oliver Ruebel
a5d541a341
Rename BoundaryTreeMaker.Bract to BoundaryTreeData
2020-12-02 14:29:18 -08:00
Oliver Ruebel
e77f924ecf
Remove bad inheritance from vtkm::worklet::WorkletMapField
2020-12-02 14:29:17 -08:00
Oliver Ruebel
b630919c3b
Avoid use of values as both input and retun valye in worklet
2020-12-02 14:29:17 -08:00
Oliver Ruebel
cb98eea5e3
Renamed and updated ResizeIndexVector to use new ArrayHandle resize support in VTKm
2020-12-02 14:29:17 -08:00
Oliver Ruebel
de7da7423e
Add DIY-related comments to DistributedContourTreeBlockData
2020-12-02 14:29:17 -08:00
Oliver Ruebel
8e58f50b23
Removed commented ContourTreeBlockData.SortOrder
2020-12-02 14:29:17 -08:00
Gunther H. Weber
2fa6855222
Fix another warning about types.
2020-12-02 14:29:17 -08:00
oruebel
7e9f57f755
Cast constexpr on device to fix CUDA access problems
2020-12-02 14:29:16 -08:00
Oliver Ruebel
08447c24b1
Add support for using only necessary boundary vertices
2020-12-02 14:29:16 -08:00
Oliver Ruebel
e734c6358c
Port bugfix for ListNewNodesCopyIdsWorklet.
2020-12-02 14:29:16 -08:00
Oliver Ruebel
75afb77d20
Refine recording of timings in Fan In functor
2020-12-02 14:29:16 -08:00
Gunther H. Weber
d18aacc5d6
Cleanup of debug output etc.
2020-12-02 14:29:16 -08:00
Gunther H. Weber
8652ea1abb
Update CMakeList.txt for updates in worklet/contourtree_distributed/boundary_tree_maker.
2020-12-02 14:29:16 -08:00
Gunther H. Weber
f0213d065e
Replace implicit array handles to adapt to vtk-m changes.
2020-12-02 14:29:16 -08:00
Oliver Ruebel
18e2938cdf
Fix comments in BoundaryTree class
2020-12-02 14:29:15 -08:00
Oliver Ruebel
10910d6b4a
Fix bug to output the correct arrays i HierarchicalContourTree<FieldType>::PrintTreeStats
2020-12-02 14:29:15 -08:00
Oliver Ruebel
07b6744f31
Partial add dot output in ComputeDistributedContourTreeFunctor
2020-12-02 14:29:15 -08:00
Oliver Ruebel
ac1818d357
Add logging for Fan in and Fan Out
2020-12-02 14:29:15 -08:00
Oliver Ruebel
0fa2b57ac6
Save NumBoundary and NumBounaryUsed in BoundaryTree for logging
2020-12-02 14:29:15 -08:00
Oliver Ruebel
ea2803735a
Add function for printing hierarchical tree statistics
2020-12-02 14:29:15 -08:00
Oliver Ruebel
d71259fdb7
Add contour tree, boundary tree, and interior forest array stat print
2020-12-02 14:29:15 -08:00
Gunther H. Weber
d42916ba39
Fix OpenMP backend crashes by avoiding unnecessary computations and zero-length copying.
2020-12-02 14:29:15 -08:00
Gunther H. Weber
4594c1e4c6
Fix unit tests to handle vtk-m with compuled with double precision.
2020-12-02 14:29:15 -08:00
Gunther H. Weber
eb776059ca
Fix unused return value warning in TreeCompiler.h
2020-12-02 14:29:14 -08:00
oruebel
dc1d577140
Fix VTKM_EXEC lables for hact exec objects
2020-12-02 14:29:14 -08:00
Oliver Ruebel
fcda9adde2
Attempt to fix host device function call issue
2020-12-02 14:29:14 -08:00
Oliver Ruebel
9179f5b7b3
Add (vtkm::Id) cast for contour tree constexpr variable for CUDA build
2020-12-02 14:29:14 -08:00
Oliver Ruebel
15baa0f591
Remove ArrayHandleVirtual import in BRACTNodeComperator.h
2020-12-02 14:29:14 -08:00
Oliver Ruebel
05c81cbb76
Fix bad array look-up in dot print
2020-12-02 14:29:14 -08:00
Oliver Ruebel
21cf5a057d
Fix build errors in unused print dot of HierarchicalContourTree.h
2020-12-02 14:29:14 -08:00
Oliver Ruebel
78a2a285d1
Fix build errors in unused print dot function in HierarchicalContourTree.h
2020-12-02 14:29:14 -08:00
Oliver Ruebel
3cefc1e20a
Remove tabs in PrintGraph
2020-12-02 14:29:14 -08:00
Oliver Ruebel
5353a1c3b2
Remove trailing whitespaces
2020-12-02 14:29:13 -08:00
Oliver Ruebel
4d179556e0
Remove unused variable in FindBractSuperarcsSuperarcToWorklet
2020-12-02 14:29:13 -08:00
Oliver Ruebel
91b9832f99
Fix ReadPortal access in HierarchicalContourTree
2020-12-02 14:29:13 -08:00
Oliver Ruebel
d24f7b786b
Fix ReadPortal access in HierarchicalContourTree::SuperString part 2
2020-12-02 14:29:13 -08:00
Oliver Ruebel
da4b56d8e5
Fix ReadPortal access in HierarchicalContourTree::SuperString
2020-12-02 14:29:13 -08:00
Oliver Ruebel
cf333de8d8
Move VTKM_CONT labels for HierarchicalContourTree CUDA built
2020-12-02 14:29:13 -08:00