Commit Graph

161 Commits

Author SHA1 Message Date
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
Kenneth Moreland
de2f2b59ba Deprecate old filter base classes and supporting classes 2022-09-27 06:52:44 -06:00
Mark Bolstad
613b4d44b7 Switch how InSitu benchmark iterates
Previous version had a hard-coded loop for updating the dataset. This change relenquishes control over to google benchmarks. Running it from the command-line will iterate each sub-benchmark a different number of iterations depending on how long each individual test takes. The number of iterations can be increased (but not controlled) by increasing the minimum time for each test. Alternatively, using the "repetitions" argument, you can control exactly how many times the benchamrks are run.

See the README for InSitu that throughly documents the arguments.
2022-09-12 09:24:47 -06:00
Dave Pugmire
e1fbfea305 Remove device compiler dependencies. 2022-08-01 08:00:46 -04:00
Dave Pugmire
6a200c62d9 Cuda fixes: device in headers.. 2022-07-29 13:39:38 -04:00
Dave Pugmire
f963f51907 Fix the benchmarks...... 2022-07-29 10:16:14 -04:00
Dave Pugmire
767b6c0048 CUDA fixes move device copy into .cxx file. 2022-07-28 13:28:09 -04:00
Dave Pugmire
cdcc083d4c Fix benchmarks, windows builds? 2022-07-25 10:16:05 -04:00
Kenneth Moreland
3ba13c5cc4 Re-enable hip builds
There were several tests that were disabled for hip because they either
took too long to compile or were failing. We are getting closer to
making everything work, so re-enable this part of the build.
2022-05-12 16:00:30 -04:00
Mark Bolstad
6222baa758 Fix filter benchmark
After the rebase, the filter benchmark was in a weird half state with some of the old code, and some of the updated code.
2022-03-30 09:18:00 -06:00
Mark Bolstad
19f90b96e0 Replace static datasets with dynamically allocated versions.
The static datasets were wreaking havoc on order of destructors at exit and causing kokkos to throw an exception. This change dynamically allocates a dataset, copies the read/sourced data into it, and explicitly frees the data.
2022-03-30 09:18:00 -06:00
Kenneth Moreland
08e6826017 Remove deprecated use of old unscoped enums in FieldSelection 2022-03-18 13:16:55 -06:00
Kenneth Moreland
f8f41e0ef5 Update use of field association enumerations
The enumerations in `vtkm::cont::Field::Association` were renamed in the
previous commit. The old names still exist, but are deprecated. Change
the rest of the code to use the new names.
2022-03-17 11:02:37 -06:00
Kenneth Moreland
920392b6d8 Remove brigand from Benchmarker.h
Instead, consistently use `vtkm::List`. (All the actual benchmark code
already uses `vtkm::List` instead of `brigand::list`.)
2022-03-08 07:25:08 -07:00
Li-Ta Lo
f09032aaaf migrate geometry refinement filters 2022-02-11 20:52:43 -07:00
Li-Ta Lo
455c204373 Migrate field_transform 2022-02-01 11:51:01 -07:00
Li-Ta Lo
8113d15ef7 Merge branch 'master' into field_conversion
# Conflicts:
#	benchmarking/BenchmarkFilters.cxx
#	vtkm/filter/CMakeLists.txt
#	vtkm/filter/testing/UnitTestSplitSharpEdgesFilter.cxx
2022-01-31 14:08:02 -07:00
Li-Ta Lo
cdc4c29c5f renamve vector_calculus -> vector_analysis 2022-01-31 08:58:38 -07:00
Li-Ta Lo
c60d9e64dd migrate SurfaceNormal, VectorMagnitude 2022-01-30 14:31:52 -07:00
Li-Ta Lo
59cc8cbaeb Migrate Gradient filter 2022-01-30 12:18:22 -07:00
Li-Ta Lo
f08a3185f8 Migrate FieldConversion filters 2022-01-29 13:12:01 -07:00
Li-Ta Lo
175f9010a5 Merge branch 'master' into new_contour 2022-01-26 13:43:46 -07:00
Li-Ta Lo
e8278094f9 migrate Mask
tidy up language and library usage

