Commit Graph

9039 Commits

Author SHA1 Message Date
Li-Ta Lo
148cad2ce5 Merge branch 'master' into particle_density 2021-04-12 15:32:04 -06:00
Vicente Bolea
41990df686 Merge topic 'fix-use-c++14-in-every-target'
ff84915bc Merge branch 'upstream-diy' into fix-use-c++14-in-every-target
89b6f2106 diy 2021-04-12 (bc7dcda5)
f60a45bc6 Enforce C++14 in the whole project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2466
2021-04-12 17:04:29 -04:00
Li-Ta Lo
7bebc1c497 Disable passing input scalar field
Inherit from FilterDataSetWithField and implemented a trivial
DoMapField whcih just return fales.
2021-04-12 14:31:27 -06:00
Nick Thompson
ff4ad96efc Do not print extra information on Kokkos and CUDA. 2021-04-12 15:01:07 -04:00
Nick Thompson
321571fabe Make sure operator precedence is correct over macro invocation. 2021-04-12 13:50:27 -04:00
Diy Upstream
89b6f2106c diy 2021-04-12 (bc7dcda5)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit bc7dcda5ec2c6e15fd3bd8c57389adc6613c2595 (for/vtk-m-20210412-master).
2021-04-12 13:45:01 -04:00
Vicente Adolfo Bolea Sanchez
ff84915bc3 Merge branch 'upstream-diy' into fix-use-c++14-in-every-target
# By Diy Upstream
* upstream-diy:
  diy 2021-04-12 (bc7dcda5)
2021-04-12 13:45:01 -04:00
Nick Thompson
94a32bf64c Improve code in response to review. 2021-04-12 13:42:19 -04:00
Vicente Adolfo Bolea Sanchez
f60a45bc63 Enforce C++14 in the whole project
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2021-04-12 13:29:46 -04:00
Nick Thompson
568c0b5d29 Small formatting changes. 2021-04-12 13:05:36 -04:00
Nick Thompson
a8e25da0ab Add __func__ to unit test metadata printed on failure. 2021-04-12 12:54:38 -04:00
Kenneth Moreland
49d6200413 Merge topic 'deprecate-variant-array-handle'
14839a032 Fix deprecation warnings with MSVC
5510521a0 Fix VariantArrayHandle::AsVirtual with cast arrays
25e6daf93 Add changelog for depreciating VariantArrayHandle
b4ef9fcac Fix UnknownArrayHandle::CastAndCall for special arrays
68f39b86a Deprecate VariantArrayHandle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2459
2021-04-12 10:15:08 -04:00
Nick Thompson
0127559a72 Use better variable names. 2021-04-10 12:08:00 -04:00
Nick Thompson
6e791ede0a Merge topic 'workletize_logistic'
f1cf6c762 Refactor to more idiomatic use of worklets.
7b95ef597 Refactor the structs to classes.
eac6c21c8 Workletize the logistic map.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2463
2021-04-10 11:59:47 -04:00
Nick Thompson
c911622954 Remove printing of expected errors. 2021-04-10 11:45:17 -04:00
Nick Thompson
5304bbc6bf Revert removal of print statements. 2021-04-10 11:44:12 -04:00
Nick Thompson
16f905f448 Remove unused variable. 2021-04-10 09:11:27 -04:00
Nick Thompson
070191c0e9 Save another 10 seconds. 2021-04-10 08:27:31 -04:00
Nick Thompson
c52a67fedd Ignore computationTime. 2021-04-10 02:33:47 +00:00
Nick Thompson
3d494cbfef Remove unused variable. 2021-04-10 02:29:08 +00:00
Nick Thompson
f311f01c8c Speed up bounding interval hierarchy test. 2021-04-09 20:08:07 -04:00
Nick Thompson
75ba34017f Speed up UnitTestMath. 2021-04-09 19:21:25 -04:00
Nick Thompson
4f4744066f Reduce data size to operate on in unit tests. 2021-04-09 17:16:58 -04:00
Nick Thompson
a8d2b7461e Speed up particle density unit test. 2021-04-09 16:59:53 -04:00
Nick Thompson
59a70138b6 Speed up CellLocator tests. 2021-04-09 16:50:27 -04:00
Nick Thompson
064a285f44 Reduce runtime of unit tests. 2021-04-09 16:30:53 -04:00
Nick Thompson
f1cf6c762a Refactor to more idiomatic use of worklets. 2021-04-09 14:56:19 -04:00
Nick Thompson
7b95ef5975 Refactor the structs to classes. 2021-04-09 14:54:12 -04:00
Nick Thompson
eac6c21c84 Workletize the logistic map. 2021-04-09 12:42:40 -04:00
Caitlin Ross
57e8750b33 Merge topic 'find-tbb-fix'
53833334c change the way tbb is imported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2452
2021-04-09 08:27:45 -04:00
Nick Thompson
2663e9d979 Merge topic 'quadratic_roots'
d4ead2d76 Remove superfluous subbraces.
a7ecd30cd Commute #ifdef with braces to make clang-format happy.
dd8863637 Return a vec<T,2> rather than a vtkm::Pair<T,T>.
91bec19e9 Additional comments and fix typo in unit test.
6f9515aa9 Quadratic roots to 3 ulps.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2462
2021-04-08 19:20:17 -04:00
Caitlin Ross
53833334c4 change the way tbb is imported 2021-04-08 16:24:42 -04:00
Nick Thompson
d4ead2d767 Remove superfluous subbraces. 2021-04-08 16:23:42 -04:00
Nick Thompson
a7ecd30cdd Commute #ifdef with braces to make clang-format happy. 2021-04-08 16:23:42 -04:00
Nick Thompson
dd8863637a Return a vec<T,2> rather than a vtkm::Pair<T,T>. 2021-04-08 16:23:42 -04:00
Nick Thompson
91bec19e97 Additional comments and fix typo in unit test. 2021-04-08 16:23:42 -04:00
Nick Thompson
6f9515aa94 Quadratic roots to 3 ulps. 2021-04-08 16:23:42 -04:00
Kenneth Moreland
14839a0325 Fix deprecation warnings with MSVC 2021-04-08 09:28:03 -06:00
Kenneth Moreland
5510521a06 Fix VariantArrayHandle::AsVirtual with cast arrays
The both the underlying `UnknownArrayHandle` and `ArrayHandleVirtual`
handle `ArrayHandleCast` specially. This caused problems when passing an
`ArrayHandleCast` to `VariantArrayHandle::AsVirtual`. Solve the problem
by stripping out the cast storage tags and letting these classes handle
it internally.

