Commit Graph

8923 Commits

Author SHA1 Message Date
Nick Thompson
7e7d41a730 Make sure to #include<ostream> 2021-04-15 09:19:55 -04:00
Nick Thompson
dee5d209d4 Overload stream operator to print vtkm::Particle. 2021-04-15 08:36:53 -04:00
Nick Thompson
4df064f379 Merge topic 'meaningless_diff'
82361fc45 Better message on failure for DifferenceOfProducts.
384fea5ce Make sure arguments are placed in correct order.
cddb6f7b6 Do not flush the stream when you're just going to convert it to string.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2474
2021-04-13 21:28:57 -04:00
Nick Thompson
82361fc45e Better message on failure for DifferenceOfProducts. 2021-04-13 19:09:55 -04:00
Nick Thompson
384fea5ced Make sure arguments are placed in correct order. 2021-04-13 16:00:23 -04:00
Nick Thompson
cddb6f7b6d Do not flush the stream when you're just going to convert it to string. 2021-04-13 14:37:20 -04:00
Nick Thompson
294624adf5 Merge topic 'fix_testerror'
794872eb0 Fix error in unit test.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2472
2021-04-13 12:45:59 -04:00
Nick Thompson
794872eb07 Fix error in unit test. 2021-04-13 11:21:42 -04:00
Nick Thompson
76877b7982 Merge topic 'speed_up_tests'
021c3ff86 Print additional information on failure to facilitate debugging.
36b8c0d2a Merge branch 'speed_up_tests' of gitlab.kitware.com:NAThompson/vtk-m into speed_up_tests
9d6b73275 Use better variable names.
4133e40c0 Remove printing of expected errors.
eb760e04e Revert removal of print statements.
e7c075b5c Remove unused variable.
cb83b8179 Save another 10 seconds.
b0c2bc9d6 Ignore computationTime.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2465
2021-04-13 10:07:50 -04:00
Li-Ta Lo
40c1b9d717 Merge topic 'particle_density'
148cad2ce Merge branch 'master' into particle_density
7bebc1c49 Disable passing input scalar field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2471
2021-04-13 09:21:57 -04:00
Nick Thompson
021c3ff86d Print additional information on failure to facilitate debugging. 2021-04-13 09:08:52 -04:00
Nick Thompson
36b8c0d2a9 Merge branch 'speed_up_tests' of gitlab.kitware.com:NAThompson/vtk-m into speed_up_tests 2021-04-12 18:56:06 -04:00
Nick Thompson
9d6b732750 Use better variable names. 2021-04-12 18:51:53 -04:00
Nick Thompson
4133e40c06 Remove printing of expected errors. 2021-04-12 18:51:53 -04:00
Nick Thompson
eb760e04ef Revert removal of print statements. 2021-04-12 18:51:53 -04:00
Nick Thompson
e7c075b5c4 Remove unused variable. 2021-04-12 18:51:53 -04:00
Nick Thompson
cb83b81793 Save another 10 seconds. 2021-04-12 18:51:52 -04:00
Nick Thompson
b0c2bc9d61 Ignore computationTime. 2021-04-12 18:51:52 -04:00
Nick Thompson
dc89c79fdc Remove unused variable. 2021-04-12 18:51:52 -04:00
Nick Thompson
be2ad7dd4b Speed up bounding interval hierarchy test. 2021-04-12 18:51:52 -04:00
Nick Thompson
bdc73333c9 Speed up UnitTestMath. 2021-04-12 18:51:52 -04:00
Nick Thompson
1b11348cc3 Reduce data size to operate on in unit tests. 2021-04-12 18:51:52 -04:00
Nick Thompson
14ccd6d98f Speed up particle density unit test. 2021-04-12 18:51:51 -04:00
Nick Thompson
134c6c3d4e Speed up CellLocator tests. 2021-04-12 18:51:51 -04:00
Nick Thompson
33993db2df Reduce runtime of unit tests. 2021-04-12 18:51:51 -04:00
Kenneth Moreland
5feb9c9a9d Fix deprecation warnings with MSVC 2021-04-12 18:50:44 -04:00
Kenneth Moreland
5049de316d 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-12 18:50:44 -04:00
Kenneth Moreland
fb3acb8603 Add changelog for depreciating VariantArrayHandle 2021-04-12 18:50:43 -04:00
Kenneth Moreland
fb8a80b0b1 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-12 18:50:43 -04:00
Kenneth Moreland
6ecc75cb7f Deprecate VariantArrayHandle
`VaraintArrayHandle` has been replaced by `UnknownArrayHandle` and
`UncertainArrayHandle`. Officially make it deprecated and point users to
the new implementations.
2021-04-12 18:50:43 -04:00
Nick Thompson
3607f01f56 Refactor to more idiomatic use of worklets. 2021-04-12 18:50:43 -04:00
Nick Thompson
375ca2a735 Refactor the structs to classes. 2021-04-12 18:50:43 -04:00
Nick Thompson
ca78086316 Workletize the logistic map. 2021-04-12 18:50:43 -04:00
Nick Thompson
e64a3ce4d4 Merge topic 'add_func_2'
ff4ad96ef Do not print extra information on Kokkos and CUDA.
321571fab Make sure operator precedence is correct over macro invocation.
94a32bf64 Improve code in response to review.
568c0b5d2 Small formatting changes.
a8e25da0a Add __func__ to unit test metadata printed on failure.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2469
2021-04-12 17:53:04 -04:00
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
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
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
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