Commit Graph

7676 Commits

Author SHA1 Message Date
dpugmire
4744730630 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into betterParticleAdvectionDiffs2 2020-06-17 11:12:11 -04:00
Nick Thompson
b8f5e9f080 Merge topic 'deprecate_donothing'
0f0c465c1 Deprecate Camera::Activate() and Camera::Finish()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2139
2020-06-16 16:38:51 -04:00
Li-Ta Lo
55f85f0674 Merge topic 'stats_by_key'
df0881631 minor coding style improvment
68c18f154 remove redundant #include
ba35520b1 use condition number for error tolerance
ee422b7f2 move data member initialization to constructors
e0c4db209 add VTKM_EXEC_CONT to constructor
c25f0b4bb Rename StatisticalMoments. more unit tests
5eeeb4791 Change StatState's API to better conform to VTKm's coding standard
794db28ad Merge branch 'master' into stats_by_key
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2128
2020-06-16 16:06:21 -04:00
Kenneth Moreland
515a35918b Merge topic 'multiplexer-fixes'
f8a09d6de Handle read-only portals in ArrayHandleMultiplexer
ed2f4aabf Detect when VariantArrayHandle::AsMultiplexer fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2133
2020-06-16 15:18:22 -04:00
Li-Ta Lo
df08816317 minor coding style improvment 2020-06-16 13:01:08 -06:00
Li-Ta Lo
68c18f1546 remove redundant #include 2020-06-16 12:25:58 -06:00
Li-Ta Lo
ba35520b1c use condition number for error tolerance 2020-06-16 10:56:17 -06:00
Li-Ta Lo
ee422b7f27 move data member initialization to constructors 2020-06-16 10:25:16 -06:00
dpugmire
447e8aff04 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into betterParticleAdvectionDiffs2 2020-06-16 11:49:21 -04:00
dpugmire
27c39217d4 remove debug statements 2020-06-16 11:43:20 -04:00
dpugmire
1a2910165c debug for dashboard. 2020-06-16 08:43:29 -04:00
Kenneth Moreland
f8a09d6de5 Handle read-only portals in ArrayHandleMultiplexer
The ArrayPortalMultiplexer always called Set on the delegate portals.
However, sometimes the portals were not supported. Instead, only call
when the delegate is supported.

