Commit Graph

9954 Commits

Author SHA1 Message Date
Kenneth Moreland
b24a878f72 Merge branch 'release-1.8' 2022-05-25 11:27:33 -04:00
Kenneth Moreland
121683ac2e Merge topic 'backport-at-bottom'
bd8f8f6da Fix documentation for backport release command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2781
2022-05-25 11:27:33 -04:00
Kenneth Moreland
ffe294e462 Merge topic 'backport-at-bottom' into release-1.8
bd8f8f6da Fix documentation for backport release command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2781
2022-05-25 11:27:33 -04:00
Kenneth Moreland
0e51d4b83f Merge branch 'release-1.8' into master 2022-05-25 10:18:06 -04:00
Kenneth Moreland
407fa93898 Merge topic 'break-circular-dependency' into release-1.8
7749b86b2 Move MakeTestDataSet.cxx to vtkm_cont

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2780
2022-05-25 10:18:06 -04:00
Li-Ta Lo
09bc3f426e Merge topic 'amr_refactor'
cfe4d4635 add deprecated AmrArrays.h
4f97a60d8 Update CMakeLists.txt
99d17b30a migrate AmrArray filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roxana Bujack <bujack@lanl.gov>
Merge-request: !2775
2022-05-25 10:05:33 -04:00
Kenneth Moreland
bd8f8f6da8 Fix documentation for backport release command
For the `Backport: release` command to work on a MR, it needs to be at
the bottom of the description of the MR. However, `ReleaseHotFix.md`
claimed it could be anywhere in the description. Fix that.
2022-05-25 07:36:03 -06:00
Kenneth Moreland
43fe2c5ce5 Merge topic 'unknownarrayhandle-all-types'
9ea11440e Do not require `VecTraits` for `UnknownArrayHandle` components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2778
2022-05-25 08:30:24 -04:00
Kenneth Moreland
5afafd4a4b Merge topic 'break-circular-dependency'
7749b86b2 Move MakeTestDataSet.cxx to vtkm_cont

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nicole Marsaglia <marsaglia1@llnl.gov>
Merge-request: !2779
2022-05-24 17:28:51 -04:00
Kenneth Moreland
7749b86b22 Move MakeTestDataSet.cxx to vtkm_cont
Originally `MakeTestDataSet.h` was header-only code. This was changed to
put its functionality into a library. The obvious library to put it in
was `vtkm_cont_testing`.

The problem is that there is some external code that is (unadvisably)
adding this header to their own code. This code ends up breaking because
it needed to include `vtkm_cont_testing`, which was not needed before.

As a workaround, there was a CMake interface link that caused external
code linking in `vtkm_cont` to also link in `vtkm_cont_testing`. This
works OK, but creates something of a circular dependency. CMake itself
has no problem with this, because `vtkm_cont` did not itself depend on
`vtkm_cont_testing`; only things that linked to `vtkm_cont` also had to
link to `vtkm_cont_testing`.

Unfortunately, some Ascent CMake script was trying to trace down
dependencies and ran into an infinite loop. So this solution was not so
great for them.

Get around the problem by just adding the `MakeTestDataSet` code
directly to `vtkm_cont` (for now).
2022-05-24 14:43:10 -06:00
Kenneth Moreland
9ea11440eb Do not require VecTraits for UnknownArrayHandle components
Whan an `UnknownArrayHandler` is constructed from an `ArrayHandle`, it uses
the `VecTraits` of the component type to construct its internal functions.
This meant that you could not put an `ArrayHandle` with a component type
that did not have `VecTraits` into an `UnknownArrayHandle`.

