Commit Graph

7312 Commits

Author SHA1 Message Date
Kenneth Moreland
7aa043b0da Add necessary tokens to OpenMP device algorithms 2020-02-25 09:39:28 -07:00
Kenneth Moreland
b2fdf236e7 Fix deadlocks in device adapters and low level tests
The new Token functionality makes it easy for a thread to deadlock
itself if it does not detach a token after it is done.
2020-02-25 09:39:27 -07:00
Kenneth Moreland
1149a0f7fb Add change log for scoping tokens 2020-02-25 09:39:26 -07:00
Kenneth Moreland
ad0a53af71 Convert execution preparation to use tokens
Marked the old versions of PrepareFor* that do not use tokens as
deprecated and moved all of the code to use the new versions that
require a token. This makes the scope of the execution object more
explicit so that it will be kept while in use and can potentially be
reclaimed afterward.
2020-02-25 09:39:19 -07:00
Kenneth Moreland
642b59f4fd Allow a token to attach to an ArrayHandle multiple times
When a single `ArrayHandle` is given to multiple arguments of a worklet
dispatch, the `PrepareFor*` methods will be called multiple times with
the same token. If one of them is a `PrepareForInPlace` or
`PrepareForOutput`, then the two requests will deadlock. To prevent
this, allow the `PrepareFor*` to happen if the same token was used
previously.
2020-02-25 07:41:40 -07:00
Kenneth Moreland
76ce9c87f0 Support using Token calling PrepareForExecution in ExecutionObject
The old version of ExecutionObject (that only takes a device) is still
supported, but you will get a deprecated warning if that is what is
defined.

Supporing this also included sending vtkm::cont::Token through the
vtkm::cont::arg::Transport mechanism, which was a change that propogated
through a lot of code.
2020-02-25 07:41:39 -07:00
Kenneth Moreland
ef3f544a67 Add ability to attach token to general ArrayHandle
Duplicated the new versions of PrepareFor* methods from the basic
ArrayHandle that take a token in addition to the other arguments. The
ArrayHandle attaches itself to the token and will not allow operaitons
that make the returned portal invalid until the token goes out of scope.

Later the old versions will be deprecated.
2020-02-25 07:41:37 -07:00
Kenneth Moreland
5f44f3727c Add ability to attach token to standard ArrayHandle
Added new versions of PrepareFor* methods that take a token in addition
to the other arguments. The ArrayHandle attaches itself to the token and
will not allow operations that make the returned portal invalid until
the token goes out of scope.

