Commit Graph

10437 Commits

Author SHA1 Message Date
Vicente Bolea
7e1f10ea6f Merge branch 'release-1.8' into release-1.9 2023-03-14 12:34:20 -04:00
Vicente Bolea
008718f64d Merge topic 'update-runner-tag-centos8' into release-1.9
d6acc819d ci,centos: update tag to linux-x86_64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3015
2023-03-14 12:34:19 -04:00
Vicente Bolea
d0f06019da Merge topic 'update-runner-tag-centos8' into release-1.8
d6acc819d ci,centos: update tag to linux-x86_64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3015
2023-03-14 12:34:18 -04:00
Vicente Adolfo Bolea Sanchez
d6acc819d4 ci,centos: update tag to linux-x86_64 2023-03-14 12:30:03 -04:00
Kenneth Moreland
6208a95761 Merge topic 'fix_insitu_arg_processing' into release-1.9
b4a6c2b54 Restore argument processing to InSitu benchmark

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3010
2023-03-09 17:52:43 -05:00
Mark Bolstad
b4a6c2b546 Restore argument processing to InSitu benchmark
GBench barfs on arguments such as --size without this patch that restores removing vtkm specific arguments from the command-line.
2023-03-09 08:40:00 -07:00
Ben Boeckel
6ce131dfd4 Merge branch 'release-1.7' into release-1.8 2022-12-21 12:28:47 -05:00
Ben Boeckel
9e9f903f6b Merge branch 'release-1.8' into release-1.9 2022-12-21 12:28:47 -05:00
Ben Boeckel
5cd4c23c82 Merge topic 'ci-arch-tags' into release-1.8
4c010f6c8 Merge branch 'ci-arch-tags-1.7' into ci-arch-tags-1.8
c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
2022-12-21 12:28:47 -05:00
Ben Boeckel
831ae618e8 Merge topic 'ci-arch-tags' into release-1.9
054661f68 gitlab-ci: use arch-specific tags for OS selection
4dd268c58 Merge branch 'ci-arch-tags-1.8' into ci-arch-tags-1.9
4c010f6c8 Merge branch 'ci-arch-tags-1.7' into ci-arch-tags-1.8
c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
2022-12-21 12:28:47 -05:00
Ben Boeckel
9d78e44508 Merge topic 'ci-arch-tags' into release-1.7
c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
2022-12-21 12:28:46 -05:00
Ben Boeckel
054661f682 gitlab-ci: use arch-specific tags for OS selection 2022-12-21 09:35:02 -05:00
Ben Boeckel
4dd268c588 Merge branch 'ci-arch-tags-1.8' into ci-arch-tags-1.9
* ci-arch-tags-1.8:
  gitlab-ci: add missing feature tag for doxygen submission
  gitlab-ci: use arch-specific tags for OS selection
2022-12-21 09:34:52 -05:00
Ben Boeckel
4c010f6c88 Merge branch 'ci-arch-tags-1.7' into ci-arch-tags-1.8
* ci-arch-tags-1.7:
  gitlab-ci: add missing feature tag for doxygen submission
  gitlab-ci: use arch-specific tags for OS selection
2022-12-21 09:34:37 -05:00
Ben Boeckel
c3f4c924d4 gitlab-ci: add missing feature tag for doxygen submission 2022-12-21 09:34:18 -05:00
Ben Boeckel
7766bbc3cd gitlab-ci: use arch-specific tags for OS selection
Also add some missing OS tags for HIP jobs.
2022-12-21 09:34:18 -05:00
Tushar Athawale
503648b38a Merge topic 'update-readme' into release-1.9
96112343d README: Updated VTK-m installation instruction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2947
2022-12-13 15:27:19 -05:00
Tushar Athawale
96112343d0 README: Updated VTK-m installation instruction 2022-12-13 15:19:35 -05:00
Vicente Bolea
2fa7699e75 Merge branch 'release-1.8' into release-1.9 2022-11-29 11:38:05 -05:00
Vicente Bolea
fcfeef0f42 Merge topic 'backport-cgohlke-master-patch-04055' into release-1.9
70728978d Fix unresolved external symbol __popcnt on win-arm64
df5b5bf32 Fix unresolved external symbol __popcnt on win-arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2932
2022-11-29 11:38:05 -05:00
Vicente Bolea
6c503b6468 Merge topic 'backport-cgohlke-master-patch-04055' into release-1.8
70728978d Fix unresolved external symbol __popcnt on win-arm64
df5b5bf32 Fix unresolved external symbol __popcnt on win-arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2932
2022-11-29 11:38:04 -05:00
Christoph Gohlke
70728978de Fix unresolved external symbol __popcnt on win-arm64
(cherry picked from commit 0575e036d9fc0ea2dabb1cba07d2bcd9a5b5f750)
2022-11-28 18:41:41 -05:00
Christoph Gohlke
df5b5bf321 Fix unresolved external symbol __popcnt on win-arm64
(cherry picked from commit 92a7bfc680a6d2cd62c6a40c628e72d77c5af26e)
2022-11-28 18:41:30 -05:00
Kenneth Moreland
9932d07d6d Merge topic 'fix-log-scope' into release-1.9
74ed1c4cd Fix VTKM_LOG_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2923
2022-11-10 12:18:41 -05:00
Kenneth Moreland
74ed1c4cd0 Fix VTKM_LOG_SCOPE
The `VTKM_LOG_SCOPE` macro was not working as intended. It was supposed
to print a log message immediately and then print a second log message
when leaving the scope along with the number of seconds that elapsed
between the two messages.

