Matt Larsen authored 5 years ago and Kitware Robot committed 5 years ago

3b123594 Longer fixed message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sudhanshu Sane <ssane@cs.uoregon.edu>
Acked-by: Abhishek Yenpure <abhishek@uoregon.edu>
Merge-request: !1979

Robert Maynard authored 5 years ago and Kitware Robot committed 5 years ago

e78099e0 Update UnitTestWorkletMapField3d to use vtkm::cont::Token

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1976

Robert Maynard authored 5 years ago and Kitware Robot committed 5 years ago

aa820aec Add changelog for mask and scatter 3d scheduling support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1975

Robert Maynard authored 5 years ago and Kitware Robot committed 5 years ago

f4153fe2 Correct warnings found with CUDA 10.2 + gcc 4.8.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1974

Robert Maynard authored 5 years ago and Kitware Robot committed 5 years ago

1f168848 Initial infrastructure to allow WorkletMapField to have 3D scheduling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1938

Kenneth Moreland authored 5 years ago and Kitware Robot committed 5 years ago

e5a6f2d4 Make ArrayPortalWrapper more tolerant of host objects
8569359e Add threads library to vtkm_cont
69c03d90 Fix deadlock in rendering
14c3d90a Fix race condition in UnitTestToken
9b876df9 Remove PortalType from ArrayHandleImplicitTraits
188d1c56 Correct "invalid" portal in ArrayHandleTransform
ec34cb56 Use new ways to get array portal in control environment
8ddde979 ArrayPortalToIterators gets custom iterator from ArrayPortalToken
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1953

Found during building on Centos7 based Power9 machines

The ArrayPortalWrapper is used for both execution and control portals.
When it was wrapped around a control portal that does not work on CUDA
devices, we were getting ugly warnings even though the intention was
only to use it in the control environment.

With the new thread safety/token code, the vtkm_cont library now relies
on the pthreads library (or whatever threads library is used by std on
the system). Make sure this library gets added to vtkm_cont.

Apparently when future::get returns, it is not the case that all
resources of the future are cleaned up (only that the calling function
has returned). Do not rely on this resource cleanup for the test to
pass.

The type for PortalType was declared before the class from which the
type came from. Normally this was not a big deal since the template was
resolved later, but nvcc seemed to have a problem with it.

For an ArrayHandleTransform with no inverse functor, it really
only supports read-only portals. Thus, the non-const portal
for the execution environment was set to some unused control
portal. That was causing problems with CUDA, so make the
non-const portal valid (although without a Set).

Also fix deadlocks that occur when portals are not destroyed
in time.

Because ArrayPortalToken does not have an IteratorType,
ArrayPortalToIterators assumed it had to wrap it in an
IteratorFromArrayPortal object. Now it uses PortalSupportsIterators
(from ArrayPortalHelpers.h) to determine whether the iterators are
there. This does work with ArrayPortalToken.

To get a portal to access ArrayHandle values in the control
environment, you now use the ReadPortal and WritePortal methods.
The portals returned are wrapped in an ArrayPortalToken object
so that the data between the portal and the ArrayHandle are
guaranteed to be consistent.

This fixes an issue where moving a Token object left the original Token
in an invalid state because the poiner to the internals was NULL. Rather
than allocate a new one, just make the Token work correctly if the
internals are NULL.

It is questionable whether there is a point to having a token object
when transfering a virtual object to a device (since there is a handle
object that is managing it anyway). Back out of passing the token all
the way down unless there is an actual need for that.

The new Token functionality makes it easy for a thread to deadlock
itself if it does not detach a token after it is done.

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.

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.

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.

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.

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.

Kenneth Moreland authored 5 years ago and Kitware Robot committed 5 years ago

47249ee3 Merge branch 'master' into oruebel/vtk-m-cleanup/contourtreeaugmented
392854ee Replace C-tyle casts with C++ style
230ef15e Fix layout of array definition in unit test
712ae106 Fix memory bug in contour tree unit test
4501afb2 Iprove array style in test
3f998825 Remove completed TODO items
45e9684d Improve layout of arrays in unit test
0a897aa9 Improve layout of arrays in unit test
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1972

Vicente Bolea authored 5 years ago and Kitware Robot committed 5 years ago

ba030da1 remove confusing parts of the README example code
8dcd0242 fix README.md code example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1959

Vicente Bolea authored 5 years ago and Kitware Robot committed 5 years ago

f6a333a3 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

Robert Maynard authored 5 years ago and Kitware Robot committed 5 years ago

576ff5ec ImageConnectivity didn't support multiple TU's compiling it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1971

By default VTK-m would install its README.md and LICENSE.md.
Some application might need not to install those, hence this option.