Probably the "right" thing to do would be to check all posible portals
for support, but that sounds like it would slow down the compile.
2020-06-16 00:15:11 -06:00
Kenneth Moreland
ed2f4aabf7 Detect when VariantArrayHandle::AsMultiplexer fails
Previously, the VariantArrayHandle::AsMultiplexer operation silently
failed and returned an invalid ArrayHandleMultiplexer. This is now
changed to throw an exception if the desired ArrayHandleMultiplexer
cannot hold the VariantArrayHandle's array.
2020-06-16 00:12:24 -06:00
Li-Ta Lo
e0c4db2095 add VTKM_EXEC_CONT to constructor 2020-06-15 15:15:43 -06:00
Li-Ta Lo
c25f0b4bb8 Rename StatisticalMoments. more unit tests
Change StatisticalMoments to the more descriptive DescriptiveStatistics,
add some more property based tests.
2020-06-15 14:24:00 -06:00
dpugmire
cff830fb4c Remove some debugging code. 2020-06-15 14:23:52 -04:00
dpugmire
b5270f5fae change float/double to vtkm typedefs. 2020-06-15 14:09:42 -04:00
dpugmire
ee41466673 Accidently added some garbage numbers to line 35. Removed it. 2020-06-15 14:01:12 -04:00
dpugmire
bece39ec44 Fix compiler warnings. 2020-06-15 13:27:01 -04:00
NAThompson
0f0c465c1b Deprecate Camera::Activate() and Camera::Finish() 2020-06-14 11:04:06 -04:00
Nick Thompson
bbfa1f1b8b Merge topic 'less_boilerplate'
ca0cd5f38 Merge conflict resolution.
0dccfb7d7 Rough semicolon.
db8f3c9fc Remove Initialize() boilerplate.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2127
2020-06-13 16:56:00 -04:00
Nick Thompson
ca0cd5f380 Merge conflict resolution. 2020-06-13 14:21:25 -04:00
NAThompson
24b680081a Revert diffs to ContourTreeApp.cxx 2020-06-13 12:32:37 -04:00
NAThompson
755137a822 Particle advection tests with file. 2020-06-13 10:58:45 -04:00
Li-Ta Lo
5eeeb47914 Change StatState's API to better conform to VTKm's coding standard 2020-06-12 21:41:31 -06:00
Nick Thompson
da57431d9c Merge topic 'demangle_in_print_summary'
b3cb8e834 Nuke the ostream overload.
b55ce7369 Demangle symbols in PrintSummary.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2137
2020-06-12 20:07:10 -04:00
Nick Thompson
1015d33330 Merge topic 'silence_gcc10'
97a8c61b6 Don't silence the warning on clang.
bae0a3724 Code review suggestions.
dec4abf42 Silence spurious gcc-10 warning.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2135
2020-06-12 20:04:36 -04:00
Kenneth Moreland
79d9c0d062 Merge topic 'add-bract'
66c96a983 Add BRACT for distributed contour tree computation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2136
2020-06-12 17:58:03 -04:00
NAThompson
97a8c61b6c Don't silence the warning on clang. 2020-06-12 16:29:55 -04:00
NAThompson
b3cb8e834c Nuke the ostream overload. 2020-06-12 16:07:16 -04:00
NAThompson
b55ce7369e Demangle symbols in PrintSummary. 2020-06-12 15:23:16 -04:00
NAThompson
bae0a3724a Code review suggestions. 2020-06-12 14:29:09 -04:00
Oliver Ruebel
66c96a983f Add BRACT for distributed contour tree computation
This merge request is Phase 1 of several to implement the distributed parallel
contour tree in VTKm. This merge requests adds the base outline for the
algorithm. The implementation of the details of the algorithm in the
BoundaryRestrictedAugmentedContourTree.h is currently still missing.
However, these will require a substantial (~3000) lines of additional code.
The goal is to stage the integration process across merge requests to make
the review process simpler.
2020-06-12 11:50:01 -06:00
NAThompson
dec4abf421 Silence spurious gcc-10 warning. 2020-06-12 13:28:25 -04:00
Li-Ta Lo
794db28ad6 Merge branch 'master' into stats_by_key 2020-06-11 23:12:07 -06:00
Li-Ta Lo
964c1a778b Reversion to the Mean
Change the formula for calculating Mean to be exactly as is in the
literature. My own invention actually causes more numeric error.
2020-06-11 22:47:24 -06:00
Kenneth Moreland
22f227a91e Merge topic 'ordered-async-access'
de3bda373 Use deque instead of list for ArrayHandle queue
498d44548 Pass Token::Reference by value
c32c9e8e8 Fix deadlock when changing device during read
99e14ab8a Add proper enqueuing of Tokens for ArrayHandle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2130
2020-06-11 21:55:27 -04:00
Kenneth Moreland
de3bda3738 Use deque instead of list for ArrayHandle queue 2020-06-11 15:47:41 -06:00
Nick Thompson
bb7146c1fe Merge topic 'demo_update'
8bba068c5 Revert maximum CMake version diff.
1c7b41aa5 Update demo to exhibit more VTK-m capabilities.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2134
2020-06-11 17:09:58 -04:00
NAThompson
8bba068c5e Revert maximum CMake version diff. 2020-06-11 15:24:35 -04:00
NAThompson
1c7b41aa5f Update demo to exhibit more VTK-m capabilities. 2020-06-11 14:46:29 -04:00
Kenneth Moreland
498d445483 Pass Token::Reference by value
There is no point in passing Token::Reference by reference since (being
just a simple reference itself) it is no larger than a pointer.
2020-06-11 11:51:42 -06:00
Robert Maynard
69e8c9948a Merge topic 'verify_vtkm_without_rendering'
72006fc94 Gitlab-ci no has builds without rendering enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2120
2020-06-11 11:34:16 -04:00
Robert Maynard
72006fc94c Gitlab-ci no has builds without rendering enabled
Fixes: 521
2020-06-11 10:00:26 -04:00
Matt Larsen
a3b8525ef9 Merge topic 'fix/multi_plots'
62ef51325 fix bug that zero'd color buffers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sudhanshu Sane <ssane@cs.uoregon.edu>
Acked-by: James Kress <james@jameskress.com>
Merge-request: !2132
2020-06-11 09:51:44 -04:00
Robert Maynard
0fa2d5e9af Merge topic 'update_demo_code'
16e04db15 FlyingEdges: Handle when pass 1 generates no intersections
8ebea33c7 FlyingEdges: Handle when a dimensions size is <= 3
60eff58bd Correct warning in TransferToOpenGL found by the examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2125
2020-06-11 09:40:03 -04:00
Li-Ta Lo
c04b8440eb Merge topic 'uniform_real'
c0dee7402 make it explicit that we are using 64-bit unsigned integer in bit op
34f350588 Added changelog
e9f584a91 ArrayHandleRandomUniformReal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2116
2020-06-11 08:41:38 -04:00
Robert Maynard
16e04db157 FlyingEdges: Handle when pass 1 generates no intersections
Previously if pass 1 generated no intersections, pass 2 would
incorrectly generate no intersections resulting in an empty
dataset.
2020-06-11 08:32:28 -04:00
Matt Larsen
62ef513257 fix bug that zero'd color buffers 2020-06-10 16:02:21 -07:00
Li-Ta Lo
8e6fb01d02 Merge branch 'stats_by_key' of gitlab.kitware.com:ollielo/vtk-m into stats_by_key 2020-06-10 13:40:55 -06:00