Commit Graph

9973 Commits

Author SHA1 Message Date
Gunther Weber
33cd0b9e2c Merge topic 'unit-test-algorithm-transform'
c34797711 Use test_equal_ArrayHandles instead of own test function
bfb19f14a Start adding unit tests for vtkm::cont::Algorithm::Transform

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2774
2022-06-08 22:57:16 -04:00
Gunther H. Weber
c347977119 Use test_equal_ArrayHandles instead of own test function 2022-06-08 15:28:09 -07:00
Gunther H. Weber
bfb19f14ab Start adding unit tests for vtkm::cont::Algorithm::Transform 2022-06-08 14:53:47 -07:00
Gunther Weber
7717f0d89b Merge topic 'contour-tree-branch-decomposition'
6a7aaa5a3 Add unit tests and refactor based on merge request discussion
f871f51cb Move computing branch decomposition to a separate filter
4fe495be8 Implement branch decomposition for hierarchical contour tree
af5073885 Add timers to distributed contour tree; reduce data size sent during reduction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2723
2022-06-07 01:03:11 -04:00
Abdelilah Essiari
6a7aaa5a32 Add unit tests and refactor based on merge request discussion
Co-authored-by: Gunther H. Weber <GHWeber@lbl.gov>
2022-06-06 19:57:13 -07:00
Gunther H. Weber
f871f51cb8 Move computing branch decomposition to a separate filter 2022-06-06 19:57:13 -07:00
Oliver Ruebel
4fe495be8d Implement branch decomposition for hierarchical contour tree
Co-authored-by: Gunther H. Weber <GHWeber@lbl.gov>
2022-06-06 19:57:13 -07:00
oruebel
af5073885e Add timers to distributed contour tree; reduce data size sent during reduction
Co-authored-by: Gunther H. Weber <GHWeber@lbl.gov>
2022-06-06 19:57:13 -07:00
Gunther Weber
00f3c8e4fe Merge topic 'fix-empty-array-handle-serialization'
d6a734817 Add unit test for serializing an empty ArrayHandle and fix test failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2783
2022-06-06 22:56:33 -04:00
Gunther H. Weber
d6a7348172 Add unit test for serializing an empty ArrayHandle and fix test failure
Fix: Always serialize the size of the Buffer in vtkm/cont/internal/Buffer.cxx
but only serialize its contents, if the size differs from zero.
2022-06-06 19:52:13 -07:00
Vicente Bolea
3f52549ac0 Merge topic 'update-releasehotfix-docs'
90a375a50 Update HotFixGuide.md
f6267db2b docs: update releasehotfix doc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2764
2022-06-03 18:12:13 -04:00
Li-Ta Lo
591c6576e7 Merge topic 'tutorial_refactor'
6ec329bd0 migrate tutorials to New Filter interface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2782
2022-06-02 11:19:05 -04:00
Li-Ta Lo
6ec329bd03 migrate tutorials to New Filter interface 2022-06-02 08:31:33 -06:00
Vicente Bolea
a1839c0e1e Merge topic 'update-release-instructions'
a97a81358 release: update releases instructions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2768
2022-05-30 14:56:08 -04:00
Vicente Bolea
90a375a50e Update HotFixGuide.md 2022-05-30 14:13:58 -04:00
Vicente Adolfo Bolea Sanchez
f6267db2b4 docs: update releasehotfix doc 2022-05-30 13:37:17 -04:00
Vicente Bolea
10c1682a1a Merge topic 'update-release-process'
85b70094a docs: Add release-specific branch info

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2762
2022-05-30 13:34:23 -04:00
Vicente Adolfo Bolea Sanchez
85b70094a7 docs: Add release-specific branch info 2022-05-26 15:59:23 -04:00
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