`UnknownArrayHandle` now no longer needs the components of its arrays to
have `VecTraits`. If the component type of the array does not have
`VecTraits`, it treats the components as if they are a scalar type.
2022-05-24 13:36:00 -06:00
Li-Ta Lo
cfe4d4635d add deprecated AmrArrays.h 2022-05-20 16:05:36 -06:00
Li-Ta Lo
4f97a60d8f Update CMakeLists.txt 2022-05-20 17:41:04 -04:00
Li-Ta Lo
99d17b30a0 migrate AmrArray filter 2022-05-20 15:07:34 -06:00
Li-Ta Lo
ebfbeabc8a Merge topic 'mir_filter'
7d83a7dc5 remove unreachable code
98e0f4c25 remove shared states from MIRFilter instances
1d64b1045 added deprecated MIRFilter.h
7903cee23 Update CMakeLists.txt
7e6e5f0b8 Update MIRFilter.cxx
911c66377 Merge branch 'master' into mir_filter
ac078c8c0 call DoMapeField
0a0e30858 Migrate MIR filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2770
2022-05-20 11:25:27 -04:00
Kenneth Moreland
2cde336ca1 Merge topic 'recursive-glob-artifacts'
8e7fc648e Remove obsolete comments about globbing
b6e490d60 Recursively glob artifact files for gitlab runners

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2772
2022-05-19 19:50:02 -04:00
Kenneth Moreland
8e7fc648ef Remove obsolete comments about globbing 2022-05-19 17:48:12 -06:00
Li-Ta Lo
7d83a7dc5c remove unreachable code 2022-05-19 17:44:46 -06:00
Li-Ta Lo
98e0f4c259 remove shared states from MIRFilter instances 2022-05-19 16:59:34 -06:00
Li-Ta Lo
1d64b1045c added deprecated MIRFilter.h 2022-05-19 10:44:42 -06:00
Roxana Bujack
a2cba951a0 Merge topic 'reuseGhostArrayNew'
21934c6f5 squash and rebase all commits from merge request 2728

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2773
2022-05-19 09:01:17 -04:00
roxana bujack
21934c6f50 squash and rebase all commits from merge request 2728 2022-05-19 11:28:13 +02:00
Kenneth Moreland
b6e490d604 Recursively glob artifact files for gitlab runners
New versions of GitLab allow files for artifacts to be globbed
recursively. Use this to get build files like `*.cmake`.
2022-05-18 21:15:15 -06:00
Li-Ta Lo
7903cee230 Update CMakeLists.txt 2022-05-18 17:58:29 -04:00
Li-Ta Lo
7e6e5f0b86 Update MIRFilter.cxx 2022-05-18 17:57:59 -04:00
Li-Ta Lo
911c663774 Merge branch 'master' into mir_filter 2022-05-18 08:57:10 -06:00
Li-Ta Lo
ac078c8c0f call DoMapeField 2022-05-18 08:55:28 -06:00
Li-Ta Lo
2b102e2b7c Merge topic 'probe_refactor'
849106762 remove include CellDeepCopy
4108febd3 remove #include functional
daaac78f1 minor changes based on code review
aecdd7705 Update vtkm/filter/resampling/testing/CMakeLists.txt
38000ed6d Use ALL_BACKENDS for unit test
ab09f77b7 migrate Probe filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2771
2022-05-18 10:48:37 -04:00
Li-Ta Lo
849106762e remove include CellDeepCopy 2022-05-18 07:15:00 -06:00
Li-Ta Lo
4108febd39 remove #include functional 2022-05-18 06:34:01 -06:00
Li-Ta Lo
daaac78f15 minor changes based on code review 2022-05-18 05:59:07 -06:00
Li-Ta Lo
aecdd77053 Update vtkm/filter/resampling/testing/CMakeLists.txt 2022-05-17 10:42:33 -04:00
Kenneth Moreland
a046ac0f3a Merge topic 'enable-hip-tests'
d20352232 Remove extra target information from demo example
746d1efa4 Use Buffer objects for dispatcher base test
3ba13c5cc Re-enable hip builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mark Bolstad <mbolsta@sandia.gov>
Merge-request: !2769
2022-05-17 08:27:41 -04:00
Li-Ta Lo
38000ed6df Use ALL_BACKENDS for unit test 2022-05-17 06:07:03 -06:00
Li-Ta Lo
ab09f77b7c migrate Probe filter 2022-05-16 14:55:14 -06:00
Li-Ta Lo
0a0e30858e Migrate MIR filter 2022-05-16 09:26:08 -06:00
Kenneth Moreland
d203522324 Remove extra target information from demo example
Through hard work, the simple demo example no longer needs to be
compiled with a device compiler, and thus it is no longer necessary to
add the special CMake for it. In fact, adding such information can be
problematic in some cases.
2022-05-13 16:12:33 -04:00
Kenneth Moreland
746d1efa4f Use Buffer objects for dispatcher base test
`UnitTestDispatcherBase` previously used arrays from `std::vector` to
test dispatching data to worklets. This only works for devices that have
unified memory with the host.