Later the old versions will be deprecated.
2020-02-25 07:41:36 -07:00
Kenneth Moreland
a49fa83035 Add Token 2020-02-25 07:41:36 -07:00
Kenneth Moreland
6c91757351 Merge topic 'oruebel/vtk-m-cleanup/contourtreeaugmented'
47249ee3c Merge branch 'master' into oruebel/vtk-m-cleanup/contourtreeaugmented
392854ee3 Replace C-tyle casts with C++ style
230ef15e4 Fix layout of array definition in unit test
712ae1063 Fix memory bug in contour tree unit test
4501afb24 Iprove array style in test
3f9988253 Remove completed TODO items
45e9684d9 Improve layout of arrays in unit test
0a897aa94 Improve layout of arrays in unit test
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1972
2020-02-25 09:39:17 -05:00
Kenneth Moreland
47249ee3c0 Merge branch 'master' into oruebel/vtk-m-cleanup/contourtreeaugmented 2020-02-24 20:53:47 -07:00
Vicente Bolea
bd3256a2d6 Merge topic 'fix-readme-example-code'
ba030da1d remove confusing parts of the README example code
8dcd02422 fix README.md code example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1959
2020-02-24 15:04:05 -05:00
Vicente Bolea
c7e205a63b Merge topic 'fix-455-license-file'
f6a333a32 add VTKm_NO_INSTALL_README_LICENSE option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1969
2020-02-24 15:03:42 -05:00
Oliver Ruebel
392854ee35 Replace C-tyle casts with C++ style 2020-02-24 11:19:37 -08:00
Robert Maynard
a5e8ed4580 Merge topic 'allow_multiple_compilations_of_image_connectivity_filter'
576ff5ec8 ImageConnectivity didn't support multiple TU's compiling it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1971
2020-02-21 16:18:24 -05:00
Robert Maynard
576ff5ec87 ImageConnectivity didn't support multiple TU's compiling it 2020-02-21 13:01:51 -05:00
Vicente Adolfo Bolea Sanchez
f6a333a32a add VTKm_NO_INSTALL_README_LICENSE option
By default VTK-m would install its README.md and LICENSE.md.
Some application might need not to install those, hence this option.
2020-02-19 17:14:55 -05:00
Robert Maynard
37d55a4ada Merge topic 'adding-link-tutorial'
4639e0373 add link to tutorial at the wiki

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1965
2020-02-19 11:27:44 -05:00
Vicente Adolfo Bolea Sanchez
4639e03732 add link to tutorial at the wiki 2020-02-19 11:03:31 -05:00
Robert Maynard
576bd6bbea Merge topic 'adding-link-tutorial'
3cf1d9dbe add link to tutorial at the wiki

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1960
2020-02-19 10:57:22 -05:00
Matt Larsen
33a154337a add deprecation 2020-02-18 09:51:56 -08:00
Matt Larsen
a7363c283c alter interface of scalar renderer result 2020-02-18 09:45:31 -08:00
Matt Larsen
5fc77cb585 warnings and store depth separately 2020-02-18 07:25:00 -08:00
Matt Larsen
aa468f5c00 more warning fixes 2020-02-17 20:09:51 -08:00
Matt Larsen
0943784c22 fix warning 2020-02-17 19:53:54 -08:00
Matt Larsen
094758e55a make result public? 2020-02-17 19:50:40 -08:00
Matt Larsen
70584ac8f6 fix benchmarks 2020-02-17 19:46:59 -08:00
Matt Larsen
458be65e9b fix logic error 2020-02-17 19:06:28 -08:00
Matt Larsen
b4b7519584 let there be scalar things 2020-02-17 19:00:09 -08:00
Robert Maynard
000e1781d6 Merge topic 'add_recommend_review_hints'
7a6430e3d Add CODEOWNERS to vtk-m to improve merge request reviewer suggestions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1957
2020-02-17 14:38:57 -05:00
Vicente Adolfo Bolea Sanchez
ba030da1d6 remove confusing parts of the README example code 2020-02-17 10:51:42 -05:00
Kenneth Moreland
90890ae802 Merge topic 'fix-warning'
ef7b89920 Fix type conversion warning in ContourTreeApp example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1956
2020-02-17 10:22:22 -05:00
Vicente Adolfo Bolea Sanchez
3cf1d9dbe0 add link to tutorial at the wiki 2020-02-17 10:17:27 -05:00
Vicente Adolfo Bolea Sanchez
8dcd024228 fix README.md code example 2020-02-14 12:07:07 -05:00
Kenneth Moreland
ef7b899208 Fix type conversion warning in ContourTreeApp example 2020-02-13 08:26:59 -07:00
Matt Larsen
2123a56ab3 Merge topic 'change_lagrangian_output_structuredgrid'
e68b283e8 Delete commented, unused class variables
4d358e5b2 Remove coordinates from class member variable list
e6647efaf Fix condition to populate coordinate variables
2e2a847f5 Change Lagrangian output format to structured grid

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1945
2020-02-12 16:20:19 -05:00
Robert Maynard
7a6430e3d8 Add CODEOWNERS to vtk-m to improve merge request reviewer suggestions 2020-02-11 12:53:07 -05:00
Kenneth Moreland
37128fc151 Merge topic 'find-benchmark'
7e49c1131 Mark the find_package(benchmark) with required

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1942
2020-02-11 12:17:11 -05:00
Kenneth Moreland
3d421ff589 Merge topic 'deprecate-old-topology-worklets'
f7709a8db Mark deprecated superclasses of WorkletMapTopology with VTKM_DEPRECATED

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1955
2020-02-11 12:16:15 -05:00
Robert Maynard
6a62b7f2e4 Merge topic '450_openmp_scaling'
1f61c500e Remove non-atomic ops from BitField unit test.
5565848d9 Use a dynamic strategy for openmp 1D scheduling.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1925
2020-02-11 12:12:47 -05:00
Matt Larsen
1fc064dcf8 create scalar renderer 2020-02-09 08:57:32 -08:00
mclarsen
9e77a8b4cd add files for a scalar renderer 2020-02-07 20:30:55 -08:00
mclarsen
d4305c0435 remove unused variable 2020-02-07 15:16:09 -08:00
Kenneth Moreland
f7709a8dba Mark deprecated superclasses of WorkletMapTopology with VTKM_DEPRECATED 2020-02-06 20:30:21 -06:00
Oliver Ruebel
230ef15e4b Fix layout of array definition in unit test 2020-01-30 16:45:59 -08:00
Oliver Ruebel
712ae1063b Fix memory bug in contour tree unit test 2020-01-30 16:41:08 -08:00
Oliver Ruebel
4501afb24d Iprove array style in test 2020-01-30 14:13:44 -08:00
Oliver Ruebel
3f9988253b Remove completed TODO items 2020-01-30 01:16:38 -08:00
Oliver Ruebel
45e9684d97 Improve layout of arrays in unit test 2020-01-30 01:14:29 -08:00
Oliver Ruebel
0a897aa947 Improve layout of arrays in unit test 2020-01-30 01:06:43 -08:00