Commit Graph

8123 Commits

Author SHA1 Message Date
Robert Maynard
0b2ddb83b3 UnitTestBounds custom compile flags expressed via generator expression 2020-10-22 16:48:18 -04:00
Robert Maynard
1ed5dfca0b vtkm/Math frexp(float) version works now with HIP 2020-10-22 15:32:14 -04:00
Robert Maynard
ff381bf8b4 vtkm/Swap works with hip 2020-10-22 15:32:06 -04:00
Robert Maynard
093d25f342 Merge topic 'second_round_of_vtkm_changes_for_hip_support'
71ff85e92 vtkm/Math can now works with HIP device functions
7834b5155 vtkm::Math::ModF calls correct CUDA math function
264b4fabc vtkm/Algorithms now can do device side HIP algorithms
f04b12d9d vtkm/Atomic can now safely include kokkos when HIP is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2276
2020-10-20 10:36:41 -04:00
Robert Maynard
71ff85e926 vtkm/Math can now works with HIP device functions 2020-10-20 09:49:24 -04:00
Robert Maynard
7834b5155b vtkm::Math::ModF calls correct CUDA math function 2020-10-20 09:24:05 -04:00
Robert Maynard
264b4fabc6 vtkm/Algorithms now can do device side HIP algorithms 2020-10-20 09:24:05 -04:00
Robert Maynard
f04b12d9db vtkm/Atomic can now safely include kokkos when HIP is enabled 2020-10-20 09:24:05 -04:00
Robert Maynard
048a417c5d Merge topic 'update_ci_to_tests_cuda_11'
d5d91c61d Update ubuntu1804+cuda from 10.1 to 11.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2291
2020-10-19 15:36:18 -04:00
Robert Maynard
d5d91c61d3 Update ubuntu1804+cuda from 10.1 to 11.1
The image was previously using 10.1 which has issues generating
ptx for numerous filters. Moving to a newer CUDA version corrects
these issues
2020-10-19 15:32:10 -04:00
Robert Maynard
a671ab6695 Merge topic 'correct_atomic_load_warnings'
fa42c9a55 Correct casting warning in AtomicArrayExecutionObject

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2290
2020-10-16 17:16:01 -04:00
Robert Maynard
fa42c9a55c Correct casting warning in AtomicArrayExecutionObject
Fixes a warning introduced by !2282
2020-10-16 09:39:08 -04:00
Robert Maynard
0c8cd26199 Merge topic 'correct_atomic_load_api'
5fe6c36fa vtkm::AtomicLoad should only occur on non-const values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2282
2020-10-15 17:50:02 -04:00
Kenneth Moreland
aa21bf4f94 Merge topic 'arrayhandle-const-correct'
4a1b26d1b Change ArrayHandle::ReleaseResourcesExecution to be const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2288
2020-10-15 16:36:50 -04:00
Kenneth Moreland
4a1b26d1b1 Change ArrayHandle::ReleaseResourcesExecution to be const
The `ReleaseResourcesExecution` method makes changes by booting data off
of the execution environment. But logically the array does not change.
It remains the same size with the same contents. Thus, it makes sense
for this to be a const method.

Also modified some deprecated methods a bit to remove some unnecessary
templates.
2020-10-15 10:03:38 -06:00
Kenneth Moreland
26dd40a196 Merge topic 'scope-map-field-helpers'
19944653b Add scope log for functions that help map fields in filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2286
2020-10-14 11:37:17 -04:00
Kenneth Moreland
19944653bc Add scope log for functions that help map fields in filters 2020-10-13 16:35:25 -06:00
Kenneth Moreland
5c1e08467c Merge topic 'scope-locators'
c60cae3b8 Add scope logs for building locators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2285
2020-10-13 15:55:10 -04:00
Kenneth Moreland
c60cae3b87 Add scope logs for building locators 2020-10-13 12:41:25 -06:00
Kenneth Moreland
2712c105de Merge topic 'test-advect-explicit'
4dec08c6f Add tests for advecting particles in explict cell sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2284
2020-10-13 14:38:34 -04:00
Kenneth Moreland
4dec08c6f0 Add tests for advecting particles in explict cell sets
The `UnitTestParticleAdvectionFilter` was only testing advection in
structured cell sets (with either uniform or rectilinear points). This
did not test all paths (i.e. grid evaluators and locators) of particle
advection. Changed the test to also try grids with explicit cells.

Note that the explicit cells are created by just converting the
rectilinear grids to explicit grids. It would be better to get at least
one small dataset that starts as unstructured.
2020-10-13 09:06:02 -06:00
Robert Maynard
b70f677856 Merge topic 'scope-scatters'
f5c5b6188 Log the computation of ranges in fields and arrays
bef55f8ee Log the conversion of num components to offsets
420b9d397 Log the building of arrays for scatters and masks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2283
2020-10-13 09:02:51 -04:00
Robert Maynard
5c769b1b5f Merge topic 'remove_unused_functions'
22dfb4776 Remove unused functions from TestingDeviceAdapter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2281
2020-10-13 08:58:57 -04:00
Kenneth Moreland
f5c5b61880 Log the computation of ranges in fields and arrays 2020-10-12 15:51:09 -06:00
Kenneth Moreland
bef55f8ee3 Log the conversion of num components to offsets 2020-10-12 14:02:31 -06:00
Kenneth Moreland
420b9d3979 Log the building of arrays for scatters and masks 2020-10-12 13:19:43 -06:00
Sujin Philip
0d5178dfc5 Merge topic 'kokkos-opt-algo'
c26e193fe Use kokkos provided routines for sort and copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2277
2020-10-12 10:28:01 -04:00
Kenneth Moreland
f00880f1ee Merge topic 'device-type-in-perf-log'
7933c70ca Add dispatcher type when logging worklet invocation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2280
2020-10-09 16:26:46 -04:00
Robert Maynard
5fe6c36fa2 vtkm::AtomicLoad should only occur on non-const values
Previously vtk-m allowed users to issue atomic loads on constant
values which is problematic for the following reasons:

 - can be a source of undefined behavior
 - not supported by kokkos