Change the test to use `vtkm::cont::internal::Buffer` objects and
properly copy data to/from the device for devices that have separate
memory spaces.
2022-05-13 16:02:59 -04:00
Kenneth Moreland
3ba13c5cc4 Re-enable hip builds
There were several tests that were disabled for hip because they either
took too long to compile or were failing. We are getting closer to
making everything work, so re-enable this part of the build.
2022-05-12 16:00:30 -04:00
Kenneth Moreland
d60bcd2536 Merge branch 'release-1.7' into release-1.8 2022-05-05 13:08:01 -04:00
Kenneth Moreland
3b8ead6cb2 Merge branch 'release-1.8' into master 2022-05-05 13:08:01 -04:00
Kenneth Moreland
9d4df90dfd Merge topic 'backport-2748' into release-1.8
d6353e1eb Fix StructuredPointGradient for Uniform Point Coordinates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2765
2022-05-05 13:08:01 -04:00
Kenneth Moreland
d7a75bc02a Merge topic 'backport-2748' into release-1.7
d6353e1eb Fix StructuredPointGradient for Uniform Point Coordinates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2765
2022-05-05 13:08:01 -04:00
Sujin Philip
d6353e1eb7 Fix StructuredPointGradient for Uniform Point Coordinates
The scalar field difference along x, y, and z should be divided by the
spacing not multiplied. This was causing some test failures in VTK and
ParaView when overriding the default contour filter with `vtkmContour`.
2022-05-04 12:55:33 -04:00
Kenneth Moreland
fe6d821967 Merge branch 'release-1.8' 2022-05-04 11:51:42 -04:00
Kenneth Moreland
b3f28844e3 Merge topic 'pointtransform-symbols' into release-1.8
d3de36f47 Remove inline from PointTransform methods to be exported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nicole Marsaglia <marsaglia1@llnl.gov>
Merge-request: !2763
2022-05-04 11:51:42 -04:00
Kenneth Moreland
a78c02285b Merge topic 'pointtransform-symbols'
d3de36f47 Remove inline from PointTransform methods to be exported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nicole Marsaglia <marsaglia1@llnl.gov>
Merge-request: !2763
2022-05-04 11:51:42 -04:00
Kenneth Moreland
d3de36f470 Remove inline from PointTransform methods to be exported
When `PointTransform` was converted to the new filter structure, some of
the methods that were moved from .hxx to .cxx (and therefore compiled in
a library) were still marked as `inline`. This caused the compiler to
not compile the function into the library if it was not used. Fix the
problem by removing the `inline` modifier to the method implementations.
2022-05-03 12:57:14 -06:00
Sujin Philip
69eb4c41cf Merge topic 'vtkm-paraview-fixes'
6d254d3e6 Fix StructuredPointGradient for Uniform Point Coordinates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2748
2022-04-28 14:11:24 -04:00
Sujin Philip
6d254d3e60 Fix StructuredPointGradient for Uniform Point Coordinates
The scalar field difference along x, y, and z should be divided by the
spacing not multiplied. This was causing some test failures in VTK and
ParaView when overriding the default contour filter with `vtkmContour`.
2022-04-28 12:50:09 -04:00