Commit Graph

10568 Commits

Author SHA1 Message Date
Kenneth Moreland
600857deff Merge branch 'release-1.9' 2022-10-09 12:59:10 -04:00
Kenneth Moreland
53420f2b36 Merge topic 'mpi-init'
90c7e7707 Initialize DIY in vtkm::cont::Initialize

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2880
2022-10-09 12:59:10 -04:00
Vicente Adolfo Bolea Sanchez
6dfd4767f1 NewRelease: include extra steps
- add final release prerequisites
- add final release-specific branch task
2022-10-08 19:32:48 -04:00
Vicente Bolea
56c52227e0 Merge topic 'add-regression-test'
7e99e256b perftest: add perf regression test
ebdd6b55a perftest: add benchmark build
19f10b9a0 compare.py: add normal and t-student utest
706bd8d2b compare.py: disable color when not in a term

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2726
2022-10-07 18:06:05 -04:00
Vicente Adolfo Bolea Sanchez
7e99e256bb perftest: add perf regression test 2022-10-07 17:42:12 -04:00
Kenneth Moreland
90c7e77075 Initialize DIY in vtkm::cont::Initialize
This has the side effect of initialing MPI_Init (and will also
call MPI_Finalize at program exit). However, if the calling
code has already called MPI_Init, then nothing will happen.
Thus, if the calling code wants to manage MPI_Init/Finalize,
it can do so as long as it does before it initializes VTK-m.
2022-10-07 14:54:33 -06:00
Vicente Adolfo Bolea Sanchez
ebdd6b55a5 perftest: add benchmark build 2022-10-03 13:21:09 -04:00
Vicente Adolfo Bolea Sanchez
19f10b9a0b compare.py: add normal and t-student utest 2022-10-03 13:19:40 -04:00
Vicente Adolfo Bolea Sanchez
706bd8d2b7 compare.py: disable color when not in a term 2022-10-03 13:19:40 -04:00
Vicente Bolea
d8564e69e6 Merge topic 'speedup-hip-build'
7f70b354a CI: enable Kokkos_hip build in merge-requests
db770e759 CI: Limit usage of hipcc and use -O0
55e742319 CI: increase kokkos-backend test timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2869
2022-09-30 17:06:11 -04:00
Vicente Adolfo Bolea Sanchez
7f70b354ae CI: enable Kokkos_hip build in merge-requests 2022-09-30 17:04:25 -04:00
Vicente Adolfo Bolea Sanchez
db770e7598 CI: Limit usage of hipcc and use -O0 2022-09-30 17:04:25 -04:00
Vicente Adolfo Bolea Sanchez
55e742319e CI: increase kokkos-backend test timeout 2022-09-30 17:04:25 -04:00
Dave Pugmire
b01629048b Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-09-29 16:23:29 -04:00
Kenneth Moreland
0df2344517 Merge topic 'contour-bug' into release-1.8
aaf49915e Fix Flying Edges z-boundary condition with non-square input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zhe Wang <godenwangzhe@gmail.com>
Merge-request: !2875
2022-09-29 13:37:12 -04:00
Kenneth Moreland
a22058437d Merge branch 'release-1.8' into release-1.9 2022-09-29 13:37:12 -04:00
Kenneth Moreland
5fcedac560 Merge branch 'release-1.9' 2022-09-29 13:37:12 -04:00
Kenneth Moreland
73dcbac213 Merge topic 'contour-bug' into release-1.9
aaf49915e Fix Flying Edges z-boundary condition with non-square input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zhe Wang <godenwangzhe@gmail.com>
Merge-request: !2875
2022-09-29 13:37:12 -04:00
Kenneth Moreland
71a1bea1ae Merge topic 'contour-bug'
aaf49915e Fix Flying Edges z-boundary condition with non-square input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zhe Wang <godenwangzhe@gmail.com>
Merge-request: !2875
2022-09-29 13:37:12 -04:00
Kenneth Moreland
a195ce883a Fix Flying Edges z-boundary condition with non-square input
There was a bug with Flying Edges checking the boundary conditions in
the z-direction. It was comparing the z index to the size of the y
dimension, not the z dimension. This simple typo was probably missed
because most of the tests use square meshes. To catch the problem, you
need a mesh that has a different number of points in the y and z
directions and the contour has to go past the positive z boundary.