It's annoying to have to fix a problem in a method of a deprecated class
that returns another class that is deprecated for a different reason. No
one should really be running this.
2021-04-08 09:21:39 -06:00
Kenneth Moreland
25e6daf93f Add changelog for depreciating VariantArrayHandle 2021-04-07 16:12:42 -06:00
Kenneth Moreland
b4ef9fcac3 Fix UnknownArrayHandle::CastAndCall for special arrays
`UnknownArrayHandle` treats a `ArrayHandleCast` and
`ArrayHandleMultiplexer` special. When you put one of these arrays in an
`UnknownArrayHandle`, it takes the original array out and stores it. If
you try to take an array of that type out, it will again do the proper
conversion.

The only problem is that if you use `IsType`, the result can be
unexpected. This is what happened with `CastAndCall`, which was using
`IsType` internally. Changed that to `CanConvert` to properly get the
array handle out.
2021-04-07 16:12:42 -06:00
Kenneth Moreland
68f39b86a8 Deprecate VariantArrayHandle
`VaraintArrayHandle` has been replaced by `UnknownArrayHandle` and
`UncertainArrayHandle`. Officially make it deprecated and point users to
the new implementations.
2021-04-07 16:12:38 -06:00
Nickolas Davis
21b36a6429 Merge topic 'rename-algorithms'
1c9ae402b Deprecate vtkm/BinarySearch.h, it is unused and similar to LowerBound
26d9ecb39 split vtkm/Algorithms.h into UpperBound.h, LowerBound.h, and BinarySearch.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2455
2021-04-07 17:08:34 -04:00
Li-Ta Lo
f2a4361c03 Merge topic 'alpine_sampling_2d'
ed8d2fb35 Merge branch 'master' into alpine_sampling_2d
93b8ee97d Pasing range explicitly to NDHistogram worklet for ALPINE 2D sampling milestone

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2257
2021-04-07 16:10:09 -04:00
nadavi
1c9ae402b0 Deprecate vtkm/BinarySearch.h, it is unused and similar to LowerBound 2021-04-07 19:10:28 +00:00
nadavi
26d9ecb398 split vtkm/Algorithms.h into UpperBound.h, LowerBound.h, and BinarySearch.h 2021-04-07 18:53:09 +00:00
Nickolas Davis
d53ce5bd24 Merge topic 'fix-windows-builds'
7f86a16b3 add missing include

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2461
2021-04-07 13:59:18 -04:00
nadavi
7f86a16b37 add missing include 2021-04-07 17:54:34 +00:00
Vicente Bolea
c3db52da93 Merge topic 'update-to-1.6.0-rc1'
19c1b99f1 1.6.0-rc1 is our 7th official release of VTK-m.
4e94d830a Add release notes for v1.6.0
9d345733b Merge commit 'd2d1c854adc8c0518802f153b48afd17646b6252' into update-to-1.6.0-rc1
74ffad9bd 1.5.1 is a bugfix release for VTK-m.
f67dcfc3f Add release notes for v1.5.1
38af6dbf5 add Particle.h and Deprecated.h to the installed headers
d5f50c5a9 3b7b21c86 Do not use std::is_trivially_copyable on GCC 4.X
cb3d6e5cc Variant as trivially copyable
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2457
2021-04-07 13:48:12 -04:00
Nick Thompson
b00f5b4430 Merge topic 'diff_of_products'
068399b81 Fix build errors on Windows and compiler warnings on Ubuntu.
8d54138d3 Kahan's difference of products algorithm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2460
2021-04-07 09:11:44 -04:00