Commit Graph

10650 Commits

Author SHA1 Message Date
Vicente Bolea
7b53fdfa2d Merge topic 'correct-pkgconfig-include' into release-2.0
f4aa4de0f pkgconfig: fix include flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3127
2023-08-29 16:37:14 -04:00
Vicente Adolfo Bolea Sanchez
f4aa4de0f2 pkgconfig: fix include flags 2023-08-29 12:42:18 -04:00
Vicente Bolea
bffa25a607 Merge branch 'release-1.9' into release 2023-07-10 11:56:45 -04:00
Vicente Bolea
03dd44c593 Merge topic 'backport-cuda12-fix' into release-1.9
ac943ac3d Merge topic 'cuda-12-fixes'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3100
2023-07-10 11:56:45 -04:00
Sujin Philip
ac943ac3dd Merge topic 'cuda-12-fixes'
5d0481342 Fix compile issues when using cuda 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2960
(cherry picked from commit f8af0b17f4cc771ceb2cc2e2b40947be450099cc)
2023-07-08 16:52:54 -04:00
Kenneth Moreland
2244e431d4 Merge topic 'data-license' into release-2.0
f545feba8 Add changelog for documenting data license
a24358a1a Document source of WarpX files
60559ce9b Document the source of venn250.vtk
796ec9638 Document data that comes from VisIt tutorial
06391c4e6 Clarify license for ECL data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3016
2023-03-20 09:42:41 -04:00
Kenneth Moreland
f545feba8f Add changelog for documenting data license 2023-03-14 12:25:21 -06:00
Kenneth Moreland
a24358a1a3 Document source of WarpX files
These files come courtesy of Axel Huebl (LBNL). They are simple
outputs from the WarpX code.
2023-03-14 12:25:21 -06:00
Kenneth Moreland
60559ce9b1 Document the source of venn250.vtk
The venn250.vtk file was generated by running one of the Blueprint
examples. The library function used to generate the data is
documented here:

