Commit Graph

10832 Commits

Author SHA1 Message Date
Dave Pugmire
39100031da Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2023-03-22 14:56:54 -04:00
Kenneth Moreland
c9b4e9b7f2 Merge topic 'benchmark-num-components'
ff68e44d6 Make array component checking safer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mark Bolstad <mbolsta@sandia.gov>
Merge-request: !3023
2023-03-22 11:34:04 -04:00
Kenneth Moreland
ff68e44d63 Make array component checking safer
One of the checks for `BenchmarkFilters` is to test the number of
components in field arrays. It did this by using a `CastAndCall` to get
the base `ArrayHandle` and check the type. This is unnecessarily
complicated and fragile in the case where the base array type cannot be
resolved by `CastAndCall`. Instead, just query the `UnknownArrayHandle`
for the number of components.
2023-03-21 14:11:15 -06:00
Kenneth Moreland
af6218936f Merge topic 'vectraits-for-all'
ac889b500 Implement VecTraits class for all types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !3018
2023-03-21 12:55:00 -04:00
Dave Pugmire
5e6d78c5e6 Merge topic 'add_visit_file_reader'
3efa8bb74 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_visit_file_reader
6a516de22 Add entry for change log.
97b460110 Fix issues.......
6db8c316a Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_visit_file_reader
39cb7a653 kick the build machines.
c98955011 Better error checking and logging.
2a6220726 Error checking for number of blocks.
f60f43700 Add VisIt file reader.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3013
2023-03-20 16:07:58 -04:00
Vicente Bolea
0bbebeacd5 Merge topic 'update-tags-hip-build'
87aff6cde ci,hip,tags: remove build tag for hip build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3019
2023-03-20 11:55:27 -04:00
Dave Pugmire
3efa8bb744 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_visit_file_reader 2023-03-20 10:58:55 -04:00
Dave Pugmire
6a516de22e Add entry for change log. 2023-03-20 10:58:28 -04:00
Kenneth Moreland
d7e70e5264 Merge branch 'release-2.0' 2023-03-20 09:42:41 -04:00
Kenneth Moreland
94d8698d16 Merge topic 'data-license'
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
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
Vicente Adolfo Bolea Sanchez
87aff6cdef ci,hip,tags: remove build tag for hip build 2023-03-16 16:05:28 -04:00
Kenneth Moreland
ac889b5004 Implement VecTraits class for all types
The `VecTraits` class allows templated functions, methods, and classes to
treat type arguments uniformly as `Vec` types or to otherwise differentiate
between scalar and vector types. This only works for types that `VecTraits`
is defined for.

The `VecTraits` templated class now has a default implementation that will
be used for any type that does not have a `VecTraits` specialization. This
removes many surprise compiler errors when using a template that, unknown
to you, has `VecTraits` in its implementation.

One potential issue is that if `VecTraits` gets defined for a new type, the
behavior of `VecTraits` could change for that type in backward-incompatible
ways. If `VecTraits` is used in a purely generic way, this should not be an
issue. However, if assumptions were made about the components and length,
this could cause problems.

Fixes #589
2023-03-16 12:59:38 -06:00
Dave Pugmire
97b460110f Fix issues....... 2023-03-15 12:45:45 -04:00
Dave Pugmire
6db8c316ad Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_visit_file_reader 2023-03-15 09:23:03 -04:00
Dave Pugmire
39cb7a653b kick the build machines. 2023-03-14 21:06:02 -04:00
Dave Pugmire
c989550111 Better error checking and logging. 2023-03-14 15:15:06 -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
ea5cb10eb1 Merge branch 'release-2.0' 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
7e1f10ea6f Merge branch 'release-1.8' into release-1.9 2023-03-14 12:34:20 -04:00
Vicente Bolea
d71c51f171 Merge topic 'update-runner-tag-centos8'
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
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
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
d3ce132b5f Merge branch 'release-2.0' 2023-03-14 11:42: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
7ddf3d85c5 Merge topic 'remove-unlicensed-data'
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
Vicente Bolea
f79538bf85 Merge topic 'migrate-spock-build-to-crusher'
a810b08a0 ci,spock,crusher: migrate build to crusher

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3014
2023-03-13 20:45:17 -04:00
Vicente Adolfo Bolea Sanchez
a810b08a0c ci,spock,crusher: migrate build to crusher 2023-03-13 19:34:23 -04:00
Dave Pugmire
2a6220726d Error checking for number of blocks. 2023-03-13 16:26:58 -04:00
Dave Pugmire
f60f437000 Add VisIt file reader. 2023-03-13 16:13:21 -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
Louis Gombert
93c7510e2e Merge topic 'shrik-filter-fixes'
ea13c2761 Minor Shrink filter fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !3011
2023-03-10 09:47:34 -05:00
Kenneth Moreland
0c9371aa88 Merge branch 'release-1.9' into release-2.0 2023-03-09 17:52:44 -05:00
Kenneth Moreland
d24a5b5c89 Merge branch 'release-2.0' 2023-03-09 17:52:44 -05:00
Kenneth Moreland
2ba051e604 Merge topic 'fix_insitu_arg_processing'
b4a6c2b54 Restore argument processing to InSitu benchmark

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3010
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
Louis Gombert
ea13c27613 Minor Shrink filter fixes 2023-03-09 16:46:58 +01: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
Louis Gombert
b970a6f4c7 Merge topic 'shrink-filter'
67d6780fb Add Shrink filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3007
2023-03-09 09:14:01 -05:00
Kenneth Moreland
6d99c77052 Merge topic 'array-range-fast-paths'
58fc99c2f Fix fast paths for ArrayRangeCompute
4b19139f3 Add tests to UnitTestArrayRangeCompute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3008
2023-03-09 08:28:20 -05:00
Louis Gombert
67d6780fba Add Shrink filter
This filter shrinks the cells of a DataSet towards their centroid, computed as the average position of the cell points
2023-03-09 09:48:46 +01:00
Kenneth Moreland
58fc99c2f8 Fix fast paths for ArrayRangeCompute
The precompiled `ArrayRangeCompute` function was not following proper fast
paths for special arrays. For example, when computing the range of an
`ArrayHandleUniformPointCoordinates`, the ranges should be taken from the
origin and spacing of the special array. However, the precompiled version
was calling the generic range computation, which was doing an unnecessary
reduction over the entire array. These fast paths have been fixed.

These mistakes in the code were caused by quirks in how templated method
overloading works. To prevent this mistake from happening again in the
precompiled `ArrayRangeCompute` function and elsewhere, all templated forms
of `ArrayRangeCompute` have been deprecated. Most will call
`ArrayRangeCompute` with no issues. For those that need the templated
version, `ArrayRangeComputeTemplate` replaces the old templated
`ArrayRangeCompute`. There is exactly one templated declaration of
`ArrayRangeComputeTemplate` that uses a class, `ArrayRangeComputeImpl`,
with partial specialization to ensure the correct form is used.
2023-03-08 12:36:53 -07:00