This issue was detected when using kokkos HIP atomic implementation
2020-10-09 14:20:21 -04:00
Robert Maynard
22dfb4776e Remove unused functions from TestingDeviceAdapter 2020-10-09 14:13:45 -04:00
Kenneth Moreland
7933c70ca5 Add dispatcher type when logging worklet invocation
When you invoke a worklet, a scoped performance log is automatically
generated. The previous version gave the name of the worklet, which is
technically everything you need to know. However, it is also convenient
to know what type of worklet it is (e.g. a field map worklet or a
topology map worklet). This can be determined by looking at the
definition of the worklet in the source code, but that is not practical
if, for example, you want to perform automated analysis.

This change prints out the type of the dispatcher instead of the
worklet. The full type of the dispatcher includes the worklet as a
template parameter, so you get both the dispatcher/worklet type and the
worklet itself. So previously you would get log lines like

```
Invoking Worklet: 'vtkm::worklet::vtkm::worklet::ExternalFaces::NumFacesPerCell'
```

They now look like this:

```
Invoking Worklet: 'vtkm::worklet::DispatcherMapTopology<vtkm::worklet::ExternalFaces::NumFacesPerCell>'
```
2020-10-08 16:10:00 -06:00
Li-Ta Lo
ec6b2bc7fb Merge topic 'concurrent_union_find'
268a07bb0 remove test on large graph and sample data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2278
2020-10-08 15:38:07 -04:00
Li-Ta Lo
268a07bb06 remove test on large graph and sample data 2020-10-08 13:26:46 -06:00
Sujin Philip
c26e193fec Use kokkos provided routines for sort and copy 2020-10-08 13:46:43 -04:00
Vicente Bolea
3ea0761a9d Merge topic 'fix-540-benchmarkfilters-crash'
a290de5bc BenchmarkFilters: adds unstructured Dataset for some filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2196
2020-10-07 21:41:18 -04:00
Vicente Adolfo Bolea Sanchez
a290de5bcc BenchmarkFilters: adds unstructured Dataset for some filters
- It also remove termination on bench error
- It disables passing fields in Countour to skip an error.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-10-07 18:46:36 -04:00
Li-Ta Lo
2b0960f279 Merge topic 'concurrent_union_find'
932f8b82f Merge branch 'concurrent_union_find' of gitlab.kitware.com:ollielo/vtk-m into concurrent_union_find
eaff27195 minor changes on comments on findRoot()
9fef540ba minor changes on comments on findRoot()
916661e33 Merge branch 'concurrent_union_find' of gitlab.kitware.com:ollielo/vtk-m into concurrent_union_find
a036b0f98 Minor change based on code review.
9e68022ac Minor change based on code review.
1185f70bc Data Race Resolution
aed7e02da Merge branch 'concurrent_union_find' of gitlab.kitware.com:ollielo/vtk-m into concurrent_union_find
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2248
2020-10-07 17:48:30 -04:00
Li-Ta Lo
932f8b82f0 Merge branch 'concurrent_union_find' of gitlab.kitware.com:ollielo/vtk-m into concurrent_union_find 2020-10-07 15:46:17 -06:00
Li-Ta Lo
eaff271950 minor changes on comments on findRoot() 2020-10-07 15:09:12 -06:00
Li-Ta Lo
9fef540ba7 minor changes on comments on findRoot() 2020-10-07 14:25:52 -06:00
Li-Ta Lo
916661e33e Merge branch 'concurrent_union_find' of gitlab.kitware.com:ollielo/vtk-m into concurrent_union_find 2020-10-07 14:24:24 -06:00
Li-Ta Lo
a036b0f980 Minor change based on code review. 2020-10-07 14:23:40 -06:00
Li-Ta Lo
9e68022acc Minor change based on code review. 2020-10-07 14:12:27 -06:00
Li-Ta Lo
1185f70bc9 Data Race Resolution
Finished the comments on data races and their resolution.
2020-10-07 11:56:02 -06:00
Li-Ta Lo
aed7e02da9 Merge branch 'concurrent_union_find' of gitlab.kitware.com:ollielo/vtk-m into concurrent_union_find 2020-10-06 13:42:17 -06:00
Li-Ta Lo
3c7aa34267 Remove duplicate code in ImageConnectivity.h and GraphConnectivity.h 2020-10-06 13:38:59 -06:00
Dave Pugmire
1b2623664b Merge topic 'virtual-less-particle'
303520ad4 Remove virtuals from vtkm::Particle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abhishek Yenpure <abhishek@uoregon.edu>
Merge-request: !2273
2020-10-06 15:09:28 -04:00
Dave Pugmire
303520ad48 Remove virtuals from vtkm::Particle 2020-10-06 13:25:26 -04:00
Kenneth Moreland
757766431b Merge topic 'variant-is-trivial'
4a7aae86f Allow Variant to be trivial

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2265
2020-10-06 10:43:08 -04:00
Li-Ta Lo
43aa21df40 Merge branch 'master' into concurrent_union_find 2020-10-05 09:28:31 -06:00