Dave Pugmire
b5dbd0d4c8
Merge branch 'sl_comm_probe' into 'master'
...
Draft: Use async termination.
See merge request vtk/vtk-m!3182
2024-06-28 14:40:18 -04:00
Kenneth Moreland
fc570a75a5
Merge branch 'release' into master
2024-06-28 11:10:45 -04:00
Kenneth Moreland
cb07d8400c
Merge branch 'release-2.0' into release
2024-06-28 11:10:45 -04:00
Kenneth Moreland
f610044d79
Merge topic 'split-contour-bench-2-1' into release-2.0
...
6f5f65487 Split the contour benchmark into structured/unstructured
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3239
2024-06-28 11:10:45 -04:00
Vicente Bolea
9c0a3aef31
Merge topic 'update-rocm'
...
c6f0e3698 ci: update kokkos hip to 6.1, ubuntu 2204
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3237
2024-06-27 14:21:15 -04:00
Kenneth Moreland
6f5f654878
Split the contour benchmark into structured/unstructured
...
We've been having problems with PerformanceTestBenchContour. In the last
few iteration, the runtime goes way up. We cannot find any reason for
this in the source code. There don't appear to be any particular
problems with memory or tables. The best we can figure is an issue with
the device hardware in the container.
The easy solution should be to break the benchmark into smaller peices
to avoid the problem.
2024-06-26 17:47:27 -04:00
Vicente Bolea
743a7c3ac4
Merge branch 'release-2.0' into release
2024-06-26 17:46:45 -04:00
Vicente Bolea
b6a0e4d79b
Merge topic 'backport-3233' into release-2.0
...
638d18356 fix: perftest upload
1078d7dfb Revert "ci: fix perftest uploading"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3235
2024-06-26 17:46:45 -04:00
Vicente Bolea
726bd0b551
Merge branch 'release' into master
2024-06-26 17:46:45 -04:00
Vicente Adolfo Bolea Sanchez
c6f0e36986
ci: update kokkos hip to 6.1, ubuntu 2204
2024-06-26 16:31:25 -04:00
Vicente Bolea
f1eac04f72
Merge branch 'release-2.1'
2024-06-25 12:14:43 -04:00
Vicente Bolea
d6914b6010
Merge topic 'update-to-2.2.0'
...
c1c7b0df5 release: 2.2.0-rc1 release notes
f2eefbd5c release: update version and License
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3238
2024-06-25 12:14:43 -04:00
Vicente Adolfo Bolea Sanchez
67a4def093
2.2.0-rc1 is our 17th official release of VTK-m.
...
The major changes to VTK-m from (previous release) can be found in:
docs/changelog/2.2.0/release-notes.md
v2.2.0-rc1
2024-06-24 17:43:01 -04:00
Vicente Adolfo Bolea Sanchez
c1c7b0df50
release: 2.2.0-rc1 release notes
2024-06-24 17:41:03 -04:00
Vicente Adolfo Bolea Sanchez
f2eefbd5ca
release: update version and License
2024-06-24 17:22:14 -04:00
Kenneth Moreland
a0db7c3f5b
Merge topic 'split-contour-bench'
...
4c392f9b5 Split the contour benchmark into structured/unstructured
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3229
2024-06-24 12:58:05 -04:00
Kenneth Moreland
d7890b3493
Merge branch 'release-2.1'
2024-06-24 09:05:49 -04:00
Kenneth Moreland
4335e43e50
Merge topic 'allow-backward-compatibility'
...
b2997bcbe Support backward compatibility in CMake package
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3234
2024-06-24 09:05:49 -04:00
Kenneth Moreland
cac8baa055
Merge topic 'allow-backward-compatibility' into release-2.1
...
b2997bcbe Support backward compatibility in CMake package
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3234
2024-06-24 09:05:48 -04:00
Vicente Adolfo Bolea Sanchez
638d183567
fix: perftest upload
...
(cherry picked from commit 76ddf7a5b2836cf4153e36f28dd2675f5ef8a735)
2024-06-21 16:50:11 -04:00
Vicente Adolfo Bolea Sanchez
1078d7dfb4
Revert "ci: fix perftest uploading"
...
This reverts commit 31b8b2faf90a79e069761b12deac8525cd4c0aa1.
(cherry picked from commit cdd3a55f61850c4438a0b0f890bc6e3f11c641fb)
2024-06-21 16:50:07 -04:00
Kenneth Moreland
b2997bcbe8
Support backward compatibility in CMake package
...
VTK-m development is in a mode where backward compatibility should be
maintained between minor versions of the software. (You may get deprecation
warnings, but things should still work.) To match this behavior, the
generated CMake package now supports finding versions with the same major
release and the same or newer minor release. For example, if an external
program does this
``` cmake
find_package(VTKm 2.1 REQUIRED)
```
then CMake will link to 2.1 (of course) as well as newer minor releases
(e.g., 2.2, 2.3, etc.). It will not, however, match older versions (e.g.,
2.0, 1.9), nor will it match any version after the next major release
(e.g., 3.0).
2024-06-21 15:28:42 -04:00
Kenneth Moreland
4c392f9b58
Split the contour benchmark into structured/unstructured
...
We've been having problems with PerformanceTestBenchContour. In the last
few iteration, the runtime goes way up. We cannot find any reason for
this in the source code. There don't appear to be any particular
problems with memory or tables. The best we can figure is an issue with
the device hardware in the container.
The easy solution should be to break the benchmark into smaller peices
to avoid the problem.
2024-06-21 14:48:17 -04:00
Kenneth Moreland
c6ad00aefd
Merge topic 'guide-fancy-arrays'
...
3e6963092 Add guide chapter on fancy array handles
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3231
2024-06-21 14:45:38 -04:00
Vicente Bolea
46d872d7c2
Merge topic 'fix-uploading-vtkm-perf-test'
...
76ddf7a5b fix: perftest upload
cdd3a55f6 Revert "ci: fix perftest uploading"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3233
2024-06-21 14:32:34 -04:00
Vicente Adolfo Bolea Sanchez
76ddf7a5b2
fix: perftest upload
2024-06-21 12:32:29 -04:00
Vicente Adolfo Bolea Sanchez
cdd3a55f61
Revert "ci: fix perftest uploading"
...
This reverts commit 31b8b2faf90a79e069761b12deac8525cd4c0aa1.
2024-06-21 12:31:24 -04:00
Kenneth Moreland
3e69630925
Add guide chapter on fancy array handles
2024-06-05 17:51:14 -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
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
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
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
eb8e73ac9f
Merge branch 'release-2.1'
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
f5f1f0fde0
Merge branch 'release-2.1' into master
2024-05-20 21:42:42 -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
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