Commit Graph

10611 Commits

Author SHA1 Message Date
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
Ben Boeckel
a15ea70ec7 Merge branch 'release-1.9' into release-2.0 2022-12-21 12:28:47 -05:00
Ben Boeckel
e8fd3ee5b8 Merge topic 'ci-arch-tags' into release-2.0
c8cc834b9 gitlab-ci: add missing platform and feature tags to ascent job
23c0eadb8 Merge branch 'ci-arch-tags-1.9' into ci-arch-tags
054661f68 gitlab-ci: use arch-specific tags for OS selection
4dd268c58 Merge branch 'ci-arch-tags-1.8' into ci-arch-tags-1.9
4c010f6c8 Merge branch 'ci-arch-tags-1.7' into ci-arch-tags-1.8
c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
2022-12-21 12:28:47 -05:00
Ben Boeckel
9e9f903f6b Merge branch 'release-1.8' into release-1.9 2022-12-21 12:28:47 -05:00
Ben Boeckel
831ae618e8 Merge topic 'ci-arch-tags' into release-1.9
054661f68 gitlab-ci: use arch-specific tags for OS selection
4dd268c58 Merge branch 'ci-arch-tags-1.8' into ci-arch-tags-1.9
4c010f6c8 Merge branch 'ci-arch-tags-1.7' into ci-arch-tags-1.8
c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
2022-12-21 12:28:47 -05:00
Ben Boeckel
6ce131dfd4 Merge branch 'release-1.7' into release-1.8 2022-12-21 12:28:47 -05:00
Ben Boeckel
5cd4c23c82 Merge topic 'ci-arch-tags' into release-1.8
4c010f6c8 Merge branch 'ci-arch-tags-1.7' into ci-arch-tags-1.8
c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
2022-12-21 12:28:47 -05:00
Ben Boeckel
9d78e44508 Merge topic 'ci-arch-tags' into release-1.7
c3f4c924d gitlab-ci: add missing feature tag for doxygen submission
7766bbc3c gitlab-ci: use arch-specific tags for OS selection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2952
2022-12-21 12:28:46 -05:00
Ben Boeckel
c8cc834b90 gitlab-ci: add missing platform and feature tags to ascent job 2022-12-21 09:35:53 -05:00
Ben Boeckel
23c0eadb8e Merge branch 'ci-arch-tags-1.9' into ci-arch-tags
* ci-arch-tags-1.9:
  gitlab-ci: use arch-specific tags for OS selection
  gitlab-ci: add missing feature tag for doxygen submission
  gitlab-ci: use arch-specific tags for OS selection
2022-12-21 09:35:46 -05:00
Ben Boeckel
054661f682 gitlab-ci: use arch-specific tags for OS selection 2022-12-21 09:35:02 -05:00
Ben Boeckel
4dd268c588 Merge branch 'ci-arch-tags-1.8' into ci-arch-tags-1.9
* ci-arch-tags-1.8:
  gitlab-ci: add missing feature tag for doxygen submission
  gitlab-ci: use arch-specific tags for OS selection
2022-12-21 09:34:52 -05:00
Ben Boeckel
4c010f6c88 Merge branch 'ci-arch-tags-1.7' into ci-arch-tags-1.8
* ci-arch-tags-1.7:
  gitlab-ci: add missing feature tag for doxygen submission
  gitlab-ci: use arch-specific tags for OS selection
2022-12-21 09:34:37 -05:00
Ben Boeckel
c3f4c924d4 gitlab-ci: add missing feature tag for doxygen submission 2022-12-21 09:34:18 -05:00
Ben Boeckel
7766bbc3cd gitlab-ci: use arch-specific tags for OS selection
Also add some missing OS tags for HIP jobs.
2022-12-21 09:34:18 -05:00
Vicente Bolea
d2ee109c46 Merge topic 'fix-diy-utils' into release-2.0
f3398ae17 diy: correct manglign vtkm_diy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2951
2022-12-16 18:39:56 -05:00
Vicente Adolfo Bolea Sanchez
f3398ae17b diy: correct manglign vtkm_diy 2022-12-16 17:10:36 -05:00
Vicente Bolea
d5a0b2ffdd Merge topic 'update-to-2.0.0' into release-1.9
a2ccf9ca6 2.0.0-rc1 is our 14th official release of VTK-m.
918de3016 release: 2.0.0-rc1 release notes
1e29d20ed release: update version and License
3eae3fbaa Merge remote-tracking branch 'origin/master' into update-to-2.0.0
b3f469724 Merge topic 'fix-benchs'
d623fdd94 PerfTest: Fixes report.json name
c30c97d55 Merge topic 'update-readme'
dc5a50c1e README: Updated VTK-m example for vtkm 2.0.0
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2949
2022-12-15 19:19:18 -05:00
Vicente Adolfo Bolea Sanchez
a2ccf9ca6d 2.0.0-rc1 is our 14th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/2.0/release-notes.md
v2.0.0-rc1
2022-12-15 18:31:03 -05:00
Vicente Adolfo Bolea Sanchez
918de30163 release: 2.0.0-rc1 release notes 2022-12-15 18:12:41 -05:00
Vicente Adolfo Bolea Sanchez
1e29d20ed2 release: update version and License 2022-12-15 17:28:06 -05:00
Vicente Adolfo Bolea Sanchez
3eae3fbaab Merge remote-tracking branch 'origin/master' into update-to-2.0.0
* origin/master: (76 commits)
  PerfTest: Fixes report.json name
  README: Updated VTK-m example for vtkm 2.0.0
  Hide Particle class members
  cmake: namespace vtkm export targets
  CI: CUDA build jobs dont need cuda-rt
  Change auto seed behavior in PerlinNoise source
  Split up the filters benchmark tests
  Add performance configuration options
  Rename NewFilter base classes to Filter
  Handle random seed generation better for PerlinNoise
  Make source parameters more clear
  Remove Filter::CreateResult that takes a vector of CoordinateSystems
  Change wavelet dim to 256 and numPart to 1.
  Add header for vtkm::cont::PartitionedDataSet
  Update ReleaseRoadmap; add instructions NewRelease
  Change default waveletdim back to 256.
  Add multiblock benchmarks for filters.
  Fix unresolved external symbol __popcnt on win-arm64
  Fix unresolved external symbol __popcnt on win-arm64
  Update CMakeLists.txt
  ...
