Commit Graph

8351 Commits

Author SHA1 Message Date
Kenneth Moreland
8e11b3ecd1 Remove ArrayPortalCheck
This portal only works on the control environment, which means it cannot
work with the new `ArrayHandle` type. Recent changes to
`ArrayHandleMultiplexer` also do not allow this, so just remove it
rather than try to fix it.
2020-11-09 12:48:10 -07:00
Kenneth Moreland
21db210a73 Make separate exec and cont versions of Variant
The `Variant` class is templated to hold objects of other types.
Depending on whether those objects of are meant to be used in the
control or execution side, the methods on `Variant` might need to be
declared with (or without) special modifiers. We can sometimes try to
compile the `Variant` methods for both host and device and ask the
device compiler to ignore incompatibilities, but that does not always
work.

To get around that, create two different implementations of `Variant`.
Their API and implementation is exactly the same except one declares its
methods with `VTKM_CONT` and the other its methods `VTKM_EXEC`.
2020-11-09 12:48:10 -07:00
Kenneth Moreland
7d681fb585 Deprecate templated versions of Field::GetRange
Instead, always use precompiled versions of range computing. This means
you won't be able to specify the type. Currently, types are limited to
scalars vecs up to size 4.

The main motivation for this change is to allow you to include Field.h
with a non-device compiler. This is an important feature for our
customers.

I plan in the future to implement a mechanism to pull out a component of
most ArrayHandle's as a single array. This would enable us to support a
precompiled version that can compute the range of arbitrarily sized
Vecs.
2020-11-09 12:28:29 -07:00
Dave Pugmire
c8c92ffdc4 Merge topic 'AMR-streamline-tests'
f4fdc5e18 MPI testing update.
c0e07e845 remove print statements.
ed790afd8 debug for dashboards
b57ffb30a Add parallel AMR streamline test.
f93ddfee9 Re-enable the other SL tests.
6663d348b Add tests for AMR-like grids for streamline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Abhishek Yenpure <abhishek@uoregon.edu>
Merge-request: !2307
2020-11-05 21:44:45 -05:00
Dave Pugmire
f4fdc5e183 MPI testing update. 2020-11-05 16:04:48 -05:00
Dave Pugmire
c0e07e845f remove print statements. 2020-11-05 16:01:55 -05:00
Dave Pugmire
ed790afd8d debug for dashboards 2020-11-05 15:49:38 -05:00
Dave Pugmire
b57ffb30ae Add parallel AMR streamline test. 2020-11-05 15:34:11 -05:00
Dave Pugmire
f93ddfee9d Re-enable the other SL tests. 2020-11-05 14:30:54 -05:00
Dave Pugmire
6663d348b7 Add tests for AMR-like grids for streamline 2020-11-05 14:25:58 -05:00
Dave Pugmire
85128cfa2e Merge topic 'ghost_streamlines'
02f73fce1 Compiler warnings.
f876a2cee Structured ONLY in LS filter.
451720167 Fix testing for both SL and PA
fb72ab097 Add tests for all datasetypes for 3D
699dbae5c compile warning and fix to PA test.
4d6776cd1 Update filter test to use all data types.
c0189982a Messed up the merge.
a7f049ac1 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into ghost_streamlines
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2293
2020-11-04 07:59:55 -05:00
Dave Pugmire
02f73fce1b Compiler warnings. 2020-11-02 21:39:24 -05:00
Dave Pugmire
f876a2ceec Structured ONLY in LS filter. 2020-11-02 17:44:18 -05:00
Dave Pugmire
4517201676 Fix testing for both SL and PA 2020-11-02 17:35:13 -05:00
Dave Pugmire
fb72ab097b Add tests for all datasetypes for 3D 2020-11-02 17:23:42 -05:00
Dave Pugmire
699dbae5ca compile warning and fix to PA test. 2020-11-02 17:16:37 -05:00
Dave Pugmire
4d6776cd16 Update filter test to use all data types. 2020-11-02 17:07:22 -05:00
Dave Pugmire
c0189982ac Messed up the merge. 2020-11-02 16:31:23 -05:00
Dave Pugmire
a7f049ac1a Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into ghost_streamlines 2020-11-02 16:28:57 -05:00
Dave Pugmire
0bd0b0c5a7 Remove PA tests (moved into SL) 2020-11-02 16:26:14 -05:00
Dave Pugmire
467ad88d06 Move PA tests into Streamline 2020-11-02 16:25:38 -05:00
Robert Maynard
67541f5ea5 Merge topic 'update_thirdparty_for_hip_support'
19216a3bd Merge branch 'upstream-lcl' into update_thirdparty_for_hip_support
5f0d04ad3 lcl 2020-10-28 (b7fe5404)
913787f3a Merge branch 'upstream-diy' into update_thirdparty_for_hip_support
25fed44bd diy 2020-10-26 (538957e7)
7c40254d3 diy: update for corrections to allow HIP compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2304
2020-10-29 15:44:43 -04:00
Kenneth Moreland
7d77676599 Merge topic 'more-tbb-device-log'
7a12c5e52 Add missing logging for some TBB device algorithms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2306
2020-10-29 14:07:14 -04:00
Robert Maynard
77a979ff2b Merge topic 'corrections_for_swap_and_math_for_hip'
0b2ddb83b UnitTestBounds custom compile flags expressed via generator expression
1ed5dfca0 vtkm/Math frexp(float) version works now with HIP
ff381bf8b vtkm/Swap works with hip

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2301
2020-10-29 10:55:55 -04:00
Kenneth Moreland
7a12c5e524 Add missing logging for some TBB device algorithms
Some of the algorithms listed near the end of
DeviceAdapterAlgorithmTBB.h were missing the entry in the performance
log letting us know it was called.
2020-10-28 18:28:27 -06:00
Robert Maynard
19216a3bd6 Merge branch 'upstream-lcl' into update_thirdparty_for_hip_support
* upstream-lcl:
  lcl 2020-10-28 (b7fe5404)