When this error was hit, the indices for the edges on that boundary were
not recorded, and later interpolation used garbage values for edge's
point ids.
2022-09-29 08:39:52 -06:00
Kenneth Moreland
aaf49915e0 Fix Flying Edges z-boundary condition with non-square input
There was a bug with Flying Edges checking the boundary conditions in
the z-direction. It was comparing the z index to the size of the y
dimension, not the z dimension. This simple typo was probably missed
because most of the tests use square meshes. To catch the problem, you
need a mesh that has a different number of points in the y and z
directions and the contour has to go past the positive z boundary.

When this error was hit, the indices for the edges on that boundary were
not recorded, and later interpolation used garbage values for edge's
point ids.
2022-09-29 06:25:12 -06:00
Vicente Bolea
7d4f0be6d0 Merge topic 'update-newrelease-md'
165d6d936 newrelease.md: templatize newrelease.md

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2874
2022-09-28 18:07:36 -04:00
Vicente Adolfo Bolea Sanchez
165d6d936f newrelease.md: templatize newrelease.md
- Uses pyexpander as engine since we already depend on it.
- Add rules for dealing with VTK releases.
- Updates docs/ReleaseProcess.md .
2022-09-28 18:02:37 -04:00
Vicente Bolea
7496dc1e9e Merge branch 'release-1.8' 2022-09-27 17:55:08 -04:00
Vicente Bolea
322abebe06 Merge topic 'update-to-v1.9.0'
abba9247a release: 1.9.0-rc1 release notes
56f4200b9 release: update version and License
d049e27ed Merge remote-tracking branch 'origin/master' into update-to-v1.9.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2873
2022-09-27 17:55:08 -04:00
Vicente Adolfo Bolea Sanchez
1399dd1217 1.9.0-rc1 is our 13th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/1.9.0/release-notes.md
v1.9.0-rc1
2022-09-27 16:02:37 -04:00
Vicente Adolfo Bolea Sanchez
abba9247ac release: 1.9.0-rc1 release notes 2022-09-27 16:02:37 -04:00
Vicente Adolfo Bolea Sanchez
56f4200b90 release: update version and License 2022-09-27 12:20:43 -04:00
Vicente Adolfo Bolea Sanchez
d049e27edc Merge remote-tracking branch 'origin/master' into update-to-v1.9.0
* origin/master: (331 commits)
  Deprecate old filter base classes and supporting classes
  Remove use of deprecated features in TransferToOpenGL
  Do not overthink ComputeNumberOfBlocksPerAxis
  Revised ComputeNumberOfBlocksPerAxis inspired by Ken Moreland's suggestion
  Replace the way data is split in contour tree augmented example
  diy 2022-09-14 (496253d7)
  Update diy/update.sh
  Fix Fields and CoordinateSystems of Lagrangian filter outputs
  Add more features to Threshold
  Convert LagrangianStructures filter to NewFilter
  Merge branch 'shading_scalarRenderer' of https://gitlab.kitware.com/nicolemarsaglia/vtk-m into shading_scalarRenderer
  Limit arguments of ArrayHandle to to type vtkm::Id
  Fix compile error in debug code due to member name change
  Explicit comparator for moving NO_SUCH_ELEMENT to end of array
  Slice should support slicing along non-zero values
  Switch how InSitu benchmark iterates
  Add support for Offset in ClipWithImplicitFunction
  Update paramter constness to follow vtk-m style in Clip.h
  Fix doxygen groups
  Fix example of gitlab-sync
  ...
