Vicente Adolfo Bolea Sanchez
cdd3a55f61
Revert "ci: fix perftest uploading"
...
This reverts commit 31b8b2faf90a79e069761b12deac8525cd4c0aa1.
2024-06-21 12:31:24 -04:00
Kenneth Moreland
44c251047e
Merge branch 'release-2.1'
2024-06-04 16:46:23 -04:00
Kenneth Moreland
3933adc450
Merge topic 'obsolete-thrust-patch'
...
4a4466e7c Disable Thrust patch that is no longer needed in modern Thrust
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3230
2024-06-04 16:46:23 -04:00
Kenneth Moreland
bcbaf964ae
Merge topic 'obsolete-thrust-patch' into release-2.1
...
4a4466e7c Disable Thrust patch that is no longer needed in modern Thrust
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3230
2024-06-04 16:46:23 -04:00
Kenneth Moreland
4a4466e7c8
Disable Thrust patch that is no longer needed in modern Thrust
...
There is a Thrust patch that works around an issue in Thrust 1.9.4
(https://github.com/NVIDIA/thrust/issues/972 ). The underlying issue
should be fixed in recent versions. In recent versions of CUDA, the patch
breaks (https://gitlab.kitware.com/vtk/vtk-m/-/issues/818 ).
This change fixes the problem by disabling the patch where it is not
needed.
2024-06-04 11:01:43 -04:00
Vicente Bolea
eb8e73ac9f
Merge branch 'release-2.1'
2024-06-03 14:18:01 -04:00
Vicente Bolea
6eae30063a
Merge topic 'fix-uploading-vtkm-perf-test' into release-2.1
...
31b8b2faf ci: fix perftest uploading
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3228
2024-06-03 14:18:01 -04:00
Vicente Bolea
8b7925cb60
Merge topic 'fix-uploading-vtkm-perf-test'
...
31b8b2faf ci: fix perftest uploading
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3228
2024-06-03 14:18:01 -04:00
Vicente Adolfo Bolea Sanchez
31b8b2faf9
ci: fix perftest uploading
2024-05-28 14:05:00 -04:00
Kenneth Moreland
3fcd392285
Merge topic 'remove-ascent' into release-2.1
...
f6869aa54 ci,ascent: remove ascent build
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3214
2024-05-20 21:42:42 -04:00
Kenneth Moreland
f5f1f0fde0
Merge branch 'release-2.1' into master
2024-05-20 21:42:42 -04:00
Gunther Weber
7230556ef9
Merge topic 'SplitGetBranchByVolume'
...
a77e5b3c6 Compute volume and select top volume branches
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3157
2024-05-17 19:28:38 -04:00
Mingzhe Li
a77e5b3c63
Compute volume and select top volume branches
2024-05-17 14:16:50 -07:00
Gunther Weber
3406ba3113
Merge topic 'fix-mc-connectivity'
...
27002d020 Fix distributed contour tree for marching cubes without using full boundary
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3218
2024-05-17 13:58:45 -04:00
Kenneth Moreland
3677fbdaa6
Merge branch 'release-2.1'
2024-05-17 08:20:39 -04:00
Kenneth Moreland
f2b73fe2e4
Merge topic 'safe-cuda-runtime-config'
...
f42f59d68 Fix crash when CUDA device is disabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gunther Weber <ghweber@lbl.gov>
Merge-request: !3216
2024-05-17 08:20:39 -04:00
Kenneth Moreland
a87adb479f
Merge topic 'safe-cuda-runtime-config' into release-2.1
...
f42f59d68 Fix crash when CUDA device is disabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gunther Weber <ghweber@lbl.gov>
Merge-request: !3216
2024-05-17 08:20:38 -04:00
Gunther H. Weber
27002d0209
Fix distributed contour tree for marching cubes without using full boundary
2024-05-16 11:51:38 -07:00
Kenneth Moreland
98168fc2ff
Merge topic 'guide-memory-layout'
...
8e570c8b6 Add user guide chapter on memory layout in ArrayHandles
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3219
2024-05-15 16:06:15 -04:00
Kenneth Moreland
2e91cd1e88
Merge branch 'release-2.1'
2024-05-15 15:42:52 -04:00
Kenneth Moreland
ff618152b3
Merge branch 'release-2.0' into release-2.1
2024-05-15 15:42:51 -04:00
Kenneth Moreland
c9417825e5
Merge topic 'fix-old-cuda-atomics'
...
78e06d5dc Fix old cuda atomics
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3209
2024-05-15 15:42:51 -04:00
Kenneth Moreland
af3ab951c4
Merge topic 'fix-old-cuda-atomics' into release-2.1
...
78e06d5dc Fix old cuda atomics
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3209
2024-05-15 15:42:51 -04:00
Kenneth Moreland
92b08967a2
Merge topic 'fix-old-cuda-atomics' into release-2.0
...
78e06d5dc Fix old cuda atomics
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3209
2024-05-15 15:42:51 -04:00
Kenneth Moreland
b04e2ff3b8
Merge topic 'benchmark-deprecation-warning'
...
c72256e55 Fix deprecation warning from Google benchmark
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3220
2024-05-13 13:51:49 -04:00
Jefferson Amstutz
78033fde56
Merge topic 'anari_unstructured_volumes'
...
232d9dde9 fix ANARIMapperVolume usage edge cases (empty actor is valid)
ea3020383 minor cleanups
86e6e6e65 support unstructured cell (point-centered only)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3210
2024-05-13 10:56:55 -04:00
Kenneth Moreland
c72256e555
Fix deprecation warning from Google benchmark
...
The warning is that asking not to optimize a const variable does not
always work. Fix by simply not declaring the variable as const.
2024-05-13 08:20:44 -06:00
Kenneth Moreland
8e570c8b64
Add user guide chapter on memory layout in ArrayHandles
2024-05-13 08:12:22 -06:00
Jefferson Amstutz
232d9dde9c
fix ANARIMapperVolume usage edge cases (empty actor is valid)
2024-05-13 08:40:49 -05:00
Jefferson Amstutz
ea30203836
minor cleanups
2024-05-13 08:40:49 -05:00
Qi Wu
86e6e6e65b
support unstructured cell (point-centered only)
2024-05-13 08:40:49 -05:00
Gunther Weber
9c8d89c70b
Merge topic 'distributed-contour-tree-fixes'
...
124c58eb4 Minor fixes for distributed contour tree example
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3217
2024-05-10 20:30:14 -04:00
Gunther H. Weber
124c58eb48
Minor fixes for distributed contour tree example
2024-05-10 15:09:03 -07:00
Kenneth Moreland
d26ac66dcb
Merge topic 'intel-finites' into release-2.1
...
b93ee30ab Enable non-finite values with Intel compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !3213
2024-05-07 13:08:00 -04:00
Kenneth Moreland
255d977bc3
Merge branch 'release-2.1'
2024-05-07 13:08:00 -04:00
Kenneth Moreland
bf0390b8e1
Merge topic 'intel-finites'
...
b93ee30ab Enable non-finite values with Intel compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !3213
2024-05-07 13:08:00 -04:00
Kenneth Moreland
f42f59d685
Fix crash when CUDA device is disabled
...
There was an issue where if VTK-m was compiled with CUDA support but then
run on a computer where no CUDA device was available, an inappropriate
exception was thrown (instead of just disabling the device). The
initialization code should now properly check for the existance of a CUDA
device.
2024-05-03 17:03:20 -04:00
Kenneth Moreland
e70f0cb61d
Merge branch 'release-2.1'
2024-05-03 13:06:32 -04:00
Kenneth Moreland
72c17927d3
Merge topic 'extract-geometry-permutation'
...
49518e505 Fix bug with ExtractGeometry filter
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3215
2024-05-03 13:06:32 -04:00
Kenneth Moreland
5634a09b95
Merge topic 'extract-geometry-permutation' into release-2.1
...
49518e505 Fix bug with ExtractGeometry filter
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3215
2024-05-03 13:06:31 -04:00
Kenneth Moreland
49518e5054
Fix bug with ExtractGeometry filter
...
The `ExtractGeometry` filter was outputing datasets containing
`CellSetPermutation` as the representation for the cells. Although this is
technically correct and a very fast implementation, it is essentially
useless. The problem is that any downstream processing will have to know
that the data has a `CellSetPermutation`. None do (because the permutation
can be on any other cell set type, which creates an explosion of possible
cell types).
Like was done with `Threshold` a while ago, this problem is fixed by deep
copying the result into a `CellSetExplicit`. This behavior is consistent
with VTK.
2024-05-03 09:22:56 -04:00
Vicente Adolfo Bolea Sanchez
f6869aa541
ci,ascent: remove ascent build
2024-05-03 08:39:20 -04:00
Kenneth Moreland
cd8afa9f7f
Merge topic 'fix-openmp-exported-target'
...
e40cdbc0f Ensure OpenMP is imported
88b9a2f42 Update OpenMP code for consistency
ba75296f6 Use target `OpenMP::OpenMP_CXX` for exported targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3212
2024-04-25 09:52:39 -04:00
Kenneth Moreland
b93ee30ab5
Enable non-finite values with Intel compiler
...
The Intel compiler by default turns on an optimization that assumes that
all floating point values are finite. This breaks any ligitimate uses of
non-finite values including checking values with functions like `isnan`
and `isinf`. Turn off this feature for the intel compiler.
2024-04-25 09:38:15 -04:00
Yohann Vautrin
e40cdbc0f9
Ensure OpenMP is imported
2024-04-23 18:03:24 -04:00
Yohann Vautrin
88b9a2f42f
Update OpenMP code for consistency
...
Calls to `set_property` are replaced by equivalents calls for
readability. Order of operations is changed for consistency with the
code for TBB.
2024-04-23 16:01:50 -04:00
Yohann Vautrin
ba75296f65
Use target OpenMP::OpenMP_CXX
for exported targets
...
Using `${OpenMP_CXX_LIBRARIES}` results in paths to certain libraries
being hard-coded in VTKmTargets.cmake, which can lead to issues in some
cases (e.g.: when VTK is built by the CI system for MSYS2).
2024-04-23 16:01:10 -04:00
Kenneth Moreland
78e06d5dcd
Fix old cuda atomics
...
There are some overloads for atomic adds of floating point numbers for
older versions of cuda that do not include them directly. These were
misnamed and thus not properly overloading the generic implementation.
This caused compile errors with older versions of cuda.
2024-04-02 13:45:15 -04:00
Dave Pugmire
6e8308f2bb
Merge topic 'uniformbin_locator_bincheck'
...
b6c69774f Add comment addressing the missing else
7fb1821b7 Fix issue (findBinIdx won't fail if point outside dataset).
699646675 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into uniformbin_locator_bincheck
c06173274 Add helper methods. Check the binIdx FIRST.
9fb58dcf1 Optimize cellID bin check.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3130
2024-04-01 15:41:11 -04:00
Dave Pugmire
b6c69774fc
Add comment addressing the missing else
2024-04-01 14:54:57 -04:00