update benchmark
2022-01-20 15:14:37 -07:00
Li-Ta Lo
679f1b00e9 migrate GhostCellRemove and Threshold 2022-01-20 15:10:22 -07:00
Li-Ta Lo
5e991e4bf4 Merge branch 'master' into new_contour
# Conflicts:
#	benchmarking/BenchmarkFilters.cxx
#	vtkm/filter/CMakeLists.txt
#	vtkm/filter/clean_grid/CMakeLists.txt
#	vtkm/filter/clean_grid/CleanGrid.cxx
#	vtkm/filter/clean_grid/testing/CMakeLists.txt
#	vtkm/filter/clean_grid/testing/UnitTestCleanGrid.cxx
#	vtkm/filter/contour/testing/RenderTestContourFilter.cxx
#	vtkm/filter/contour/testing/UnitTestContourFilter.cxx
#	vtkm/filter/entity_extraction/CMakeLists.txt
#	vtkm/filter/entity_extraction/ExternalFaces.cxx
#	vtkm/filter/entity_extraction/ExtractPoints.cxx
#	vtkm/filter/entity_extraction/MaskPoints.cxx
#	vtkm/filter/entity_extraction/ThresholdPoints.cxx
#	vtkm/filter/testing/CMakeLists.txt
#	vtkm/filter/testing/UnitTestMultiBlockFilter.cxx
#	vtkm/worklet/testing/UnitTestOrientNormals.cxx
2022-01-14 13:31:01 -07:00
Li-Ta Lo
25224e0e4a Merge topic 'NewFilter'
36fbc019a prevent shadowing for older GCC
63b9b1275 MapperWireframer.cxx really should include Algorithm.h
fa0905e3e migrate clean_grid and extract_entity filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2665
2022-01-14 09:31:41 -05:00
Kenneth Moreland
e8a6d37190 Merge topic 'allocate-and-fill'
d7b4390d1 Specify end position when filling values in Buffer
7a4cbaf10 Suggestions during review by Gunther Weber
8e4fb7ebd Suppress unhelpful nvcc warning
bacca0693 Add Fill method for non-standard Storage
9da66ff32 Prefer ArrayHandle::Fill over Algorithm::Fill
f79cf1d5f Add BitField::Fill and BitField::AllocateAndFill
926164049 Add Fill and AllocateAndFill to ArrayHandle
0cf996f41 Add ability to fill values in a Buffer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2660
2022-01-13 17:15:37 -05:00
Li-Ta Lo
fa0905e3e5 migrate clean_grid and extract_entity filters 2022-01-13 11:14:48 -07:00
Li-Ta Lo
1c9fe90806 update benchmark 2022-01-11 08:30:42 -07:00
Li-Ta Lo
3c700259a1 migrate Contour, ClipWithField and Slice 2022-01-10 20:39:43 -07:00
Li-Ta Lo
d159efde53 add namespace 2022-01-06 16:29:30 -07:00
Li-Ta Lo
f5bbc6fc83 migrate clean_grid and extract_entity filters 2022-01-06 14:52:27 -07:00
Kenneth Moreland
4650a1da96 Deprecate old methods from DynamicCellSet
The `DynamicCellSet` (and the related `DynamicCellSetBase`) are
deprecated and replaced with `UnknownCellSet` (and `UncertainCellSet`).
Thus, `UnknownCellSet` has some methods inherited from `DynamicCellSet`
but replaced with other functionality. These methods are now marked as
deprecated and their use is removed.
2022-01-05 08:18:17 -07:00
Kenneth Moreland
0b84787f78 Deprecate DynamicCellSet and remove from code
The `DynamicCellSet` class is now marked as deprecated (as is the header
that contains it), and all non-deprecated code is moved to its
`UnknownCellSet` replacement.

Also added a deprecation warning for the VariantArrayHandle.h header
file and deleted a couple inappropriate uses of it.
2022-01-04 15:38:18 -07:00
Kenneth Moreland
9da66ff320 Prefer ArrayHandle::Fill over Algorithm::Fill 2022-01-04 08:50:57 -07:00
Manish Mathai
2ab1594ad1 Fix typo 2021-12-06 15:01:19 -08:00
Manish Mathai
5482bc5518 Fix formatting 2021-12-06 13:09:03 -08:00
Manish Mathai
a571f50dfc Cleanup unused code 2021-12-06 13:09:03 -08:00
Manish Mathai
48a820df07 Align mesh and volume rendering benchmarks timings 2021-12-06 13:09:03 -08:00
Manish Mathai
a2c3c80ce0 Make perlin generation as a vtkm::source::Source source
Making it a `vtkm::source::Source` makes it easier to use in other
benchmarks or tests.
2021-12-06 13:09:03 -08:00
Manish Mathai
2130ed5915 Refactor some static globals 2021-12-06 13:09:03 -08:00
Manish Mathai
1ceb137751 Add commandline arg for rendered image size
The image size defaults to `1024` if not specified.
2021-12-06 13:09:03 -08:00
Manish Mathai
2c5180fee9 Write benchmark rendered images to disk 2021-12-06 13:09:03 -08:00
Manish Mathai
d9487e01d4 Add copyright notice 2021-12-06 13:09:03 -08:00
Manish Mathai
035a7b39bc Add initial framework for in-situ benchmarks
This adapts existing benchmarks and creates new ones that simulate
in-situ simulations.
2021-12-06 13:09:03 -08:00
Li-Ta Lo
e680815d58 add include sstream and see if it clears the dashboard 2021-10-14 07:24:55 -06:00
Kenneth Moreland
ae3c7c096b Merge topic 'source-field-names'
03a4750a3 Change Oscillator output field name to oscillating
a3462b41c Change Wavelet output field name to RTData
ea1a55359 Name tangle source fields appropriately
a68422d45 Add GenerateIds filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2595
2021-10-05 10:59:48 -04:00
Kenneth Moreland
ea1a55359f Name tangle source fields appropriately
The `Tangle` source would create a point field generically named
`nodevar`. This name was not indicitive of the data or its source. Thus,
the output point field has been renamed `tangle`.

The `Tangle` source was also creating a cell field (named `cellvar`).
This field was really just a mirror of the cell indices (counting from 0
on up). This field has been removed from the input. If you want such a
field, you can now use the `GenerateIds` filter to add it to any data
set.
2021-10-04 13:44:27 -06:00
Jieyang Chen
a157c0e846 Add changes for supporting Kokkos/HIP
Some of the unit tests for serial and kokkos are disable for hipcc to
properly compile.
VTKM_MATH_ASSERT and VTKM_TEST_ASSERT fail to compile with HIP in
execution environment so they are disabled with building with HIP.
Kokkos::finalize is causing error so it is temporarily disabled.
2021-10-01 15:27:00 -04:00
Vicente Adolfo Bolea Sanchez
46b0268825 CI: add ubuntu2004 with tbb 2020 build 2021-09-28 19:46:11 +00:00