2022-09-27 12:19:48 -04:00
Kenneth Moreland
af52d63296 Merge topic 'deprecate-old-filters'
de2f2b59b Deprecate old filter base classes and supporting classes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2872
2022-09-27 11:04:52 -04:00
Kenneth Moreland
de2f2b59ba Deprecate old filter base classes and supporting classes 2022-09-27 06:52:44 -06:00
Kenneth Moreland
b6d54eb612 Merge topic 'transfer-to-ogl-deprecated-use'
e36d908a4 Remove use of deprecated features in TransferToOpenGL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2871
2022-09-27 08:38:10 -04:00
Gunther Weber
ca9827ca24 Merge topic 'replace-decomposition-cta'
49dd19408 Do not overthink ComputeNumberOfBlocksPerAxis
e2968ca24 Revised ComputeNumberOfBlocksPerAxis inspired by Ken Moreland's suggestion
ede6bb001 Replace the way data is split in contour tree augmented example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2519
2022-09-26 13:33:34 -04:00
Kenneth Moreland
e36d908a49 Remove use of deprecated features in TransferToOpenGL
The `TransferToOpenGL` function was using a deprecated method to
determine on which device an `ArrayHandle` was installed. Update the
function to use the replacement methods.
2022-09-26 09:14:08 -06:00
Gunther H. Weber
49dd19408f Do not overthink ComputeNumberOfBlocksPerAxis 2022-09-23 18:00:03 -07:00
Gunther H. Weber
e2968ca244 Revised ComputeNumberOfBlocksPerAxis inspired by Ken Moreland's suggestion 2022-09-23 15:08:46 -07:00
Gunther H. Weber
ede6bb0016 Replace the way data is split in contour tree augmented example 2022-09-23 15:08:41 -07:00
Vicente Bolea
0df578eb84 Merge topic 'fix_gcc11_crusher_build_error'
4c708ac66 Merge branch 'upstream-diy' into fix_gcc11_crusher_build_error
a0083af63 diy 2022-09-14 (496253d7)
95231cd15 Update diy/update.sh

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2856
2022-09-23 16:09:31 -04:00
Vicente Bolea
8469ff6c85 Merge topic 'redo_insitu_benchmark'
613b4d44b Switch how InSitu benchmark iterates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2857
2022-09-23 16:08:54 -04:00
Ryan Krattiger
4c708ac661 Merge branch 'upstream-diy' into fix_gcc11_crusher_build_error
# By Diy Upstream
* upstream-diy:
  diy 2022-09-14 (496253d7)
2022-09-23 13:10:01 -05:00
Diy Upstream
a0083af63f diy 2022-09-14 (496253d7)
Code extracted from:

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

at commit 496253d714f25a82377aa10c55391edc93597922 (for/vtk-m-20220914-master-g0f1c387).
2022-09-23 13:10:01 -05:00
Ryan Krattiger
95231cd155 Update diy/update.sh 2022-09-22 10:13:50 -05:00
Sujin Philip
16887ff156 Merge topic 'improve-threshold'
924b00193 Add more features to Threshold

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2867
2022-09-21 14:15:00 -04:00
Kenneth Moreland
6643cf55f8 Merge topic 'lagrangian-to-new-filter'
962cad388 Fix Fields and CoordinateSystems of Lagrangian filter outputs
ee31217da Convert LagrangianStructures filter to NewFilter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2868
2022-09-21 10:37:46 -04:00
Kenneth Moreland
962cad3882 Fix Fields and CoordinateSystems of Lagrangian filter outputs
The original versions of Lagrangian and LagrangianStructures mapped the
global fields from inputs to output. Restore that capability.

Also changed the output CoordinateSystem of Lagrangian to be uniform
points instead of rectilinear points. The points were uniformly spaced
anyway, so it is more clear to have uniform points in the coordinate
system.
2022-09-20 15:27:49 -06:00
Sujin Philip
924b001938 Add more features to Threshold
1. Now we can threshold for values below or above a given value, instead
   of just between two values.
2. Supports multi-component fields instead of just scalar fields.
3. The threshold criteria can be tested against just one specified
   component or against all of the components, and pass if any or all of
   the components pass.
4. The results of the threshold operation can be inverted.
2022-09-20 15:48:20 -04:00
Dave Pugmire
ee31217da5 Convert LagrangianStructures filter to NewFilter 2022-09-20 13:40:50 -06:00
Abhishek Yenpure
3ae5302c3d Merge topic 'shading_scalarRenderer'
35f15f49d Merge branch 'shading_scalarRenderer' of https://gitlab.kitware.com/nicolemarsaglia/vtk-m into shading_scalarRenderer
add81512d 64->32 float type
d77ba3b20 refactor
d399e5d38 change comment
5e361acea abmient -> ambient
0f0704a0b update to vtkm1.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nicole Marsaglia <marsaglia1@llnl.gov>
Merge-request: !2804
2022-09-13 20:34:41 -04:00
Nicole Marsaglia
35f15f49dc Merge branch 'shading_scalarRenderer' of https://gitlab.kitware.com/nicolemarsaglia/vtk-m into shading_scalarRenderer 2022-09-13 12:39:58 -07:00
Gunther Weber
8b9f2256f1 Merge topic 'contour-tree-explicit-no-such-element-comparator'
659734663 Limit arguments of ArrayHandle to to type vtkm::Id
72b0b9035 Fix compile error in debug code due to member name change
34f378ad7 Explicit comparator for moving NO_SUCH_ELEMENT to end of array

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2645
2022-09-13 08:47:27 -04:00