2020-10-28 14:21:28 -04:00
Lightweight Cell Library Upstream
5f0d04ad37 lcl 2020-10-28 (b7fe5404)
Code extracted from:

    https://gitlab.kitware.com/vtk/lcl.git

at commit b7fe5404f330425e44116f3e9ead66f3a30f83a7 (master).
2020-10-28 14:21:28 -04:00
Dave Pugmire
2a916ebc0f remove debug prints. 2020-10-28 09:11:00 -04:00
Dave Pugmire
722479ea10 Add different dataset types to MPI test. 2020-10-27 22:12:45 -04:00
Dave Pugmire
047bd93d5a Fix compile error 2020-10-27 14:27:34 -04:00
Dave Pugmire
5294bd2045 remove print statements. 2020-10-27 13:54:32 -04:00
Dave Pugmire
098edff0a8 Add multiple dataset types for streamline and pathline. 2020-10-27 13:43:00 -04:00
Robert Maynard
913787f3a8 Merge branch 'upstream-diy' into update_thirdparty_for_hip_support
* upstream-diy:
  diy 2020-10-26 (538957e7)
2020-10-26 17:20:25 -04:00
Diy Upstream
25fed44bdf diy 2020-10-26 (538957e7)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit 538957e7850b9e0007fe814bc37219152f533285 (for/vtk-m-20201026-master).
2020-10-26 17:20:25 -04:00
Dave Pugmire
dedf4d7a7d fix compile error. 2020-10-26 16:36:26 -04:00
Dave Pugmire
c592095f75 fix compile warnings. 2020-10-26 15:59:38 -04:00
Dave Pugmire
e8dc7e0eee Add more dataset types for testing. 2020-10-26 15:49:58 -04:00
Robert Maynard
7c40254d39 diy: update for corrections to allow HIP compilation 2020-10-26 15:07:16 -04:00
Dave Pugmire
46a82c6985 add data generation functions. 2020-10-26 14:37:20 -04:00
Dave Pugmire
dbe9e17882 Add helper functions for generating datasets. 2020-10-26 13:45:47 -04:00
Dave Pugmire
eb76dff8d2 Support for ghost cells in P.A. filter 2020-10-26 12:39:31 -04:00
Kenneth Moreland
29fd565b5f Merge topic 'perf-schedule-task'
0b1c48a3e Identify number of partitions in filter execution
b33c54bf6 Add ScheduleTask to performance log

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2302
2020-10-26 11:55:03 -04:00
Vicente Bolea
7370934244 Merge topic 'fix-548-error-mapping-contour'
1add731ef BenchmarkFilters: Add Unstructured bench for Contour
b22823a54 Contour: Zero-init arrays in Flying Edges

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2197
2020-10-26 11:42:29 -04:00
Kenneth Moreland
0b1c48a3ee Identify number of partitions in filter execution
When you execute a filter, the default behavior is to do the execution
on each partition of the data set independently. This code path is
followed even for non-partitioned data; the `DataSet` is wrapped in a
`PartitionedDataSet` of one partition.

Make performance logging a bit more clear by only giving one scoped log
for a basic `DataSet` and recording the number of partitions executed in
the log.
2020-10-26 09:00:09 -06:00
Kenneth Moreland
b33c54bf61 Add ScheduleTask to performance log
When `DeviceAdapterAlgorithm::ScheduleTask` was called directly (i.e.
not through `Schedule`), nothing was added to the log. Adding
`VTKM_LOG_SCOPE` to these methods so that all scheduling is added to the
performance log.
2020-10-25 17:22:38 -06:00
Dave Pugmire
b041891b5d Fix bad index in a unit test. 2020-10-23 22:46:47 -04:00
Dave Pugmire
6e42c4fe31 remove unused function. 2020-10-23 22:43:56 -04:00
Dave Pugmire
f8fe2e16b4 Add more data set types to filter tests. 2020-10-23 16:19:49 -04:00
Dave Pugmire
0dccfdc61e Code cleanup and more tests for ghostcells 2020-10-23 14:37:28 -04:00
Robert Maynard
0b2ddb83b3 UnitTestBounds custom compile flags expressed via generator expression 2020-10-22 16:48:18 -04:00