Commit Graph

11478 Commits

Author SHA1 Message Date
Kenneth Moreland
053237e900 Favor base types used by VTK-m when making new basic array
When calling `NewInstanceBasic` on an `UnknownArrayHandle`, all C base
types will be tried. In some cases, multiple type will match the same
array. When this happens, favor types used by VTK-m (e.g. `long long`
over `long`).
2023-12-17 22:49:54 -07:00
Vicente Bolea
806eb54e90 Merge topic 'fix-rocthrust-flag'
6664fd1e5 cmake: VTKm_ENABLE_KOKKOS_THRUST disabled by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3168
2023-12-15 19:11:19 -05:00
Kenneth Moreland
8fc341e716 Allow floating-point isovalues for contours of integer fields
The flying edges version of the contouring filter converted the isovalues
provided into the same type as the field. This is fine for a floating point
field, but for an integer field the isovalue was truncated to the nearest
integer.

This is problematic because it is common to provide a fractional isovalue
(usually N + 0.5) for integer fields to avoid degenerate cases of the
contour intersecting vertices. It also means the behavior changes between
an integer type that is directly supported (like a `signed char`) or an
integer type that is not directly supported and converted to a floating
point field (like potentially a `char`).

This change updates the worklets to allow the isovalue to have a different
type than the field and to always use a floating point type for the
isovalue.
2023-12-15 16:26:17 -07:00
Vicente Adolfo Bolea Sanchez
6664fd1e5a cmake: VTKm_ENABLE_KOKKOS_THRUST disabled by default 2023-12-15 13:07:20 -05:00
Dave Pugmire
01feb4954d Merge topic 'locatorBenchmark'
73b0abd5a Verbose function names.
bbb5385b4 Cleanup, enable more tests.
fbcdbc650 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into locatorBenchmark
a956d18e4 Add iteration benchmark.
a7434a297 Enable uniformgrid, copy data to arrayhandle
14369509a Add benchmark for 2D explicit grids.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3164
2023-12-13 21:10:24 -05:00
Kenneth Moreland
82c1d27e9e Merge topic 'guide-developing'
cba1068be Update the developing algorithms section of the user's guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3156
2023-12-13 18:18:32 -05:00
Jefferson Amstutz
9b6c98d7cd Merge topic 'anari_volume_types'
2de1a462a support more volume types via array element conversion + ensure scalar data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3167
2023-12-12 23:04:27 -05:00
Dave Pugmire
73b0abd5a8 Verbose function names. 2023-12-12 15:55:00 -05:00
Dave Pugmire
bbb5385b4f Cleanup, enable more tests. 2023-12-11 22:06:37 -05:00
Jefferson Amstutz
2de1a462a0 support more volume types via array element conversion + ensure scalar data 2023-12-11 11:16:12 -06:00
Kenneth Moreland
cba1068bec Update the developing algorithms section of the user's guide 2023-12-08 08:50:18 -05:00
Dave Pugmire
fbcdbc6504 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into locatorBenchmark 2023-12-07 07:57:08 -05:00
Dave Pugmire
a956d18e4c Add iteration benchmark. 2023-12-07 07:44:19 -05:00
Mark Bolstad
92e7425b8d Merge topic 'cuda_err_with_private_class'
4676d07f0 Fix error under CUDA with private class declarations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3165
2023-12-05 12:46:37 -05:00
Mark Bolstad
4676d07f09 Fix error under CUDA with private class declarations
nvcc doesn't like the couple of places that we have Impl classes hiding behind a
private declaration. So for VTKM_CUDA only, ifdef the private declaration out
2023-12-05 10:03:40 -07:00
Dave Pugmire
a7434a297f Enable uniformgrid, copy data to arrayhandle 2023-12-05 09:59:21 -05:00
Dave Pugmire
14369509a9 Add benchmark for 2D explicit grids. 2023-12-05 09:39:08 -05:00
Ben Boeckel
fb96349004 Merge topic 'loguru-install-interface' into release-2.1
14a276401 loguru: do not declare an install interface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3163
2023-12-04 12:44:14 -05:00
Ben Boeckel
5993859653 Merge branch 'release-2.1' 2023-12-04 12:44:14 -05:00
Ben Boeckel
2134955065 Merge topic 'loguru-install-interface'
14a276401 loguru: do not declare an install interface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3163
2023-12-04 12:44:14 -05:00
Ben Boeckel
14a276401b loguru: do not declare an install interface
The headers are not installed, so there's nothing to refer to.
2023-12-04 11:34:19 -05:00
Ben Boeckel
a5994a8129 Merge topic 'clang-tidy-fixes'
1541cfa8a clang-tidy: fix `bugprone-incorrect-roundings` lints
0ce73eb68 clang-tidy: fix `readability-avoid-const-params-in-decls` lints
e07fb9fec clang-tidy: fix `performance-move-const-arg` lints
5aad5ca37 clang-tidy: fix `modernize-redundant-void-arg` lints
6c00a8755 clang-tidy: fix `readability-redundant-access-specifiers` lints
219f44c25 clang-tidy: fix `readability-const-return-type` lints
b99920d47 Oscillator: use a type of the right size for `oIdx`
13e935c35 clang-tidy: fix `readability-redundant-member-init` lints
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3053
2023-12-04 10:42:50 -05:00
Vicente Bolea
b2ed7975d1 Merge topic 'update-roadmap'
1ffe862fe update roadmap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3162
2023-12-01 19:21:04 -05:00
Kenneth Moreland
5d0bf1d866 Merge topic 'document-merge-data-sets'
45ad2fb50 Add documentation of MergeDataSets filter to user's guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3161
2023-12-01 19:17:29 -05:00
Ben Boeckel
1541cfa8a6 clang-tidy: fix bugprone-incorrect-roundings lints
Adding `0.5` is not correct in all cases. Namely, adding `0.5` will
cause the value immediately before it to be rounded to `1` due to the
"round to nearest even" rule. Trust the standard library to get this
right.
2023-12-01 07:01:11 -05:00
Ben Boeckel
0ce73eb680 clang-tidy: fix readability-avoid-const-params-in-decls lints 2023-12-01 07:01:11 -05:00
Ben Boeckel
e07fb9fec3 clang-tidy: fix performance-move-const-arg lints 2023-12-01 07:01:11 -05:00
Ben Boeckel
5aad5ca37e clang-tidy: fix modernize-redundant-void-arg lints 2023-12-01 07:01:11 -05:00
Ben Boeckel
6c00a87554 clang-tidy: fix readability-redundant-access-specifiers lints 2023-12-01 07:01:11 -05:00
Ben Boeckel
219f44c250 clang-tidy: fix readability-const-return-type lints 2023-12-01 07:01:11 -05:00
Ben Boeckel
b99920d47b Oscillator: use a type of the right size for oIdx 2023-12-01 07:01:11 -05:00
Ben Boeckel
13e935c357 clang-tidy: fix readability-redundant-member-init lints 2023-12-01 07:01:11 -05:00
Ben Boeckel
97e0024daf clang-tidy: fix modernize-use-override lints 2023-12-01 07:01:11 -05:00
Vicente Adolfo Bolea Sanchez
1ffe862fed update roadmap 2023-11-30 22:45:51 -05:00
Vicente Bolea
763293a97e Merge topic 'fix-rocthrust-dep' into release-2.1
c9ec6ae6a kokkos: let link vtkm_cont to roc::rocthrust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3160
2023-11-30 22:08:36 -05:00
Vicente Bolea
57bbe45fff Merge branch 'release-2.1' 2023-11-30 22:08:36 -05:00
Vicente Bolea
4e0eb57527 Merge topic 'fix-rocthrust-dep'
c9ec6ae6a kokkos: let link vtkm_cont to roc::rocthrust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3160
2023-11-30 22:08:36 -05:00
Kenneth Moreland
45ad2fb50d Add documentation of MergeDataSets filter to user's guide 2023-11-30 18:36:29 -05:00
Vicente Adolfo Bolea Sanchez
c9ec6ae6a6 kokkos: let link vtkm_cont to roc::rocthrust
Also reorder the declarion of the option VTKm_ENABLE_KOKKOS_THRUST
to be set before calling VTKmDeviceAdapters.
2023-11-30 18:18:03 -05:00
Zhe Wang
82bf3d1afc Merge topic 'fix_ascent_warning'
418347819 fix ascent warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3159
2023-11-30 17:25:08 -05:00
Wang
418347819e fix ascent warning 2023-11-30 11:54:15 -05:00
Vicente Bolea
9a48174661 Merge branch 'release-2.1' 2023-11-29 21:29:20 -05:00
Vicente Bolea
4a62d88fc8 Merge topic 'update-to-2.1.0'
3563d9746 release: update version and License

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3158
2023-11-29 21:29:20 -05:00
Vicente Adolfo Bolea Sanchez
a057f62e75 2.1.0 is our 16th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/2.1/release-notes.md
v2.1.0
2023-11-29 12:51:18 -05:00
Vicente Adolfo Bolea Sanchez
3563d97460 release: update version and License 2023-11-29 12:47:23 -05:00
Zhe Wang
01f21a59b8 Merge topic 'add_MergeDataSet_filter'
725407235 add merge data sets filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3148
2023-11-21 20:09:28 -05:00
Vicente Bolea
bdf8732c49 Merge topic 'fix-opensuse-build'
ca30daa90 ci,docker:  use ch3:sock backend in Opensuse MPICH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3153
2023-11-21 17:22:27 -05:00
Vicente Adolfo Bolea Sanchez
ca30daa904 ci,docker: use ch3:sock backend in Opensuse MPICH 2023-11-21 15:54:19 -05:00
Wang
7254072357 add merge data sets filter 2023-11-21 15:31:59 -05:00
Kenneth Moreland
61bbd7876e Merge topic 'guide-using-part'
5b8c282e9 Continue transfer of Users' Guide text
7302372b4 Fix doxygen issues
3d3b66865 Add option to turn off Doxygen html

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3151
2023-11-21 14:16:52 -05:00