Commit Graph

8718 Commits

Author SHA1 Message Date
Nick Thompson
b1c0f46ac0 Response to code review. 2021-03-12 21:14:50 +00:00
Nick Thompson
4e7d85094e Remove default template argument that breaks build. 2021-03-12 15:37:32 -05:00
Nick Thompson
4cb661006e Implement GetIndices. 2021-03-12 14:40:27 -05:00
Nick Thompson
2d35ab05ac Write CellSetExtrude as CellSetExplicit. 2021-03-08 10:18:42 -05:00
Matt Larsen
eb682c79f2 Merge topic 'wireframer_divide_by_zero_fix'
ffdb33f72 follow coding conventions
a778af8bc make scalar normilization consistent across rendering
168952a0c correct a potential divide by zero

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2435
2021-03-06 10:53:56 -05:00
Matt Larsen
ffdb33f727 follow coding conventions 2021-03-05 08:47:58 -08:00
Matt Larsen
a778af8bc9 make scalar normilization consistent across rendering 2021-03-05 08:32:10 -08:00
Matt Larsen
168952a0ce correct a potential divide by zero 2021-03-05 08:15:56 -08:00
Dave Pugmire
a42bb1b0c7 Merge topic 'messenger_cleanup'
8bf53bc36 Cleanup per review.
9c9db23de Fixes per review
2d1ff10d0 Code cleanup
5c4537692 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into messenger_cleanup
43b4bf46d Fix for serial builds.
ebb1019aa Add CheckRequests method.
af14f583a Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into messenger_cleanup
55fff59e0 Cleanup the messenger classes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abhishek Yenpure <abhishek@uoregon.edu>
Merge-request: !2410
2021-03-03 16:38:54 -05:00
Dave Pugmire
548ea5ee9a Merge topic 'add_SOA_to_default_types'
799dbacd9 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_SOA_to_default_types
21a313700 kick the builds
565522eb6 Add ArrayHandleSOA to default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2430
2021-03-03 12:18:47 -05:00
dpugmire
799dbacd92 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_SOA_to_default_types 2021-03-02 19:41:30 -05:00
Kenneth Moreland
58bd890c9c Merge topic 'variant-no-ref'
878a5e5ae Disallow references in Variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2428
2021-03-02 13:53:40 -05:00
dpugmire
21a3137000 kick the builds 2021-03-02 13:47:11 -05:00
dpugmire
8bf53bc368 Cleanup per review. 2021-03-02 13:20:20 -05:00
dpugmire
9c9db23de5 Fixes per review 2021-03-02 13:04:11 -05:00
dpugmire
565522eb62 Add ArrayHandleSOA to default 2021-03-02 12:09:26 -05:00
Kenneth Moreland
6c8fcda5d5 Merge topic 'safer-is-trivial'
80c1f0a97 Be more conservative about is_trivial support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2427
2021-03-02 10:59:52 -05:00
Kenneth Moreland
878a5e5ae2 Disallow references in Variant
I have run into strange problems with reference types sneaking into
templates. Reference types can cause weird errors when passing things
across hosts and devices, and it's best not to let them sneak into an
object like Varient where they become more difficult to check for.
2021-03-01 16:09:19 -07:00
Kenneth Moreland
80c1f0a974 Be more conservative about is_trivial support
`std::is_trivial` is part of the C++14 specification. However, we have
encountered multiple compilers that purport to implement C++14 but do
not implement `std::is_trivial` and the like checks correctly.

