Commit Graph

11146 Commits

Author SHA1 Message Date
Li-Ta Lo
86e6c5c3e0 use lambda instead of functor, remove unused code 2023-04-20 13:34:58 -06:00
Dave Pugmire
a4b4bf6563 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2023-04-20 14:46:54 -04:00
Dave Pugmire
086f99e544 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_get_block_to_boundsmap 2023-04-20 14:35:08 -04:00
Dave Pugmire
166f5d405b Kick the dashboards..... 2023-04-20 14:01:51 -04:00
Kenneth Moreland
2f75729cd7 Merge topic 'fix-nightly-gcc5-cuda'
0182eb9d9 Test variant arguments to worklets
de28a4351 Add an entry to VariantUnion to help compiler copy structs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3030
2023-04-19 17:30:37 -04:00
Kenneth Moreland
0182eb9d9d Test variant arguments to worklets
Add a regression test for passing a variant as an argument to a worklet.
Variants are tricky objects, and the compiler might make some strange
assumptions during optimization.

One case that popped up in particular was when a variant contained two
objects with the same `sizeof` but the first object had padding. When the
variant contained the second object, the value under the padded part of
the first object was not set.
2023-04-19 11:30:47 -06:00
Kenneth Moreland
de28a43510 Add an entry to VariantUnion to help compiler copy structs
I've been seeing errors in a nightly build that compiles for CUDA Pascal
using GCC5. The issue is that one of the `ArrayHandleMultiplexer` tests
is failing to copy an implicit array correctly. I think the problem is
that in this test the first and second type of the `Variant` are the same
size, but the first type has some padding in the middle whereas the
second type does not. When using this second type, the values in the
same position of the padding of the first type don't seem to be
initialized properly in the kernel invocation.

My nonexhaustive experiment shows that things work OK as long as the
first type is large enough and has no fillers. Enforce this by adding an
internal entry to the union that is completely full.
2023-04-19 11:14:48 -06:00
Dave Pugmire
5fba6382bd Kick the dashboards.......... 2023-04-19 12:25:10 -04:00
Dave Pugmire
8586d9de5a Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2023-04-18 22:50:04 -04:00
Dave Pugmire
9d0a9bfbae Fix compiler warnings...... 2023-04-18 21:09:10 -04:00
Thomas H. Gibson
141d0e70ef Merge topic 'thrust-reduce-by-key'
1ac12b784 Adding thrust option for ReduceByKey for Kokkos+HIP/CUDA.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3027
2023-04-18 17:35:33 -04:00
Dave Pugmire
b8e9ca4ca5 Remove warning. Add BoundsMap methods. 2023-04-18 15:55:38 -04:00
Dave Pugmire
d79b2cb5be Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2023-04-18 15:41:31 -04:00
Sean Miller
1ac12b784b Adding thrust option for ReduceByKey for Kokkos+HIP/CUDA. 2023-04-17 10:50:57 -05:00
Dave Pugmire
c9899c69cf Merge topic 'sl_block_duplication'
c8702f132 Punch the dashboard in the neck.
d25710823 cleanup and better check for valid seeds.
fe35202de Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into sl_block_duplication
eb3c91494 Fixes to block duplication code.
d1e68ace9 Kick the dashboards....
778e2783a Kick the dashboards.....
186f06a82 Remove debug statements.
812b8f393 Fix serial compile error.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3033
2023-04-15 17:42:48 -04:00
Dave Pugmire
c8702f132b Punch the dashboard in the neck. 2023-04-14 22:29:07 -04:00
Dave Pugmire
d257108236 cleanup and better check for valid seeds. 2023-04-14 14:19:50 -04:00
Dave Pugmire
fe35202de8 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into sl_block_duplication 2023-04-14 12:54:00 -04:00
Louis Gombert
627b757733 Merge topic 'continuous-scatterplot'
4ba15a993 Add new ContinuousScatterPlot filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3028
2023-04-14 12:01:15 -04:00
Sujin Philip
b0715e14af ArrayHandle::StorageType should be public
StorageType is public in vtkm::cont::ArrayHandle, but some subclasses  
re-declare it as private. Having it public provides a convenient way to  
get the storage type of an ArrayHandle, otherwise it is quite verbose.

