Commit Graph

8970 Commits

Author SHA1 Message Date
Nick Thompson
d815493986 Merge topic 'write_cellset_extrude'
b1c0f46ac Response to code review.
4e7d85094 Remove default template argument that breaks build.
4cb661006 Implement GetIndices.
2d35ab05a Write CellSetExtrude as CellSetExplicit.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2436
2021-03-12 19:32:55 -05:00
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
larsen30@llnl.gov
292ac2e4c1 clang is not is_trivially safe 2021-03-11 13:33:27 -08:00
larsen30@llnl.gov
8e588504ff Merge branch 'identify_xl' of gitlab.kitware.com:mclarsen/vtk-m into identify_xl 2021-03-11 13:30:40 -08:00
larsen30@llnl.gov
9c53963946 Merge remote-tracking branch 'upstream/master' into identify_xl 2021-03-11 13:30:28 -08:00
Matt Larsen
8d8228f365 correct type in comment 2021-03-11 21:12:06 +00:00
Matt Larsen
d2d1c854ad Merge topic 'extend_clipping_plane'
786995984 extend the default clipping plane

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2439
2021-03-11 15:43:37 -05:00
Li-Ta Lo
b7f2d8c638 Merge branch 'particle_density' into particle_density_cic 2021-03-11 11:22:22 -07:00
Li-Ta Lo
e68319e0a3 Merge branch 'fp_atomics2' into particle_density_cic 2021-03-11 11:13:55 -07:00
Li-Ta Lo
ce8ab5912b Merge branch 'particle_density_cic' of gitlab.kitware.com:ollielo/vtk-m into particle_density_cic 2021-03-11 10:31:42 -07:00
Li-Ta Lo
6f507bb4b5 update ParticleDensityNearestGridPoint to use FP atomics 2021-03-11 10:18:50 -07:00
larsen30@llnl.gov
4d7a08c183 add xl compiler identification 2021-03-11 09:15:55 -08:00
Matt Larsen
7869959841 extend the default clipping plane 2021-03-11 08:43:42 -08:00
Li-Ta Lo
b590a8ebb2 Add floating point atomics 2021-03-11 08:19:51 -07:00
Kenneth Moreland
91d13bdfb2 Merge topic 'reduce-initial-type'
563e23aac Fix unintended cast in TBB Reduce's return value
a7100c845 Do not assume CUDA reduce operator is unary
f3a6931f6 Fix casting issues in TBB functors
cc5b9a016 Add casts to FunctorsGeneral.h
d9c988b20 Allow for different types in basic type operators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2431
2021-03-08 18:06:51 -05:00
Kenneth Moreland
563e23aaca Fix unintended cast in TBB Reduce's return value
It was setting the return value type the same as the initial value.
However, the value type can change based on the array type and the
operator.
2021-03-08 14:12:20 -07:00
Li-Ta Lo
f38523d557 Merge branch 'fp_atomics' into particle_density_cic 2021-03-08 12:19:35 -07:00
Li-Ta Lo
3d1e58e651 use AsArrayHandle 2021-03-08 10:32:01 -07:00
Li-Ta Lo
2336d144e3 distingush load/store v.s. arithmetic types 2021-03-08 09:52:41 -07:00
Li-Ta Lo
2510f08237 single precision float constant 2021-03-08 08:26:22 -07: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
Li-Ta Lo
350b42224a include ArrayCopy.h 2021-03-05 09:43:38 -07: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
Li-Ta Lo
9de7442297 implemented CIC deposition 2021-03-05 08:29:00 -07:00
Li-Ta Lo
aed6a8f2f4 Merge branch 'fp_atomics' into particle_density_cic 2021-03-04 11:15:38 -07:00
Li-Ta Lo
b78f91b067 add comment on the field parameter 2021-03-04 11:14:14 -07:00
Li-Ta Lo
226e0ccc30 initialize the old way 2021-03-04 09:29:00 -05:00
Li-Ta Lo
30aa5b0526 add floating point atomic add for MSVC 2021-03-04 09:28:55 -05:00
Li-Ta Lo
dfa1a64729 Merge branch 'master' into fp_atomics 2021-03-04 09:27:06 -05: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
Kenneth Moreland
a7100c845a Do not assume CUDA reduce operator is unary
The `Reduce` algorithm is sometimes used to convert an input type to a
different output type. For example, you can compute the min and max at
the same time by making the output of the binary functor a pair of the
input type. However, for this to work with the CUDA algorithm, you have
to be able to also convert the input type to the output type. This was
previously done by treating the binary operator as also a unary
operator. That's fine for custom operators, but if you are using
something like `thrust::plus`, it has no unary operation. (Why would
it?)

So, detect whether the operator has a unary operation. If it does, use
it to cast from the input portal to the output type. If it does not,
just use `static_cast`. Thus, the operator only has to have the unary
operation if `static_cast` does not work.
2021-03-03 09:39:51 -07:00
Kenneth Moreland
f3a6931f6b Fix casting issues in TBB functors 2021-03-03 09:39:51 -07:00
Kenneth Moreland
cc5b9a016f Add casts to FunctorsGeneral.h
If you are using the classes in `FunctorsGeneral.h`, you specify both
the result type and the type of the operands. Presumably you are already
comfortable with any type conversions. So let them keep.
2021-03-03 09:39:51 -07:00
Kenneth Moreland
d9c988b200 Allow for different types in basic type operators
The basic type operators in `Types.h` (i.e. `vtkm::Add`,
`vtkm::Subtract`, `vtkm::Multiply` and `vtkm::Divide`) required the same
type for both arguments. This caused problems when used with `Reduce`
and the initial value type did not match exactly.

Use some tricks from `BinaryOperators.h` to be flexible about using
different types.
2021-03-03 09:39:45 -07: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