Commit Graph

6231 Commits

Author SHA1 Message Date
Oliver Ruebel
5cebd3b0dc Update print of edge arrays 2020-12-02 14:29:12 -08:00
Oliver Ruebel
7d1d9aa99f Remove extra build guards for DebugPrint 2020-12-02 14:29:12 -08:00
Oliver Ruebel
d78aa95c4a Change FieldIn to FieldInOut to prevent overwrite of preinit values 2020-12-02 14:29:12 -08:00
Oliver Ruebel
eb616dbbab Use FieldInOut instead of FieldIn to prevent overwrite of pre-initalized values 2020-12-02 14:29:11 -08:00
Gunther H. Weber
f433790a17 Ported distributed contour tree prototype to vtk-m 2020-12-02 14:29:11 -08:00
Kenneth Moreland
ea3f101953 Merge topic 'bridge-old-and-new-style-arrayhandle'
1fb4c0499 Rename ArrayHandle::FakeBuffer to BufferAsStorageWrapper
05fea4d17 Bridge old-style ArrayHandle to new-style
62c509520 Save host portal for ArrayHandleVirtual in array instead of portal
bc3a7d8e2 Restore composite of transform in UnitTestParticleDensity.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2339
2020-12-02 14:12:41 -05:00
Kenneth Moreland
1fb4c0499e Rename ArrayHandle::FakeBuffer to BufferAsStorageWrapper
It's not fake so much as only containing metadata referencing to self.
Using the `Buffer` to shallow copy to a new `ArrayHandle` works fine.
2020-12-02 10:22:33 -07:00
nadavi
9741bbb905 Update Images and exclude RegressionTest from ctest_memcheck on centos8 builds 2020-12-02 16:24:11 +00:00
nadavi
9c59f3907a remove MakeTestDataSet, generate vtk dataset files 2020-12-02 16:24:10 +00:00
nadavi
b883b2d92b support adding images to the gitlab ci archive for regression tests 2020-12-02 16:24:08 +00:00
nadavi
1818a885bf Generate and test regression-test images with io library updates 2020-12-02 16:24:07 +00:00
nadavi
8b7fd61753 Implement and test Image Comparison Filters and Worklets 2020-12-02 16:24:06 +00:00
Kenneth Moreland
05fea4d170 Bridge old-style ArrayHandle to new-style
The new-style `ArrayHandle` uses `Buffer` objects to manage data. Thus,
when one is decorating the other, it expects to find the `Buffer`
objects, which the old-style `ArrayHandle`s do not have. To make the two
work together, fake buffers in the old-style arrays.

