Commit Graph

9926 Commits

Author SHA1 Message Date
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
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
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
6f64a9305d Merge topic 'skip-find-tbb-if-loaded' into release-1.7
c30c35571 Revert "Disable loading the TBBConfig.cmake file"
dd3fc9781 cmake: skip find_package(TBB) if already loaded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2836
2022-08-05 13:35:45 -04:00
Vicente Bolea
67a06cfe6b Merge topic 'skip-find-tbb-if-loaded' into release-1.8
c30c35571 Revert "Disable loading the TBBConfig.cmake file"
dd3fc9781 cmake: skip find_package(TBB) if already loaded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2835
2022-08-04 17:33:47 -04:00
Vicente Adolfo Bolea Sanchez
c30c35571f Revert "Disable loading the TBBConfig.cmake file"
This reverts commit a8825db59a7235c9d267ac4f909bd2eebb25cb40.
2022-08-04 13:58:01 -04:00
Vicente Adolfo Bolea Sanchez
dd3fc97811 cmake: skip find_package(TBB) if already loaded 2022-08-04 13:24:27 -04:00
Sujin Philip
450108b1d6 Merge topic 'getfieldindex-not-throw-backport' into release-1.7
c0364e71c DataSet::GetFieldIndex should not throw

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2829
2022-08-03 08:40:25 -04:00
Sujin Philip
4a9a853de0 Merge branch 'release-1.7' into release-1.8 2022-08-03 08:40:25 -04:00
Sujin Philip
3b9dd256d3 Merge topic 'getfieldindex-not-throw-backport' into release-1.8
8587c8282 Merge branch 'release' into getfieldindex-not-throw-backport
c0364e71c DataSet::GetFieldIndex should not throw

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2829
2022-08-03 08:40:25 -04:00
Sujin Philip
8587c82827 Merge branch 'release' into getfieldindex-not-throw-backport 2022-07-29 09:16:42 -04:00
Sujin Philip
c0364e71cc DataSet::GetFieldIndex should not throw
As per its documentation, DataSet::GetFieldIndex should return -1 when
a field with the given name is not found.
2022-07-28 08:45:18 -04:00
Vicente Adolfo Bolea Sanchez
982e965536 1.8.0 is our 12th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/1.8.0/release-notes.md
v1.8.0
2022-06-16 13:18:02 -04:00
Vicente Adolfo Bolea Sanchez
fdd5e04ebc Update release notes for 1.8.0 2022-06-16 13:18:02 -04:00
Manish Mathai
f240a84e6d Merge topic 'enhance-glyphing-types' into release-1.8
814ec27f1 Add MapperGlyphScalar and MapperGlyphVector mappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2747
2022-06-15 20:17:53 -04:00
Manish Mathai
814ec27f1e Add MapperGlyphScalar and MapperGlyphVector mappers
These mappers can be used to render cell sets as glyphs. The following
glyph types are available for scalar fields:
 - Cube
 - Sphere
 - Axes
 - Quads

For vector fields:
 - Arrows
2022-06-15 15:19:53 -07: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
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
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
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
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
Kenneth Moreland
d60bcd2536 Merge branch 'release-1.7' into release-1.8 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
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
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
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
Vicente Adolfo Bolea Sanchez
cc5771549a 1.8.0-rc1 is our 12th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/1.8.0/release-notes.md
v1.8.0-rc1
2022-04-21 16:44:01 -04:00
Vicente Adolfo Bolea Sanchez
31f5a66c7d Add release notes for 1.8.0-rc1 2022-04-21 16:44:01 -04:00
Vicente Adolfo Bolea Sanchez
2c96006349 Merge remote-tracking branch 'origin/master' into update-to-v1.8.0
* origin/master: (426 commits)
  smoke_test: Remove version condition
  Fix deprecated method export
  cuda: Fix new cuda version warnings
  docker: update cuda images to 11.6
  use kokkos allocate whn oldSize is zero
  Fix filter benchmark
  Replace static datasets with dynamically allocated versions.
  CMAKE: add CMAKE_CUDA_ARCHITECTURE support
  Turn off inlining of Variant::CastAndCall for HIP
  Modify Variant CastAndCall to have fewer cases in its switch
  Add a unique symbol to InstantiationTemplate.cxx.in
  README: Add doxygen links for nightly
  Update vtkm_add_instantiations documentation
  Declare methods for instances out of line
  Protect gradient instantiations from ambiguity
  Compile instantiations of the gradient filter
  Add generalized instantiation
  Fix point merge for Marching Cubes with multiple isosurfaces
  Remove deprecated use of old unscoped enums in FieldSelection
  Use scoped enum for FieldSelection mode
  ...