To avoid such issues, only use `std::is_trivial` on compilers that we
have tested to support it.
2021-03-01 15:12:27 -07:00
Gunther Weber
8e70a7c55b Merge topic 'fix-distributed-contour-tree-hang'
e4a46f339 Removed two TODO comments after verifying parameters
3ef95ded2 Port bug fix from distributed to augmented contour tree filter
70f7337f6 Fix hang in distributed contour tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2424
2021-03-01 13:55:16 -05:00
Gunther H. Weber
e4a46f3392 Removed two TODO comments after verifying parameters 2021-02-26 17:01:14 -08:00
Gunther H. Weber
3ef95ded23 Port bug fix from distributed to augmented contour tree filter 2021-02-26 15:23:44 -08:00
Gunther H. Weber
70f7337f64 Fix hang in distributed contour tree
Pass division vector to DIY RegularDecomposer to ensure its decomposition matches the one in the partitioned data set.
2021-02-26 15:23:44 -08:00
Matt Larsen
f1cb6d83c2 Merge topic 'missing_headers2'
1c060d9c5 more missing sstream headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2423
2021-02-26 17:16:08 -05:00
mclarsen
1c060d9c50 more missing sstream headers 2021-02-26 13:49:42 -08:00
Kenneth Moreland
91fc69fd06 Merge topic 'implicit-functions-no-virtual'
662998f19 Remove make_ImplicitFunctionFunctor functions
27cc99acb Add documentation for Multiplexer and General implicit functions
6a445ebcf Do not return a reference from ImplicitFunction::PrepareForExecution
b0fcab5d7 Do not capture references to execution objects
096e7457c Fix CUDA issues
8c6623736 Suppress deprecation warnings in deprecated class
a6725b3ac Remove use of deprecated ImplicitFunctions with virtual methods
180d11e7f Add ImplicitFunctionGeneral
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nickolas Davis <nadavi@sandia.gov>
Merge-request: !2413
2021-02-26 15:19:30 -05:00
Matt Larsen
00762fe582 Merge topic 'missing_sstream_header'
5be6fb0c5 add another missing header
572840f49 add another missing header
ffb0548b9 adding missing header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2422
2021-02-26 12:15:29 -05:00
mclarsen
5be6fb0c50 add another missing header 2021-02-26 07:35:26 -08:00
mclarsen
572840f492 add another missing header 2021-02-26 07:29:18 -08:00
mclarsen
ffb0548b92 adding missing header 2021-02-26 07:17:52 -08:00
Kenneth Moreland
662998f194 Remove make_ImplicitFunctionFunctor functions
They were meant to replace `make_ImplicitFunction*Handle` classes, but
they don't really provide any interesting functionality and are not
backward compatible in any case. So just get rid of one more thing we
don't need to support.
2021-02-25 14:05:02 -07:00
Kenneth Moreland
27cc99acb4 Add documentation for Multiplexer and General implicit functions 2021-02-25 14:00:20 -07:00
Kenneth Moreland
6a445ebcf0 Do not return a reference from ImplicitFunction::PrepareForExecution
This can cause many troubles when passing around in a Variant
or across devices.
2021-02-25 13:49:04 -07:00
Kenneth Moreland
1aa0714aec Merge topic 'summit-errors'
aa5c9dba2 Remove problematic lambda functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2418
2021-02-25 11:41:51 -05:00
dpugmire
2d1ff10d04 Code cleanup 2021-02-24 15:58:49 -05:00
Matt Larsen
c8b24bd3e7 Merge topic 'i_was_wrong'
96223a955 i was wrong about the ray direction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2421
2021-02-24 15:40:24 -05:00
dpugmire
5c4537692e Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into messenger_cleanup 2021-02-24 12:42:33 -05:00
Matt Larsen
96223a955e i was wrong about the ray direction 2021-02-24 09:36:20 -08:00
Kenneth Moreland
b0fcab5d7f Do not capture references to execution objects
It is possible for a transport to return a reference to an object.
At some point, however, the object has to be potentially copied
to a different memory space to be used in the execution environment.
This was getting fouled up because the reference type was being
captured. Instead, remove any references from the object.
2021-02-24 11:58:18 -05:00
Kenneth Moreland
aa5c9dba28 Remove problematic lambda functions
The GCC 7 compiler on summit was failing to compile all of the
code. The problematic parts involved using lambda functions.
I think the problem is that the compiler has a bug where it
has a problem resolving the type of variables captured by
reference. The problem seems similar to this bug reported
to Kokkos:

https://github.com/kokkos/kokkos-kernels/issues/349

Solved the problem by removing the lambdas with either a
named method or just inline code.

I suspect the problem arose (without anyone's knowledge) with
MR !2331, which moved VTK-m to C++14. This GCC error seems to
happen with C++14 but not C++11. (The features of lambdas changed
between these two versions of C++.)
2021-02-24 09:52:59 -07:00
Matt Larsen
32b87b8b00 Merge topic 'the_robot_made_me_do_this_to_fix_things'
b9326c208 force update the images
b4877cf73 fix conversion warning
cac09110d fix rendering depths and divide by zero

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2419
2021-02-24 10:22:06 -05:00
mclarsen
b9326c2087 force update the images 2021-02-23 16:36:29 -08:00
mclarsen
b4877cf730 fix conversion warning 2021-02-23 14:52:35 -08:00
mclarsen
cac09110d8 fix rendering depths and divide by zero 2021-02-23 14:36:58 -08:00
Nickolas Davis
21eac99c74 Merge topic 'regression-test-debug'
bd72d7247 improve regression test error output when args aren't set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2417
2021-02-22 20:10:07 -05:00
nadavi
bd72d72471 improve regression test error output when args aren't set 2021-02-22 23:36:30 +00:00
Kenneth Moreland
096e7457c3 Fix CUDA issues 2021-02-22 06:40:03 -07:00
Kenneth Moreland
8c66237364 Suppress deprecation warnings in deprecated class
The implementation of a deprecated class should not give deprecation
warnings from its own implementation.
2021-02-22 06:40:03 -07:00
Kenneth Moreland
a6725b3acd Remove use of deprecated ImplicitFunctions with virtual methods
Unfortunately, this introduces a backward-incompatible change with the
filters that use ImplicitFunctions. Before, they would get an
ImplicitFunctionHandle. This class is deprecated, and there is no easy
way to get back the actual type of implicit function stored in it.
2021-02-22 06:40:02 -07:00
Kenneth Moreland
180d11e7f2 Add ImplicitFunctionGeneral 2021-02-22 06:40:02 -07:00