2022-12-15 17:26:48 -05:00
Vicente Bolea
b3f4697249 Merge topic 'fix-benchs'
d623fdd94 PerfTest: Fixes report.json name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2945
2022-12-15 16:54:55 -05:00
Vicente Adolfo Bolea Sanchez
d623fdd94c PerfTest: Fixes report.json name 2022-12-14 17:01:20 -05:00
Tushar Athawale
c30c97d551 Merge topic 'update-readme'
dc5a50c1e README: Updated VTK-m example for vtkm 2.0.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2948
2022-12-13 15:40:34 -05:00
Tushar Athawale
dc5a50c1e0 README: Updated VTK-m example for vtkm 2.0.0 2022-12-13 15:39:48 -05:00
Kenneth Moreland
1930bea424 Merge topic 'hide-particle-members'
99829cf61 Hide Particle class members

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abhishek Yenpure <abhi.yenpure@kitware.com>
Merge-request: !2946
2022-12-13 15:30:43 -05:00
Tushar Athawale
83e5557be7 Merge branch 'release-1.9' 2022-12-13 15:27:20 -05:00
Tushar Athawale
321e85c029 Merge topic 'update-readme'
96112343d README: Updated VTK-m installation instruction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2947
2022-12-13 15:27:20 -05:00
Tushar Athawale
503648b38a Merge topic 'update-readme' into release-1.9
96112343d README: Updated VTK-m installation instruction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2947
2022-12-13 15:27:19 -05:00
Tushar Athawale
96112343d0 README: Updated VTK-m installation instruction 2022-12-13 15:19:35 -05:00
Kenneth Moreland
99829cf617 Hide Particle class members
The member variables of the `vtkm::Particle` classes are now hidden. This
means that external code will not be directly able to access member
variables like `Pos`, `Time`, and `ID`. Instead, these need to be retrieved
and changed through accessor methods.

This follows standard C++ principles. It also helps us future-proof the
classes. It means that we can provide subclasses or alternate forms of
`Particle` that operate differently. It also makes it possible to change
interfaces while maintaining a deprecated interface.
2022-12-13 13:19:21 -05:00
Vicente Bolea
63c5bf9116 Merge topic 'ns-export-targets'
049d0cca8 cmake: namespace vtkm export targets
d4fc84f12 CI: CUDA build jobs dont need cuda-rt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2939
2022-12-09 23:08:47 -05:00
Vicente Adolfo Bolea Sanchez
049d0cca8c cmake: namespace vtkm export targets 2022-12-09 18:46:56 -05:00
Vicente Adolfo Bolea Sanchez
d4fc84f12e CI: CUDA build jobs dont need cuda-rt 2022-12-08 19:14:27 -05:00
Kenneth Moreland
26eafeded3 Merge topic 'perlin-auto-seed'
3e7cde8ec Change auto seed behavior in PerlinNoise source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mark Bolstad <mbolsta@sandia.gov>
Merge-request: !2942
2022-12-07 11:44:51 -05:00
Kenneth Moreland
3e7cde8ecb Change auto seed behavior in PerlinNoise source
The PerlinNoise source has a mode where if a seed is not set, it will
choose a new seed every time it is executed. It did this by using the
value 0 as an indicator to do this (and initializing the Seed to 0).
However, there was a problem with one of the benchmarks that was
specifically setting the seed to 0 and getting unexpected results.

Fix the problem by adding a separate, hidden member of the PerlinNoise
class that keeps track of whether to generate new seeds or not.
2022-12-06 12:21:04 -07:00
Kenneth Moreland
d1ec992078 Merge topic 'benchmark-options'
7742df755 Split up the filters benchmark tests
1f34e0eaa Add performance configuration options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2941
2022-12-05 23:49:39 -05:00
Kenneth Moreland
7742df7556 Split up the filters benchmark tests
This should help catch regressions that only affect a single filter. It
also allows us to set up a partitioned test that has many small blocks.
It also fixes an issue we were seeing on the dashboard where the
contour benchmark was apparently running out of resources.
2022-12-05 13:20:22 -07:00
Kenneth Moreland
1f34e0eaa6 Add performance configuration options
Added a name option that allows the same benchmark executable to be used
in multiple benchmark tests. This allows the benchmarks to be separated.
Also added an option to pass customized arguments to the benchmark
executable to overwrite the default values.
2022-12-05 13:20:18 -07:00