2022-04-21 16:43:23 -04:00
Vicente Bolea
6374b35837 Merge topic 'remove-vtkm-version-smoke-test'
53e22ab1d smoke_test: Remove version condition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2761
2022-04-21 16:41:37 -04:00
Vicente Adolfo Bolea Sanchez
53e22ab1d3 smoke_test: Remove version condition 2022-04-21 15:20:36 -04:00
Manish Mathai
09fc8155af Merge topic 'fix-mapper-quad'
27825778e Fix color rendering when using MapperQuad

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2729
2022-04-20 12:04:35 -04:00
Kenneth Moreland
ca5b5ff9bb Merge topic 'deprecated-method-export'
60e6b3ec8 Fix deprecated method export

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2756
2022-04-19 10:14:58 -04:00
Kenneth Moreland
60e6b3ec84 Fix deprecated method export
The deprecated class `vtkm::filter::MeshQuality` contained a private
method that was referenced in its inlined constructor. The problem was
that this private method was compiled in the `vtkm_filter_mesh_info`
library but not properly exported. Fix this by adding an export to the
class.
2022-04-12 10:26:54 -06:00
Kenneth Moreland
a9d49b35b2 Merge topic 'scoped-enum-field-to-colors'
e6b37f7a4 Remove deprecated use of old unscoped enums in FieldToColors
f37cc7657 Use scoped enum for FieldToColors modes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2734
2022-04-11 10:54:43 -04:00
Vicente Bolea
c123addeac Merge topic 'update-cuda-dockerfiles'
86bf87617 cuda: Fix new cuda version warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2752
2022-04-07 18:14:34 -04:00
Vicente Adolfo Bolea Sanchez
86bf876178 cuda: Fix new cuda version warnings 2022-04-07 17:50:37 -04:00
Vicente Bolea
97d860b3f9 Merge topic 'update-cuda-dockerfiles'
620d1a1be docker: update cuda images to 11.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2751
2022-04-07 15:25:23 -04:00
Vicente Adolfo Bolea Sanchez
620d1a1bee docker: update cuda images to 11.6 2022-04-07 16:35:45 +00:00
Gunther Weber
5ad164f98f Merge topic 'fix-memory-reallocation-kokkos'
291dafb17 use kokkos allocate whn oldSize is zero

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2746
2022-04-05 13:17:39 -04:00
Kenneth Moreland
a96f2a32b4 Merge topic 'gradient-test'
3b0cdcec2 Add tests for divergence, vorticity, and q criterion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2739
2022-04-01 10:11:43 -04:00
Abdelilah Essiari
291dafb173 use kokkos allocate whn oldSize is zero 2022-03-31 14:38:03 -04:00
Mark Bolstad
12acf31097 Merge topic 'benchmark_dataset_deletion_order'
6222baa75 Fix filter benchmark
19f90b96e Replace static datasets with dynamically allocated versions.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2720
2022-03-30 13:33:28 -04:00
Vicente Bolea
b40d7105cf Merge topic 'add-cuda-arch'
af129132c CMAKE: add CMAKE_CUDA_ARCHITECTURE support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2724
2022-03-30 11:49:44 -04:00
Mark Bolstad
6222baa758 Fix filter benchmark
After the rebase, the filter benchmark was in a weird half state with some of the old code, and some of the updated code.
2022-03-30 09:18:00 -06:00
Mark Bolstad
19f90b96e0 Replace static datasets with dynamically allocated versions.
The static datasets were wreaking havoc on order of destructors at exit and causing kokkos to throw an exception. This change dynamically allocates a dataset, copies the read/sourced data into it, and explicitly frees the data.
2022-03-30 09:18:00 -06:00
Vicente Adolfo Bolea Sanchez
af129132cc CMAKE: add CMAKE_CUDA_ARCHITECTURE support 2022-03-29 19:56:43 -04:00
Kenneth Moreland
16cdb00c6a Merge topic 'variant-fewer-cases'
62e509c0a Turn off inlining of Variant::CastAndCall for HIP
6afff7550 Modify Variant CastAndCall to have fewer cases in its switch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2744
2022-03-29 13:11:18 -04:00