The buffers in old-style arrays are empty, but have metadata that points
back to the `ArrayHandle.
2020-12-01 16:24:49 -07:00
Kenneth Moreland
62c5095209 Save host portal for ArrayHandleVirtual in array instead of portal
Previously, when you got a host/control portal from
`ArrayHandleVirtual`, you got a version of an `ArrayPortal` that manged
its own reference to the virtual structure that was implementing the
portal. This was not done for device/execution portals because those
objects could not do the appropriate resource management from the
execution environment.

Rather than releasing the host object to the portal, keep the host
object managed by `StorageVirtual`. This allows the control and
execution portals to be the same type, which we will need to be friendly
with new array objects.
2020-11-30 16:40:28 -07:00
Kenneth Moreland
bc3a7d8e25 Restore composite of transform in UnitTestParticleDensity.cxx
Fixes #584
2020-11-30 16:40:28 -07:00
Sujin Philip
755b136354 Merge topic 'kokkos-use-explicit-syncs'
89e19ce7f Don't require CUDA_LAUNCH_BLOCKING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2333
2020-11-30 14:28:20 -05:00
Sujin Philip
89e19ce7fa Don't require CUDA_LAUNCH_BLOCKING
1. The code now works without CUDA_LAUNCH_BLOCKING set by using explicit
   synchronizations where required.
2. The code has also been modified to use thread specific memory spaces,
   which for Kokkos' Cuda backend means per thread streams.
2020-11-30 13:12:39 -05:00
Nick Thompson
b249986473 Merge topic 'less_verbose_zfp'
8ae76a458 Revert unfocused diffs.
4b3ca3f54 Make ZFP tests less verbose.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2336
2020-11-29 15:02:14 -05:00
Nick Thompson
8ae76a458b Revert unfocused diffs. 2020-11-29 14:16:05 -05:00
Kenneth Moreland
a77a1f7f48 Merge topic 'arrayhandlecompositevec-use-buffer'
fb130d42d Remove test for ArrayHandleCompositeVector with bad lengths
7cbf40d5b Back out of using a composite of transform arrays
7ff1a690d Support ArrayHandleCompositeVector with 1 component
5391e353a Convert ArrayHandleExtractComponent to new buffer-style array
22fac15b3 Convert ArrayHandleCompositeVector to new buffer-style array

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2330
2020-11-28 13:37:27 -05:00
Kenneth Moreland
553f97650c Merge topic 'swizzle-uses-transform'
35ca89531 Simplify ArrayHandleSwizzle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2334
2020-11-28 13:33:40 -05:00
Nick Thompson
4b3ca3f54e Make ZFP tests less verbose. 2020-11-25 15:50:10 -05:00
Dave Pugmire
b8287665e5 Merge topic 'pathline_manual_fix'
3c50a7ea4 Fix assert for pathlines. Add example from manual that was failing.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2335
2020-11-25 14:02:06 -05:00
Nick Thompson
2addc19eac Merge topic 'less_verbose_logging'
5d4c3f0c6 Less verbose logging.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2329
2020-11-25 13:54:23 -05:00
Nick Thompson
39b6090402 Merge topic 'more_digits'
0019c0b3a Missing include file.
db00f356b Merge remote-tracking branch 'origin/master' into more_digits
3a9e97bb8 Write more digits in VTKDataSetWriter.cxx.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2328
2020-11-25 13:53:37 -05:00
Dave Pugmire
3c50a7ea46 Fix assert for pathlines. Add example from manual that was failing. 2020-11-25 12:43:00 -05:00
Kenneth Moreland
35ca89531c Simplify ArrayHandleSwizzle
As we update the `ArrayHandle`s to the new buffer style, simplify
`ArrayHandleSwizzle` by implementing it on top of
`ArrayHandleTransform`. Also, introduce some C++11 template concepts to
handle variable arguments better.

In this conversion, some features have been removed. Previously if the
swizzle dropped some components, you were still allowed to write to the
array. This would be an in place write that would only update the passed
components. This feature has been removed and if any components are
dropped, the array becomes read only. If all components are swizzled,
then the array becomes writable (through templating).

Another lost feature is that the swizzle map is no longer checked for
correctness. The array handle just assumes that the indices are correct.

It should be noted that it does not look like `ArrayHandleSwizzle` is
actually used anywhere. If it is not used by any customers, we may
want to consider deprecating the class.
2020-11-25 09:28:49 -07:00
Dave Pugmire
8f2ec9e467 add better comment. 2020-11-24 16:07:02 -05:00
Dave Pugmire
967fb9fadf Remove unneeded cast in worklet, clarify the code in threaded algo. 2020-11-24 15:06:36 -05:00
Dave Pugmire
5297c36e2c fix compile error. 2020-11-24 13:48:20 -05:00
Dave Pugmire
5992f9f694 Restore the cmake after the clip issue was fixed. 2020-11-24 13:36:58 -05:00
Dave Pugmire
9cdcddb0c3 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into threaded_particleAdvection 2020-11-24 13:35:30 -05:00
Dave Pugmire
eb7d791f24 Rename the worker-sync variables. 2020-11-24 13:26:46 -05:00
Dave Pugmire
b0f97f480b Add condition_variable to sleep the worker. 2020-11-24 11:47:32 -05:00
Kenneth Moreland
fb130d42de Remove test for ArrayHandleCompositeVector with bad lengths
The old version of `ArrayHandleCompositeVector` would check (at
construction) to make sure that all the arrays had the same length. This
check has been removed because (1) it did not always catch all problems
(such as if the input arrays change), (2) debug builds check for out-of-
range array accesses anyway, and (3) it required a lot of extra template
expansion.

Because that check has been removed, also remove the part of the
`ArrayHandleCompositeVector` test that checks this check.
2020-11-23 17:41:07 -07:00
Kenneth Moreland
7cbf40d5b2 Back out of using a composite of transform arrays
This should be restored once transform arrays use the new buffer-style
arrays.
2020-11-23 17:30:57 -07:00
Kenneth Moreland
7ff1a690de Support ArrayHandleCompositeVector with 1 component
When `ArrayHandleCompositeVector` has only 1 component, it is supposed
to have a special template that uses the base value type rather than a
`Vec` of that type. However, the `Storage` with the value type was
missing. I'm not sure how we weren't getting compile errors before, but
moving to the new buffer arrays seems to bring about the expected error.
2020-11-23 17:17:31 -07:00
Kenneth Moreland
5391e353a0 Convert ArrayHandleExtractComponent to new buffer-style array 2020-11-23 15:45:31 -07:00
Kenneth Moreland
22fac15b32 Convert ArrayHandleCompositeVector to new buffer-style array 2020-11-23 14:56:17 -07:00
Dave Pugmire
675f2d50f4 Add a debug mode assert to verify buffer size. 2020-11-23 15:30:36 -05:00
Kenneth Moreland
b7a09f5ecb Re-introduced deprecated StorageImplicit.h
The `StorageImplicit.h` header is no longer used. However, just removing
it causes compiles to fail if they include it. To make the transition
better, re-add this file, but cause a deprecation warning if it is
included.
2020-11-23 08:12:09 -07:00
Dave Pugmire
9f204abbb2 Assert is wrong. will fix tomorrow 2020-11-22 21:41:10 -05:00
Dave Pugmire
9b290994f5 fix compile warnings. 2020-11-21 22:20:20 -05:00
Dave Pugmire
9da2b86d72 Implement blockAndWait for threaded 2020-11-21 22:13:16 -05:00
Kenneth Moreland
51c954c857 Merge topic 'arrayhandledecorator-use-buffer'
f80071894 Convert ArrayHandleDecorator to new buffer-style arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2324
2020-11-20 16:20:11 -05:00
Nick Thompson
5d4c3f0c61 Less verbose logging. 2020-11-20 15:12:23 -05:00
Dave Pugmire
741fff75c8 support for blockAndSend when a rank is totally idle. 2020-11-20 14:57:33 -05:00
Dave Pugmire
669794f992 Support for blockAndWait. Do sends BEFORE receives. 2020-11-20 14:57:04 -05:00
Nick Thompson
0019c0b3af Missing include file. 2020-11-20 13:46:59 -05:00
Nick Thompson
db00f356b0 Merge remote-tracking branch 'origin/master' into more_digits 2020-11-20 13:03:38 -05:00