https://llnl-conduit.readthedocs.io/en/latest/blueprint_mesh.html#venn
2023-03-14 12:25:21 -06:00
Kenneth Moreland
796ec9638e Document data that comes from VisIt tutorial
Some of the data sets that are included from VTK-m are derived from the
VisIt Tutorial Data (https://www.visitusers.org/index.php?title=Tutorial_Data).
These are covered by the VisIt license, as communicated by Eric Brugger.

Although the license for these data is compatible with VTK-m's license,
we should still attribute the source of the data and make clear the
copyrights. The data are moved into the third_party directory, and
readmes are added to document everything.

The noise.vtk and noise.bov files have been renamed example.vtk and
example_temp.bov to match the name of the file in the VisIt tutorial
data archive. The ucd3d.vtk file, which is similar to the curv3d.silo
data but altered, has been removed. It was not used for any tests. It
was referenced in a couple of example programs, but the reference is
easily changed.
2023-03-14 12:25:21 -06:00
Kenneth Moreland
06391c4e63 Clarify license for ECL data
The readme for the ECL data gave the source of the data but required a
lookup for the license. Explictly give the direct link to the license
and copy the license to the readme to ensure we are following the
conditions of attribution.
2023-03-14 12:25:20 -06:00
Vicente Bolea
7e1f10ea6f Merge branch 'release-1.8' into release-1.9 2023-03-14 12:34:20 -04:00
Vicente Bolea
9316fa3280 Merge branch 'release-1.9' into release-2.0 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
a1877d8670 Merge topic 'update-runner-tag-centos8' into release-2.0
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
e63cb63b13 Merge topic 'remove-unlicensed-data' into release-2.0
5aba6e1be Remove unlicensed data

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3012
2023-03-14 11:42:03 -04:00
Kenneth Moreland
5aba6e1bea Remove unlicensed data
Some of the test data sets are derived from data sets that are commonly
distributed to test visualization algorithms and are featured in
numerous papers. However, I am unable to track down the original source
let alone identify what license, if any, they were released under. To
avoid any complications with data ownership, remove these data sets and
replace them with in house data sets that we explicitly own.
2023-03-13 13:54:44 -06:00
Kenneth Moreland
0c9371aa88 Merge branch 'release-1.9' into release-2.0 2023-03-09 17:52:44 -05: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
Kenneth Moreland
a142e078be Merge topic 'fix_insitu_arg_processing' into release-2.0
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
Vicente Adolfo Bolea Sanchez
cfd6d3fbe5 2.0.0 is our 15th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/2.0.0/release-notes.md
v2.0.0
2023-02-18 18:37:26 -05:00
Vicente Adolfo Bolea Sanchez
dd79a487a7 release: 2.0.0 release notes 2023-02-18 18:37:26 -05:00
Vicente Adolfo Bolea Sanchez
f6b087689c release: update version and License 2023-02-18 18:37:26 -05:00
Vicente Bolea
d3b51a9379 Merge topic 'fix-compile_fix_for_sycl-release' into release-2.0
36912c16d kokkos: disable volatile when kokkos >= 3.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2993
2023-02-18 18:33:11 -05:00
Vicente Adolfo Bolea Sanchez
36912c16dc kokkos: disable volatile when kokkos >= 3.7 2023-02-17 20:29:38 -05:00
Vicente Bolea
4910c577b4 Merge topic 'fix-compile_fix_for_sycl-release' into release-2.0
6bfb0cedc kokkos: disable volatile when kokkos >= 3.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mark Bolstad <mbolsta@sandia.gov>
Merge-request: !2992
2023-02-17 11:07:40 -05:00
Vicente Adolfo Bolea Sanchez
6bfb0cedc5 kokkos: disable volatile when kokkos >= 3.7
(cherry picked from commit c32e67aa6d394c2267f95bb1306fe705b12bfc13)
2023-02-16 15:49:29 -05:00
Mark Bolstad
da65e0bcef Merge topic 'compile_fix_for_sycl' into release-2.0
7d3ea2126 Changes for compiling with SYCL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2986
2023-02-15 16:49:20 -05:00
Mark Bolstad
7d3ea2126d Changes for compiling with SYCL
- Remove volatile keyword from `join'
  - Remove various `printf' in device code
2023-02-15 14:38:59 -07:00
Kenneth Moreland
5fd7a3711f Merge topic 'pass-field-fixes' into release-2.0
5a141349a Fix the passing of fields in filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2985
2023-02-14 12:43:33 -05:00
Sujin Philip
1c5adfc37a Merge topic 'fix-UnitTestAbort-warning' into release-2.0
a51cc2e15 Fix unreferenced local variable warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2984
2023-02-14 10:51:41 -05:00
Kenneth Moreland
5a141349a9 Fix the passing of fields in filters
While updating the user's guide, I noticed a couple of minor problems
with how filters map fields. First, if a filter was using
`CreateResultCoordinateSystem`, it did not respect the
`PassCoordinateSystems` flag. Second, if both an `initializer_list` and
a mode was given to `SetFieldsToPass`, the mode was captured
incorrectly. Both problems are corrected.
2023-02-13 14:06:43 -07:00
Sujin Philip
a51cc2e153 Fix unreferenced local variable warning 2023-02-13 13:29:26 -05:00
Sujin Philip
48059d0de3 Merge topic 'vtkm-abort' into release-2.0
42c6959be Add Abort execution feature

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2974
2023-02-13 12:41:06 -05:00
Vicente Bolea
a2d4501b04 Merge topic 'cuda12-fix-backport' into release-2.0
4c45598d3 Fix compile issues when using cuda 12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2972
2023-02-08 15:32:33 -05:00
Sujin Philip
42c6959be3 Add Abort execution feature
Initial changes to add support for aborting execution.
2023-02-06 14:29:58 -05:00
Sujin Philip
4c45598d35 Fix compile issues when using cuda 12
CUDA 12 adds a `cub::Swap` function that creates ambiguity with `vtkm::Swap`.
This happens when a function from the `cub` namespace is called with an object
of a class defined in the `vtkm` namespace as an argument. If that function
has an unqualified call to `Swap`, it results in ADL being used, causing the
templated functions `cub::Swap` and `vtkm::Swap` to conflict.
2023-02-06 12:26:55 -05:00
Sujin Philip
ecb6f8d6d4 Merge topic 'refactor-runtimedevicetracker' into release-2.0
c7a2a7b30 Refactor RuntimeDeviceTracker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2971
2023-01-31 10:44:50 -05:00
Sujin Philip
c7a2a7b30e Refactor RuntimeDeviceTracker
Simplifies the code by using modern C++ features
2023-01-30 09:41:19 -05:00
Vicente Bolea
ff340c268a Merge topic 'fix-testing-h' into release-2.0
a6f2a93c4 testing: remove vtkm/cont/testing relative path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2965
2023-01-20 02:13:27 -05:00
Vicente Adolfo Bolea Sanchez
a6f2a93c40 testing: remove vtkm/cont/testing relative path 2023-01-19 17:11:20 +09:00
Kenneth Moreland
50a4935825 Merge topic 'document-field-index-order' into release-2.0
c0e0032e1 Clarify field index ordering in Doxygen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2959
2023-01-13 11:14:36 -05:00
Kenneth Moreland
3568adf5b3 Merge topic 'sprintf-warning' into release-2.0
f275972e3 Resolve sprintf warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2961
2023-01-13 10:53:47 -05:00
Vicente Bolea
5b4e63f789 Merge topic 'fix-vtkm-devices-namespaces' into release-2.0
d5ce96789 CMAKE: fix vtkm devices namespaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2953
2023-01-13 09:51:00 -05:00
Kenneth Moreland
c0e0032e1d Clarify field index ordering in Doxygen
The fields in a `DataSet` are indexed from `0` to `GetNumberOfFields() - 1`.
It is natural to assume that the fields will be indexed in the order that
they are added, but they are not. Rather, the indexing is arbitrary and can
change any time a field is added to the dataset.

To make this more clear, Doxygen documentation is added to the `DataSet`
methods to inform users to not make any assumptions about the order of
field indexing.
2023-01-10 10:42:49 -07:00
Kenneth Moreland
f275972e3b Resolve sprintf warning
The latest verson of Xcode clang warns about using sprintf because of
its inherent vulnerability. Change it to snprintf.
2023-01-10 10:38:29 -07:00
Vicente Adolfo Bolea Sanchez
d5ce967890 CMAKE: fix vtkm devices namespaces 2022-12-26 13:40:12 -05:00