This was not what was happening. The second log message was being
printed immediately after the first. This is because the scope was taken
inside of the `LogScope` method. The macro has been rewritten to put the
tracking in the right scope.
2022-11-10 07:12:19 -07:00
Kenneth Moreland
721537d028 Merge topic 'tutorial-readme' into release-1.9
a656862e0 Update the tutorial README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tushar Athawale <athawaletm@ornl.gov>
Merge-request: !2890
2022-10-14 08:23:09 -04:00
Kenneth Moreland
a656862e0a Update the tutorial README
This README should replace the page at https://m.vtk.org. Doing so will
make it easier to maintain the tutorial information.
2022-10-13 14:50:02 -06:00
Ben Boeckel
618c40a91b Merge branch 'release-1.8' into release-1.9 2022-10-13 14:08:56 -04:00
Ben Boeckel
b6e0391f28 Merge topic 'fix-clip-typelist' into release-1.9
42cb62028 Clip should use `VTKM_DEFAULT_TYPE_LIST` in CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2889
2022-10-13 14:08:56 -04:00
Ben Boeckel
0d793e8158 Merge topic 'fix-clip-typelist' into release-1.8
42cb62028 Clip should use `VTKM_DEFAULT_TYPE_LIST` in CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2889
2022-10-13 14:08:55 -04:00
Kenneth Moreland
e6971e2b36 Merge branch 'release-1.8' into release 2022-10-13 13:18:20 -04:00
Kenneth Moreland
55dbfb6f45 Merge branch 'release-1.7' into release-1.8 2022-10-13 13:18:20 -04:00
Kenneth Moreland
ca39bd4ea6 Merge topic 'contour-bug-v1.7' into release-1.7
a195ce883 Fix Flying Edges z-boundary condition with non-square input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2876
2022-10-13 13:18:19 -04:00
Sujin Philip
42cb620289 Clip should use VTKM_DEFAULT_TYPE_LIST in CastAndCall
This was causing an issue in VTK as the VTK specific typelist was not
being used. This resulted in a field's type being changed from `UInt8` to
`Float32` and caused a test to fail.
2022-10-13 12:14:45 -04:00
Kenneth Moreland
45ae18d46a Merge topic 'tutorial-edits' into release-1.9
689ba00e4 Minor formatting changes to tutorial examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2887
2022-10-12 16:21:06 -04:00
Kenneth Moreland
689ba00e4c Minor formatting changes to tutorial examples
While updating the slides for an upcoming tutorial, some minor changes
were made to the tutorial examples to more clearly explain concepts or
simply fit things better on slides.
2022-10-11 18:23:44 -06:00
Vicente Adolfo Bolea Sanchez
902fdac6fa 1.9.0 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
2022-10-11 15:07:59 -04:00
Vicente Adolfo Bolea Sanchez
6aa17299d1 release: 1.9.0 release notes 2022-10-11 15:06:56 -04:00
Vicente Adolfo Bolea Sanchez
1af6b210b8 release: update version and License 2022-10-11 15:06:46 -04:00
Kenneth Moreland
15f9c168f6 Merge topic 'mpi-init' into release-1.9
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
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
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
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
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 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