Commit Graph

10756 Commits

Author SHA1 Message Date
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 Bolea
21d0d2f0e1 Merge branch 'release-2.0' 2022-12-16 18:39:56 -05:00
Vicente Bolea
7f7a25844f Merge topic 'fix-diy-utils'
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
463a7bfe5d Merge topic 'backport-to-master'
a85d6d244 release: 2.0.0-rc1 release notes
01dafc7c6 release: update version and License

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2950
2022-12-15 19:44:55 -05:00
Vicente Adolfo Bolea Sanchez
a85d6d2447 release: 2.0.0-rc1 release notes 2022-12-15 19:40:46 -05:00
Vicente Adolfo Bolea Sanchez
01dafc7c64 release: update version and License 2022-12-15 19:40:38 -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 Bolea
6e321565c0 Merge branch 'release-1.9' into master 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
Kenneth Moreland
22e2e5ff32 Merge topic 'source-point-dims'
aa7b83bb2 Handle random seed generation better for PerlinNoise
84bc72312 Make source parameters more clear

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2933
2022-12-04 09:27:21 -05:00
Kenneth Moreland
f83c913eb2 Merge topic 'rename-filter-base'
405643ddb Rename NewFilter base classes to Filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2937
2022-12-04 09:25:30 -05:00
Kenneth Moreland
405643ddbb Rename NewFilter base classes to Filter
During the VTK-m 1.8 and 1.9 development, the filter infrastructure was
overhauled. Part of this created a completely new set of base classes. To
avoid confusion with the original filter base classes and ease transition,
the new filter base classes were named `NewFilter*`. Eventually after all
filters were transitioned, the old filter base classes were deprecated.

With the release of VTK-m 2.0, the old filter base classes are removed. The
"new" filter base classes are no longer new. Thus, they have been renamed
simply `Filter` (and `FilterField`).
2022-12-01 13:07:56 -07:00
Kenneth Moreland
aa7b83bb2c Handle random seed generation better for PerlinNoise
Before, the result of `time` was used for the RNG. This change uses
`std::random_device` for a better seed when possible.
2022-12-01 08:53:54 -07:00
Kenneth Moreland
84bc723121 Make source parameters more clear
Originally, most of the sources used constructor parameters to set the
various options of the source. Although convenient, it was difficult to
keep track of what each parameter meant. To make the code more clear,
source parameters are now set with accessor functions (e.g.
`SetPointDimensions`). Although this makes code more verbose, it helps
prevent mistakes and makes the changes more resilient to future changes.
2022-12-01 08:13:58 -07:00
Kenneth Moreland
3716f920e6 Merge topic 'delete-create-result-vec-coords'
19f752960 Remove Filter::CreateResult that takes a vector of CoordinateSystems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2934
2022-12-01 08:55:57 -05:00
Kenneth Moreland
19f752960f Remove Filter::CreateResult that takes a vector of CoordinateSystems
This method is principally obsolete and should have been removed when
coordinate systems were converted into fields. I noticed it was still
there when updating the documentation.

This removal required some changes to the CleanGrid filter, but this
actually simplified the code.
2022-11-30 14:02:49 -07:00
Dave Pugmire
bc0d388c00 Merge topic 'multiblock_benchmark_filters'
a4435a6b2 Change wavelet dim to 256 and numPart to 1.
fecc703a0 Add header for vtkm::cont::PartitionedDataSet
90586d36d Change default waveletdim back to 256.
b7605689a Add multiblock benchmarks for filters.
4ca68d9c0 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2930
2022-11-29 17:00:46 -05:00
Dave Pugmire
a4435a6b20 Change wavelet dim to 256 and numPart to 1. 2022-11-29 13:42:53 -05:00
Vicente Bolea
3f08a94bbe Merge topic 'update-release-roadmap'
9e7523c90 Update ReleaseRoadmap; add instructions NewRelease

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2931
2022-11-29 12:42:08 -05:00
Vicente Bolea
2fa7699e75 Merge branch 'release-1.8' into release-1.9 2022-11-29 11:38:05 -05:00
Vicente Bolea
3a95104d5f Merge branch 'release-1.9' into master 2022-11-29 11:38:05 -05:00
Vicente Bolea
fcfeef0f42 Merge topic 'backport-cgohlke-master-patch-04055' into release-1.9
70728978d Fix unresolved external symbol __popcnt on win-arm64
df5b5bf32 Fix unresolved external symbol __popcnt on win-arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2932
2022-11-29 11:38:05 -05:00
Vicente Bolea
6c503b6468 Merge topic 'backport-cgohlke-master-patch-04055' into release-1.8
70728978d Fix unresolved external symbol __popcnt on win-arm64
df5b5bf32 Fix unresolved external symbol __popcnt on win-arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2932
2022-11-29 11:38:04 -05:00
Dave Pugmire
fecc703a01 Add header for vtkm::cont::PartitionedDataSet 2022-11-28 20:52:04 -05:00
Christoph Gohlke
70728978de Fix unresolved external symbol __popcnt on win-arm64
(cherry picked from commit 0575e036d9fc0ea2dabb1cba07d2bcd9a5b5f750)
2022-11-28 18:41:41 -05:00
Christoph Gohlke
df5b5bf321 Fix unresolved external symbol __popcnt on win-arm64
(cherry picked from commit 92a7bfc680a6d2cd62c6a40c628e72d77c5af26e)
2022-11-28 18:41:30 -05:00
Vicente Adolfo Bolea Sanchez
9e7523c903 Update ReleaseRoadmap; add instructions NewRelease 2022-11-28 18:29:20 -05:00
Kenneth Moreland
de79aecc83 Merge topic 'cgohlke-master-patch-04055'
0575e036d Fix unresolved external symbol __popcnt on win-arm64
92a7bfc68 Fix unresolved external symbol __popcnt on win-arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2929
2022-11-28 17:02:52 -05:00