Commit Graph

10568 Commits

Author SHA1 Message Date
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
3a95104d5f Merge branch 'release-1.9' into master 2022-11-29 11:38:05 -05:00
Vicente Bolea
2fa7699e75 Merge branch 'release-1.8' into release-1.9 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
Dave Pugmire
90586d36df Change default waveletdim back to 256. 2022-11-28 16:37:17 -05:00
Dave Pugmire
b7605689ac Add multiblock benchmarks for filters. 2022-11-28 16:35:28 -05:00
Dave Pugmire
4ca68d9c03 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-28 07:57:40 -05:00
Christoph Gohlke
0575e036d9 Fix unresolved external symbol __popcnt on win-arm64 2022-11-27 19:51:17 -05:00
Christoph Gohlke
92a7bfc680 Fix unresolved external symbol __popcnt on win-arm64 2022-11-27 19:46:13 -05:00
Dave Pugmire
163c974423 Merge topic 'cellLocatorUniformBins_3'
72a6e27b9 Update CMakeLists.txt
7d2d7fe1c Add a new unstructured cell locator
a7fcbf4a6 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
87c1bc782 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
6390b606b Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
eb0afdcea Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
f05166a39 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
b01629048 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2928
2022-11-23 07:39:00 -05:00
Dave Pugmire
72a6e27b99 Update CMakeLists.txt 2022-11-22 10:48:29 -05:00
Dave Pugmire
7d2d7fe1cc Add a new unstructured cell locator 2022-11-22 09:51:40 -05:00
Dave Pugmire
a7fcbf4a62 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-22 09:29:53 -05:00
Kenneth Moreland
2ddaa36858 Merge topic 'tube-cell-fields'
2bcc9aa70 Fix handling of cell fields in Tube filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2911
2022-11-21 16:43:03 -05:00
Dave Pugmire
87c1bc7824 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-21 08:51:46 -05:00
Kenneth Moreland
b47eb4999c Merge topic 'remove-deprecated'
3e1339f9a Remove deprecated features from VTK-m

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2925
2022-11-18 09:43:25 -05:00
Kenneth Moreland
3e1339f9a7 Remove deprecated features from VTK-m
With the major revision 2.0 of VTK-m, many items previously marked as
deprecated were removed. If updating to a new version of VTK-m, it is
recommended to first update to VTK-m 1.9, which will include the deprecated
features but provide warnings (with the right compiler) that will point to
the replacement code. Once the deprecations have been fixed, updating to
2.0 should be smoother.
2022-11-17 07:12:31 -06:00
Kenneth Moreland
03173eced7 Merge topic 'coords-are-fields'
4ca64f0f0 Back out of DataSet::CopyPartsFromExcept method
2d30e6d45 Coordinate systems are stored as Fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2920
2022-11-17 08:10:15 -05:00
Kenneth Moreland
4ca64f0f09 Back out of DataSet::CopyPartsFromExcept method
This method is too unwieldy. Instead go back to `CopyStructure` and
other direct copy methods.
2022-11-11 07:53:20 -07:00
Kenneth Moreland
2d30e6d45a Coordinate systems are stored as Fields
Previously, `DataSet` managed `CoordinateSystem`s separately from `Field`s.
However, a `CoordinateSystem` is really just a `Field` with some special
attributes. Thus, coordiante systems are now just listed along with the
rest of the fields, and the coordinate systems are simply strings that
point back to the appropriate field. (This was actually the original
concept for `DataSet`, but the coordinate systems were separated from
fields for some now obsolete reasons.)
2022-11-11 06:17:58 -07:00
Kenneth Moreland
dbc2364e35 Merge topic 'ghost-cell-api'
a58c2cdac Change how cell ghost levels are set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2924
2022-11-11 08:00:29 -05:00
Dave Pugmire
6390b606b7 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-10 16:31:52 -05:00
Kenneth Moreland
44a976f905 Merge topic 'zfp-output-fields'
478f765db Attach compressed ZFP data as WholeDatSet field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2910
2022-11-10 12:41:55 -05:00
Kenneth Moreland
9932d07d6d Merge topic 'fix-log-scope' into release-1.9
74ed1c4cd Fix VTKM_LOG_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2923
2022-11-10 12:18:41 -05:00
Kenneth Moreland
5cb8598199 Merge branch 'release-1.9' 2022-11-10 12:18:41 -05:00
Kenneth Moreland
bd0a59a3fd Merge topic 'fix-log-scope'
74ed1c4cd Fix VTKM_LOG_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2923
2022-11-10 12:18:41 -05:00
Kenneth Moreland
478f765db2 Attach compressed ZFP data as WholeDatSet field
Previously, point fields compressed by ZFP were attached as point fields
on the output. However, using them as a point field would cause
problems. So, instead attache them as `WholeDataSet` fields.

Also fixed a problem where the 1D decompressor created an output of the
wrong size.
2022-11-10 08:18:11 -07:00
Kenneth Moreland
74ed1c4cd0 Fix VTKM_LOG_SCOPE
The `VTKM_LOG_SCOPE` macro was not working as intended. It was supposed
to print a log message immediately and then print a second log message
when leaving the scope along with the number of seconds that elapsed
between the two messages.

This was not what was happening. The second log message was being
printed immediately after the first. This is because the scope was taken
inside of the `LogScope` method. The macro has been rewritten to put the
tracking in the right scope.
2022-11-10 07:12:19 -07:00