Commit Graph

7054 Commits

Author SHA1 Message Date
Gunther H. Weber
c584364122 Finish and clean-up unit test of HierarchicalHyperSweeper 2021-10-20 14:46:25 -07:00
Gunther H. Weber
b3582b9b48 Disable debug print of combined block IDs 2021-10-20 14:46:25 -07:00
Oliver Ruebel
15934cd621 Clear all swap data for hierarchical augmenter 2021-10-20 14:46:25 -07:00
Oliver Ruebel
9a9b7a6ec0 Fix bug in PrepareAugmentedTree and add DebugSave 2021-10-20 14:46:25 -07:00
Oliver Ruebel
1a16049c78 Add missing include for Types in Branch.h 2021-10-20 14:46:25 -07:00
Oliver Ruebel
61a86973d0 Update comparator based on latests fixes 2021-10-20 14:46:25 -07:00
Gunther H. Weber
7411f85213 Re-enable unit test for combining meshes 2021-10-20 14:46:25 -07:00
Gunther H. Weber
a81c5ca862 Open files with test data in binary mode 2021-10-20 14:46:25 -07:00
Gunther H. Weber
0d2036a1ee Change vtkmdiyLocalBlockGids to std::vector<int> to avoid warning 2021-10-20 14:46:25 -07:00
Gunther H. Weber
5cb2f0bf1a Slight refactoring to avoid warning 2021-10-20 14:46:25 -07:00
Gunther H. Weber
6aed5b376a Fix CUDA test crash 2021-10-20 14:46:24 -07:00
Gunther H. Weber
2b6fd71c5b Make volume metric data filter output and print tree in app; general clean up 2021-10-20 14:46:24 -07:00
Gunther H. Weber
6cd7e0894d Explictly cast data value tyoe to avoid warning 2021-10-20 14:46:24 -07:00
Gunther H. Weber
57a27225c5 Fix incorrect function method modifier 2021-10-20 14:46:24 -07:00
Gunther H. Weber
d767cb5b22 Clean up debug output 2021-10-20 14:46:24 -07:00
Gunther H. Weber
cb541051c7 Add missing files to CMakeLists.txt 2021-10-20 14:46:24 -07:00
Gunther H. Weber
c677e31286 Fix compile warning on GitLab dashboard 2021-10-20 14:46:24 -07:00
Gunther H. Weber
264011ec1f Fix incorrect filename in CMakeLists.txt 2021-10-20 14:46:24 -07:00
Gunther H. Weber
1163cfa563 Fix crash caused by AttachmentSuperparentAndIndexComparator.h 2021-10-20 14:46:24 -07:00
Gunther H. Weber
f22af2d1c3 Add missing IdRelabeler. include to GetOwnedVerticesByGlobalIdWorklet.h 2021-10-20 14:46:24 -07:00
Gunther H. Weber
17a8cf16a2 Added verification code to test results of contour tree app. 2021-10-20 14:46:24 -07:00
Oliver Ruebel
6849c6015d Fix crash in sort due to bad AttachmentSuperparentAndIndexComparator 2021-10-20 14:46:24 -07:00
Oliver Ruebel
bfffff9b20 Fix bug in HierarchicalHyperSweeper call to TransferWeightsUpdateLHEWorklet 2021-10-20 14:46:24 -07:00
Oliver Ruebel
7c784c3651 Fix input for HyperSweepBlock 2021-10-20 14:46:24 -07:00
Gunther H. Weber
db2d5afb30 Added more debug output 2021-10-20 14:46:23 -07:00
Gunther H. Weber
d77d4dd7d8 Clean-up (mostly debug output) 2021-10-20 14:46:23 -07:00
Oliver Ruebel
c48f707bdd Fix bug in TreeGrafter::CopyIterationDetails
Fix bug in TreeGrafter::CopyIterationDetails to set last FirstSupernodePerIteration
2021-10-20 14:46:23 -07:00
Oliver Ruebel
d23560edd2 Execute HyperSweeper only if tree is augmented 2021-10-20 14:46:23 -07:00
Oliver Ruebel
b2d43aadc6 use augmented hierarchical tree for output if available 2021-10-20 14:46:23 -07:00
Oliver Ruebel
a20ffd3d7c Use augmented HierarchicalContourTree in the HyperSweeper 2021-10-20 14:46:23 -07:00
Gunther H. Weber
542d0a5a46 Added hyper-sweeeper calls to contour tree uniform distributed filter 2021-10-20 14:46:23 -07:00
Gunther H. Weber
17f5ead924 Moved hypersweep block and functor classes into separate files 2021-10-20 14:46:23 -07:00
Gunther H. Weber
331e63fed4 Added missing LoadArrays include. 2021-10-20 14:46:23 -07:00
Gunther H. Weber
3cf68a512e Start creating test for HierarchicalHyperSweeper and fix various bugs in it 2021-10-20 14:46:23 -07:00
Oliver Ruebel
45a3570270 Fix bad array resize in HierarchicalAugmenter
Fix bad array resize in HierarchicalAugmenter to do true resize to preserve values and initalize arrays, not just allocate
Fix bad array resize in HierarchicalAugmenter::RetrieveInAttachmentPoints to do a true resize to preserve values and initalize arrays, not just allocate
2021-10-20 14:46:23 -07:00
Oliver Ruebel
77276f2847 Moved ResizeVector funtion from TreeGrafter to Types so that we can reuse it 2021-10-20 14:46:23 -07:00
Oliver Ruebel
3a48f4a8e0 Add missing array init in HierarchicalAugmenter.CopyBaseRegularStrucutre 2021-10-20 14:46:23 -07:00
Oliver Ruebel
0176f72dac Fix missing array resize in HierarchicalAugmenter::RetrieveOldSupernodes 2021-10-20 14:46:23 -07:00
Oliver Ruebel
e2423a2924 Fix array init in HierarchicalAugmenter.ResizeArrays 2021-10-20 14:46:23 -07:00
Oliver Ruebel
4bcdc66633 Specialze PrintDataType to correctly print id ArrayHandles 2021-10-20 14:46:23 -07:00
Oliver Ruebel
4c7eb4045c Fix bad array size in HierarchicalAugmenter.RetrieveOldSupernodes 2021-10-20 14:46:22 -07:00
Oliver Ruebel
51a7304318 Fix bad initalize of Superparents in HierarchicalAugmenter 2021-10-20 14:46:22 -07:00
Oliver Ruebel
d86284de5a Fix bad DIY send check in HierarchicalAugmenterFunctor 2021-10-20 14:46:22 -07:00
Oliver Ruebel
f0b03ba4b8 Clarify log message in ComputeDistributedContourTreeFunctor.h 2021-10-20 14:46:22 -07:00
Oliver Ruebel
c61379caf3 Fix HierarchicalAugmenter.DebugPrint 2021-10-20 14:46:22 -07:00
Oliver Ruebel
001050b558 Add print function for generic array handles 2021-10-20 14:46:22 -07:00
Oliver Ruebel
be3a078d91 Add logging on input Id for Fan In 2021-10-20 14:46:22 -07:00
Oliver Ruebel
70cf5eef29 Add log message for fan in partners 2021-10-20 14:46:22 -07:00
Oliver Ruebel
6d628219bc Added HierarchicalAugmenterInOutData::DebugPrint method 2021-10-20 14:46:22 -07:00
Oliver Ruebel
c87c7392db Use the correct id in HierarchicalAugmenter.Initialize
Save global Id in DistributedContourTreeBlockData to use the correct Id for HierarchicalAugmenter.Initialize
2021-10-20 14:46:22 -07:00
Oliver Ruebel
a09c55b3ab Added TODO item for HierarchicalAugmenterFunctor 2021-10-20 14:46:22 -07:00
Oliver Ruebel
236abb772b Add high-level augmetation timers 2021-10-20 14:46:22 -07:00
Gunther H. Weber
5244aade8b Moved augmentation from lambda to separate functor class to fix compile error. 2021-10-20 14:46:22 -07:00
Oliver Ruebel
2c7bda773c Port changes to HierarchicalAugmenter to add In/Out arrays for MPI exchange 2021-10-20 14:46:22 -07:00
Oliver Ruebel
35a14f3129 Fix errors in HierarchicalAugmenter
Fix CreateSuperarcsWorklet. Use standard copy to reduce complexity of CreateSuperarcsWorklet.
Fix compile errors in HierarchicalAugmenter.
Some more clean-up and optimization for HierarchicalAugmenter.CreateSuperarcsWorklet.
2021-10-20 14:46:22 -07:00
Gunther H. Weber
c6ff4a5f09 Added some comments 2021-10-20 14:46:21 -07:00
Gunther H. Weber
e9af397fb2 First implementation of hierarchical augmenter communication phase 2021-10-20 14:46:21 -07:00
Oliver Ruebel
00e906313f Fix broken array copy in HierarchicalAugmenter::Initialize 2021-10-20 14:46:21 -07:00
Oliver Ruebel
b16dc73f3d Remove broken copy / ArrayHandleDecorator while working on a fix 2021-10-20 14:46:21 -07:00
Oliver Ruebel
1b1e6fb903 Add missing throw for logic error 2021-10-20 14:46:21 -07:00
Oliver Ruebel
958b84ebf9 Temporariliy remove CreateSuperarcsWorklet call to continue build debugging 2021-10-20 14:46:21 -07:00
Oliver Ruebel
1056abecce Fix various syntax errors in HierarchicalAugmenter 2021-10-20 14:46:21 -07:00
Oliver Ruebel
df101a81bd Fix syntax error in ArrayHandleIndex call 2021-10-20 14:46:21 -07:00
Oliver Ruebel
bb853befdd Fix bad CopyIf call 2021-10-20 14:46:21 -07:00
Gunther H. Weber
ca6f0bba9c Added TOOD/FIXME for sanity check 2021-10-20 14:46:21 -07:00
Gunther H. Weber
e2fe35e129 Started adding DIY code for HierarchicalAugmenter 2021-10-20 14:46:21 -07:00
Gunther H. Weber
1128786951 Removed virtual functions to fix compile/link error 2021-10-20 14:46:21 -07:00
Oliver Ruebel
370fd5de52 Avoid ReadPortal/WritePortal to get/set individual values as possible. 2021-10-20 14:46:21 -07:00
Oliver Ruebel
2f720d5ac2 Fix docstring 2021-10-20 14:46:21 -07:00
Oliver Ruebel
ce6c09152c Added HierarchicalContourTree<FieldType>::DumpVolumes 2021-10-20 14:46:21 -07:00
Oliver Ruebel
3daab361cd Added NumOwnedRegularVertices to HierarchicalContourTree 2021-10-20 14:46:20 -07:00
Oliver Ruebel
ec7a62a75b Updated HierarchicalHyperSweeper to track instrinsic and dependent values
Updated HierarchicalHyperSweeper to track instrinsic and dependent values not just sweepValues
2021-10-20 14:46:20 -07:00
Oliver Ruebel
9dbccaae1d Port/implement HierarchicalAugmenter 2021-10-20 14:46:20 -07:00
Oliver Ruebel
a69f83f3a5 Port/implement HierarchicalHyperSweeper 2021-10-20 14:46:20 -07:00
Oliver Ruebel
7506068236 Updated TreeGrafter for parallel hypersweep 2021-10-20 14:46:20 -07:00
Oliver Ruebel
76d88db157 Added GetOwnedVerticesByGlobalID for the 2D and 3D meshes 2021-10-20 14:46:20 -07:00
Oliver Ruebel
b0fe5ffe40 Add doc in IdRelabeler 2021-10-20 14:46:20 -07:00
Oliver Ruebel
434b0a0943 Move PointDoubling to meshextrema submodule since only used in MeshExtrema.h 2021-10-20 14:46:20 -07:00
Oliver Ruebel
a5212474a1 Update HierarchicalContourTree iteration counters for hybrid hypersweep 2021-10-20 14:46:20 -07:00
Manish Mathai
04c43e4c52 Merge topic 'optimize-annotations-speed'
c62998bd1 Batch line and text annotations for View1D
f7c43960e Update code to follow styling and worklet invoker guidelines
b7470b0af Remove leftover debug statement
8f025a2c5 Batch text and line annotation rendering

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2594
2021-10-20 12:22:28 -04:00
Manish Mathai
c62998bd1b Batch line and text annotations for View1D 2021-10-19 14:12:18 -07:00
Manish Mathai
f7c43960e5 Update code to follow styling and worklet invoker guidelines 2021-10-19 10:47:56 -07:00
Roxana Bujack
09db96e58e add merge partitioned dataset capability 2021-10-18 15:37:13 -06:00
Abhishek Yenpure
39934257cb Merge topic 'cell-velocity-field'
5109ba2a7 Adding changelog for cell centered velocities
4e9220ddd Removing unnecessary header
3237c58c2 Updating particle advection filters to use field associativity
79bb38c2b Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into cell-velocity-field
a11d9ad10 removing print statements
e28476df5 Assigning default associativity for velocity field
53167f076 Fix Field constructors
e6fa5fd4b Fixing Field class
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2588
2021-10-18 13:00:07 -04:00
Abhishek Yenpure
4e9220ddd3 Removing unnecessary header 2021-10-14 15:21:08 -07:00
Abhishek Yenpure
3237c58c2b Updating particle advection filters to use field associativity 2021-10-14 14:57:36 -07:00
Abhishek Yenpure
79bb38c2b3 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into cell-velocity-field 2021-10-14 14:48:37 -07:00
Li-Ta Lo
1de5fef122 minor fix 2021-10-14 14:42:02 -06:00
Li-Ta Lo
5e87ed858c make most of the vtkm_io library not DEVICE_SOURCE 2021-10-14 12:38:52 -06:00
Li-Ta Lo
1d2c4c2906 fixed single/double precision converstion 2021-10-14 09:15:13 -06:00
Li-Ta Lo
d59732766c remove comment about DeviceAdapter.h 2021-10-13 15:59:30 -06:00
Li-Ta Lo
08ad08b138 Merge branch 'master' into osc_refactor 2021-10-13 15:32:28 -06:00
Li-Ta Lo
7add915dd3 include DeviceAdapter.h in StorageVirtual.h 2021-10-13 14:40:51 -06:00
Li-Ta Lo
b9c2ddf9d1 add missing #include 2021-10-13 13:22:26 -06:00
Li-Ta Lo
5448ffb28b decouple Timer.h from device compiler 2021-10-13 12:11:23 -06:00
Li-Ta Lo
e90b186ba8 do not use device compiler to compile source unit tests 2021-10-13 11:56:02 -06:00
Kenneth Moreland
d5acf91067 Fix dropped UnknownArrayHandle symbols
For some reason, GCC is dropping the templated function instances use
for the `UnknownArrayHandle` constructor. Apparently, something in the
compiler or the linker is being over aggressive about removing unused
symbols and is actually dropping symbols that are being used. Maybe it
is because the functions are not directly called but their pointers are
used.

To get around this problem, mark these templated functions in
UnknownArrayHandle.h with the `used` attribute to force the compiler/
linker to keep them. There should be no consequence to that as these
function templates are only instantiated if they are used.
2021-10-13 07:33:13 -06:00
Li-Ta Lo
54772fb60c change as suggested by code review 2021-10-12 16:22:31 -06:00
Li-Ta Lo
f8d23dc432 unique_ptr<>::release does not delete, unqie_ptr<>::reset() does 2021-10-12 14:42:33 -06:00
Li-Ta Lo
e392109a1a add unit test for Oscillator, fix bug in point v.s. cell dims 2021-10-12 14:04:40 -06:00