Addresses: #314
2023-04-14 11:26:37 -04:00
Dave Pugmire
eb3c91494e Fixes to block duplication code. 2023-04-14 10:50:30 -04:00
Louis Gombert
4ba15a993d Add new ContinuousScatterPlot filter
This new filtered designed for bi-variate analysis builds the continuous scatterplot of a 3D tetrahedralized mesh for two given scalar point fields. The continuous scatterplot is an extension of the discrete scatterplot for continuous bi-variate analysis.
2023-04-14 10:00:33 +02:00
Kenneth Moreland
42b364b416 Merge topic 'fix-mask-scatter-size'
472528822 Fix the size of Mask and ScatterPermutation arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3037
2023-04-12 17:36:13 -04:00
Vicente Bolea
f8166a3a2b Merge topic 'tweak-crusher-build'
53a11e6bb crusher,ci: change project; change compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3039
2023-04-12 17:09:39 -04:00
Kenneth Moreland
4725288224 Fix the size of Mask and ScatterPermutation arrays
While adding checks to the size of implicit arrays, it was discovered
that some of the Mask and ScatterPermutation arrays were constructed
with the wrong sizes during dispatch. In particular, these arrays were
supposed to be sized on the output, but were instead sized on the input.
They went unnoticed because they were using implicit arrays that worked
even if the array access went out of bounds.
2023-04-12 14:37:26 -06:00
Sujin Philip
3bda1505fa Merge topic 'clip-remove-unused-points'
1261e459d Clip: Remove unused points
758fedc66 Clip: Release resources early
863c8e3dc Clip: Use vtkm::cont::Invoker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3036
2023-04-12 15:35:58 -04:00
Dave Pugmire
d1e68ace91 Kick the dashboards.... 2023-04-12 12:08:30 -04:00
Vicente Adolfo Bolea Sanchez
53a11e6bbb crusher,ci: change project; change compiler 2023-04-12 12:05:24 -04:00
Sujin Philip
1261e459d3 Clip: Remove unused points
The clip filter used to copy the input points and point fields as is,
regardless of if they were actually part of the output. With this change,
we track which input points are actually part of the output and copy
only those values.

Address: #112
2023-04-11 14:35:25 -04:00
Dave Pugmire
778e2783a3 Kick the dashboards..... 2023-04-11 13:53:04 -04:00
Sujin Philip
758fedc661 Clip: Release resources early 2023-04-10 16:19:47 -04:00
Sujin Philip
863c8e3dc6 Clip: Use vtkm::cont::Invoker
Replace use of vtkm::worklet::Dispatcher* with vtkm::cont::Invoker.
2023-04-10 16:18:24 -04:00
Gunther Weber
04e8b60e1d Merge topic 'fix-ct-bd-crash'
e598fd635 Refer to field by name instead of index to fix crash in contour tree exmaple.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3034
2023-04-10 13:27:53 -04:00
Dave Pugmire
186f06a822 Remove debug statements. 2023-04-10 12:05:44 -04:00
Dave Pugmire
812b8f3930 Fix serial compile error. 2023-04-08 14:19:58 -04:00
Gunther H. Weber
e598fd6351 Refer to field by name instead of index to fix crash in contour tree exmaple. 2023-04-07 19:05:07 -07:00
Dave Pugmire
6de278d8a4 Allow block duplication 2023-04-07 09:50:29 -04:00
Vicente Bolea
ec9d3c1afd Merge topic 'add-git-lfs-instructions'
c5c41fe37 git-lfs: add instructions in CONTRIBUTING.md

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3031
2023-04-05 15:30:29 -04:00
Vicente Adolfo Bolea Sanchez
c5c41fe374 git-lfs: add instructions in CONTRIBUTING.md 2023-04-05 13:58:19 -04:00
Dave Pugmire
120f747b9d Merge topic 'sync_streamlines'
684652db9 Fix compile error in serial mode.
a5ad12a4f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into sync_streamlines
dc547de80 Remove debugging information.
42f183e81 More code cleanup................
1dea2b2ee Code cleanup........
322012a59 Only log message in debug.
9d3c24ab9 Undo an inadvertent change.
ad49b1e25 propagate the sync/async comm flag down.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abhishek Yenpure <abhi.yenpure@kitware.com>
Merge-request: !2936
2023-04-05 08:57:26 -04:00
Dave Pugmire
a0cdc62200 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2023-03-31 12:40:19 -04:00
Dave Pugmire
684652db9d Fix compile error in serial mode. 2023-03-30 22:13:20 -04:00
Dave Pugmire
a5ad12a4f4 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into sync_streamlines 2023-03-30 13:35:35 -04:00
Dave Pugmire
dc547de809 Remove debugging information. 2023-03-30 13:34:03 -04:00
Kenneth Moreland
90706d53f8 Merge topic 'safer-divide-by-volume'
014c429eb Make divide by volume in particle density estimate a little safer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !3022
2023-03-27 08:48:05 -04:00
Dave Pugmire
acdde7a5c4 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2023-03-27 07:35:52 -04:00
Zhe Wang
1fc84b85f9 Merge topic 'distributed_statistics'
d8f3e68d1 add distributed statistics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3017
2023-03-24 14:51:42 -04:00
Jay
d8f3e68d1d add distributed statistics 2023-03-24 15:19:23 +00:00
Dave Pugmire
42f183e81f More code cleanup................ 2023-03-23 15:21:43 -04:00
Dave Pugmire
1dea2b2eec Code cleanup........ 2023-03-23 15:11:33 -04:00