Commit Graph

8428 Commits

Author SHA1 Message Date
Sujin Philip
2d920535af Merge topic 'kokkos_opt-reduce'
7f61058b8 Use kokkos reduce functionality

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2340
2020-12-03 10:24:31 -05:00
Kenneth Moreland
a2117fc5ec Merge topic 'add-distributed-contourtree'
a10d7be0b Revert back from ResizeVector to Allocate but setting vtkm::CopyFlag::On
76dcacc09 Revert from Allocate to ResizeVector, but initialize with 0 instead of NO_SUCH_ELEMENT
774d8df37 Renamed ResizeIndexVector to ResizeVector and fixed bad resize call
94697e0e0 Fix unused variable warnings when logging is disabled
25bacf928 Removed return statement that is never reached
635510de0 Make device tracker named variable
58515c2e2 Use ScopedRuntimeDeviceTracker to enforce the device rather than setting it explicitly
bda234c6e Use CopySubRange to ensure arrays are not being shrunk
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2279
2020-12-02 18:02:48 -05:00
Sujin Philip
7f61058b8a Use kokkos reduce functionality 2020-12-02 17:53:11 -05: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
Gunther H. Weber
635510de03 Make device tracker named variable 2020-12-02 14:30:23 -08:00
Oliver Ruebel
58515c2e21 Use ScopedRuntimeDeviceTracker to enforce the device rather than setting it explicitly 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
9f55ba1a2b Temporarily disabled marching cubes tests 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
Gunther H. Weber
312252ce4e Added TestingContourTreeUniformDistributedFilter.h as header to CMakeLists.txt 2020-12-02 14:30:19 -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
Oliver Ruebel
eec59a6fd0 Add mssing namespace declaration for use of IsThis in worklets 2020-12-02 14:29:17 -08:00
Oliver Ruebel
6db948c685 Remove commented ifdef guard 2020-12-02 14:29:17 -08:00
Oliver Ruebel
c18f5bb5f7 Automatically enable --useFullBoundary option when using marching cubes 2020-12-02 14:29:17 -08:00
Oliver Ruebel
f536b825e4 Remove unused code in distributed contour tree app 2020-12-02 14:29:17 -08:00
Oliver Ruebel
41006405b3 Remove CombinedVector. Update ContourTreeMesh::MergeWith accordingly. 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
Gunther H. Weber
ef3f0221b6 Fix compile error due to incorrect type. 2020-12-02 14:29:17 -08:00
Gunther H. Weber
e9d5b2b06a Use vtkm::IdComponent instead of vtkm::Id to avoid compiler warnings. 2020-12-02 14:29:17 -08:00
Gunther H. Weber
91355fcae7 Avoid 'unitialized variable' compiler warning. 2020-12-02 14:29:17 -08:00
Gunther H. Weber
a868b02bdb Add --saveTreeCompilerData option to hact_test.sh 2020-12-02 14:29:17 -08:00
Gunther H. Weber
226606276d Temprarily print error message when trying to use MC connectvitiy without full boundary 2020-12-02 14:29:17 -08:00
Gunther H. Weber
c8b11f4dcc Remove FIXME 2020-12-02 14:29:17 -08:00
Gunther H. Weber
9b1acb8a4a Temporarily disable boundary optimization for MC connectivity 2020-12-02 14:29:17 -08:00
Oliver Ruebel
b7e2a680e3 Fix unused varibale bug 2020-12-02 14:29:16 -08:00
oruebel
7e9f57f755 Cast constexpr on device to fix CUDA access problems 2020-12-02 14:29:16 -08:00
oruebel
65f8c8cf2c Remove bad std::abort call on device 2020-12-02 14:29:16 -08:00
oruebel
81a303e54d Fix bad constructor call in test 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
e115236168 Add missing timers to ease analysis 2020-12-02 14:29:16 -08:00
Gunther H. Weber
be1e5e5404 Set timing and statistics log levels to UserVerboseLast for unit tests. 2020-12-02 14:29:16 -08:00
Gunther H. Weber
4b14c84ec5 Fix 3D split data Python helper tool. 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
Oliver Ruebel
69602cf777 Refine DoPostExecute timing 2020-12-02 14:29:16 -08:00
Oliver Ruebel
c494942a3d Separet timing for dot output in the filter 2020-12-02 14:29:16 -08:00
Oliver Ruebel
d3554bb4ad Added finer timing for DIY setup for Fan In 2020-12-02 14:29:16 -08:00
Oliver Ruebel
a75e539686 Add barriers in distributed contour tree example to improve timing 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