Commit Graph

10814 Commits

Author SHA1 Message Date
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
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
Kenneth Moreland
4b19139f3d Add tests to UnitTestArrayRangeCompute
Make the test a bit more complete by testing more array types.
2023-03-08 12:36:53 -07:00
Kenneth Moreland
69a9d4a87e Merge topic 'convert-runtime-vec-array'
331a277fe Automatically convert between ArrayHandleBasic and ArrayHandleRuntimeVec

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2994
2023-03-08 14:35:30 -05:00
Thomas H. Gibson
b1bb050bc8 Merge topic 'thrust-sorting'
267ee49cb docker: update kokkos hip image
67bf9a966 docker: update kokkos hip image
50d4ab5cc CMake: VTKm_ENABLE_KOKKOS_THRUST to depend on Kokkos with CUDA or HIP enabled
0604f314a Fix for building SERIAL unit tests with KOKKOS_HIP/CUDA enabled
802bf80b0 CI: Add rocthrust installation step
fda475d5b Rework Thrust CMake options
e6f63a807 Adding CMake tweaks to turn off thrust algorithms if thrust is not detected.
5a72275ed Rewrite sorting specialization using std::enable_if_t
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2926
2023-03-06 09:48:43 -05:00
Vicente Bolea
5ddd147779 Merge topic 'ascent-build-tune'
8033338ce ascent,ci,olcf: tune ascent build parallel parameters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3006
2023-03-03 20:06:25 -05:00
Vicente Adolfo Bolea Sanchez
8033338ce1 ascent,ci,olcf: tune ascent build parallel parameters 2023-03-03 19:34:47 -05:00
Vicente Bolea
b30b44dd64 Merge topic 'fix-ascent-build'
3579deb9d ascent,ci,olcf: move build to scratch dir
11b56f66d ascent,ci,olcf: increase build parallel level
85bbcb932 ascent,ci,olcf: split build and test stage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3003
2023-03-03 15:09:12 -05:00
Kenneth Moreland
2573da59f3 Merge topic 'serialize-dataset'
2af555f6c Simplify serialization of DataSet objects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !3004
2023-03-03 14:47:02 -05:00
Vicente Adolfo Bolea Sanchez
3579deb9de ascent,ci,olcf: move build to scratch dir 2023-03-03 11:40:43 -05:00
Vicente Adolfo Bolea Sanchez
11b56f66d0 ascent,ci,olcf: increase build parallel level 2023-03-03 11:40:43 -05:00
Vicente Adolfo Bolea Sanchez
85bbcb9326 ascent,ci,olcf: split build and test stage 2023-03-03 11:40:43 -05:00
Kenneth Moreland
2af555f6c9 Simplify serialization of DataSet objects
`vtkm::cont::DataSet` is a dynamic object that can hold cell sets and
fields of many different types, none of which are known until runtime. This
causes a problem with serialization, which has to know what type to compile
the serialization for, particularly when unserializing the type at the
receiving end. The original implementation "solved" the problem by creating
a secondary wrapper object that was templated on types of field arrays and
cell sets that might be serialized. This is not a great solution as it
punts the problem to algorithm developers.

This problem has been completely solved for fields, as it is possible to
serialize most types of arrays without knowing their type now. You still
need to iterate over every possible `CellSet` type, but there are not that
many `CellSet`s that are practically encountered. Thus, there is now a
direct implementation of `Serialization` for `DataSet` that covers all the
data types you are likely to encounter.

The old `SerializableDataSet` has been deprecated. In the unlikely event an
algorithm needs to transfer a non-standard type of `CellSet` (such as a
permuted cell set), it can use the replacement `DataSetWithCellSetTypes`,
which just specifies the cell set types.
2023-03-03 09:17:44 -07:00
Vicente Bolea
124f674dc2 Merge topic 'spock-build-kokkos'
eaeced7b7 spock,ci,olcf: disable not working spock02
0b4946b9e spock: build kokkos in every vtk-m build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3002
2023-03-02 16:06:24 -05:00
Vicente Adolfo Bolea Sanchez
eaeced7b72 spock,ci,olcf: disable not working spock02 2023-03-02 14:13:36 -05:00
Vicente Adolfo Bolea Sanchez
0b4946b9ee spock: build kokkos in every vtk-m build 2023-03-02 14:13:36 -05:00
Vicente Bolea
49da7b982d Merge topic 'reduce-ascent-concurrency-level'
76a9e8d1e ascent,ci: reduce build concurrency level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2997
2023-02-24 13:12:07 -05:00
Vicente Bolea
5bf0bd57ae Merge topic 'remove-cxx11-references'
ecd4a68ff cxx,c++: Remove c++14 references

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2999
2023-02-24 11:40:27 -05:00
Vicente Bolea
403abff608 Merge topic 'add-badges-readme'
25d03abba readme:add spack and gitlab ver badge

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3000
2023-02-24 11:40:00 -05:00
Vicente Bolea
d4f919b401 Merge topic 'add-freeze-branch-step'
3650b9efd release,docs: add freeze release branch step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2998
2023-02-24 11:39:33 -05:00