Commit Graph

10437 Commits

Author SHA1 Message Date
Vicente Adolfo Bolea Sanchez
f6a9e3631a CI: enable HIP builds on protected branches 2022-08-04 22:01:37 -04:00
Vicente Adolfo Bolea Sanchez
c5dd07d977 CI: run_master -> run_upstream_branches 2022-08-04 22:01:37 -04:00
Vicente Bolea
1d4e2100e9 Merge topic 'download-ccache-every-build'
525610ad7 windows: provide ccache and ninja on runtime
adcda947f CI: provide ninja at build time
d75b82647 CI: provide ccache at build time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2818
2022-08-04 17:45:29 -04:00
Vicente Bolea
67a06cfe6b Merge topic 'skip-find-tbb-if-loaded' into release-1.8
c30c35571 Revert "Disable loading the TBBConfig.cmake file"
dd3fc9781 cmake: skip find_package(TBB) if already loaded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2835
2022-08-04 17:33:47 -04:00
Vicente Bolea
14bb04ce29 Merge branch 'release-1.8' 2022-08-04 17:33:47 -04:00
Vicente Bolea
7c25d8f0f4 Merge topic 'skip-find-tbb-if-loaded'
c30c35571 Revert "Disable loading the TBBConfig.cmake file"
dd3fc9781 cmake: skip find_package(TBB) if already loaded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2835
2022-08-04 17:33:47 -04:00
Vicente Adolfo Bolea Sanchez
c30c35571f Revert "Disable loading the TBBConfig.cmake file"
This reverts commit a8825db59a7235c9d267ac4f909bd2eebb25cb40.
2022-08-04 13:58:01 -04:00
Vicente Adolfo Bolea Sanchez
dd3fc97811 cmake: skip find_package(TBB) if already loaded 2022-08-04 13:24:27 -04:00
Dave Pugmire
f21c327563 Bug fix... set cellId for return. 2022-08-04 12:51:15 -04:00
Dave Pugmire
70855167e5 Use last find cell to accelerate finds. 2022-08-04 11:41:17 -04:00
Kenneth Moreland
5a2da0cd89 Fix type comparison on OSX for UnknownArrayHandle base component type
This is an addition to commit e312c5435651f326f530a976d3faf3752350911e,
which corrects type comparison on OSX for typeids created in different
translation units. That missed the type correction for the
`BaseComponentType` of `UnknownArrayHandle`.
2022-08-04 06:18:57 -06:00
Vicente Adolfo Bolea Sanchez
525610ad73 windows: provide ccache and ninja on runtime 2022-08-03 17:38:58 -04:00
Vicente Adolfo Bolea Sanchez
adcda947f1 CI: provide ninja at build time 2022-08-03 17:38:58 -04:00
Vicente Adolfo Bolea Sanchez
d75b826476 CI: provide ccache at build time 2022-08-03 17:38:58 -04:00
Li-Ta Lo
34613b1643 Merge topic 'purify_GetResultType'
d1d97ec05 make NewFilterParticleAdvection::GetResultType pure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2832
2022-08-03 15:31:26 -04:00
Li-Ta Lo
b6b55f0265 Merge topic 'privatize_do_execute'
27305faff Privatize NewFilterParticleAdvection::DoExecute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2831
2022-08-03 15:30:32 -04:00
Li-Ta Lo
d1d97ec057 make NewFilterParticleAdvection::GetResultType pure 2022-08-03 11:15:35 -06:00
Gunther Weber
9551175dd4 Merge topic 'contour-tree-spatial-decomposition-refactor'
cd3fe3d47 Eliminate need for SpatialDecomposition in contour tree filters.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2825
2022-08-03 13:11:58 -04:00
Li-Ta Lo
27305faff3 Privatize NewFilterParticleAdvection::DoExecute 2022-08-03 10:05:03 -06:00
Dave Pugmire
25c6225081 Use ScatterCounting instead of ScatterPermutation. 2022-08-03 11:56:34 -04:00
Dave Pugmire
8cf0c1a7fb Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into tube_fix_degenerate_polylines 2022-08-03 11:42:46 -04:00
Sujin Philip
450108b1d6 Merge topic 'getfieldindex-not-throw-backport' into release-1.7
c0364e71c DataSet::GetFieldIndex should not throw

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2829
2022-08-03 08:40:25 -04:00
Sujin Philip
4a9a853de0 Merge branch 'release-1.7' into release-1.8 2022-08-03 08:40:25 -04:00
Sujin Philip
632a660749 Merge branch 'release-1.8' into master 2022-08-03 08:40:25 -04:00
Sujin Philip
3b9dd256d3 Merge topic 'getfieldindex-not-throw-backport' into release-1.8
8587c8282 Merge branch 'release' into getfieldindex-not-throw-backport
c0364e71c DataSet::GetFieldIndex should not throw

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2829
2022-08-03 08:40:25 -04:00
Gunther H. Weber
cd3fe3d47d Eliminate need for SpatialDecomposition in contour tree filters.
This commit address issue #713 and removes the need to pass information
about the spatial decomposition (block origins, block sizes, block index
and blocks per dimension) to the contour tree filter. Block origin
information is added to CellSetStructured (as GlobalPointSize) and the
distributed contour tree filter will get this information from
CellSetStructured instead of expecting it as parameters to the
constructor. Information about blocks per dimension and block indices
are computed from the information in CellSetStructure albeit requiring
global communication across all ranks. To avoid this communication cost,
the caller of the filter may explicitly specify this information via the
SetBlockIndices() method.
2022-08-02 20:01:41 -07:00
Li-Ta Lo
7c8022e3e3 Merge topic 'probe_map_field'
9cbf9719a lower case InvalidValue
292f7017c move Probe::DoMapField into a free function

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2823
2022-08-02 11:09:37 -04:00
Dave Pugmire
531c3a442f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into tube_fix_degenerate_polylines 2022-08-01 19:59:21 -04:00
Dave Pugmire
64f9d2fbf0 Merge topic 'remove_templates_from_streamline_filters'
898a3e092 Move StreamSurface into NewFilterField
5ffae6111 Use CastAndCallForTypes with UnknownArray of seeds.
061fe6afb Fix dashboard compile errors.
42fd70d50 Remove virtuals from DataSetIntegrator classes.
2524c16a0 Missed some cuda fixes filters...
e1fbfea30 Remove device compiler dependencies.
2a4430447 tests need to be device compiled.
9b2a257d9 Move include  out of .h file.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2777
2022-08-01 19:55:03 -04:00
Li-Ta Lo
9e2148dbf0 remove device compiler 2022-08-01 16:28:18 -06:00
Dave Pugmire
898a3e0927 Move StreamSurface into NewFilterField 2022-08-01 14:58:55 -04:00
Dave Pugmire
5ffae61115 Use CastAndCallForTypes with UnknownArray of seeds. 2022-08-01 13:43:28 -04:00
Dave Pugmire
061fe6afbb Fix dashboard compile errors. 2022-08-01 11:10:25 -04:00
Dave Pugmire
42fd70d50f Remove virtuals from DataSetIntegrator classes. 2022-08-01 10:59:32 -04:00
Dave Pugmire
2524c16a0c Missed some cuda fixes filters... 2022-08-01 09:55:38 -04:00
Dave Pugmire
e1fbfea305 Remove device compiler dependencies. 2022-08-01 08:00:46 -04:00
Dave Pugmire
2a4430447a tests need to be device compiled. 2022-07-29 22:15:13 -04:00
Kenneth Moreland
f57c0058ce Merge topic 'variant-cast-call-ref'
c41c3b7a5 Fix Variant::CastAndCall SFINAE for auto return type functors
3ec9fc858 Fix issue with Variant::CastAndCall with non-const reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2824
2022-07-29 16:10:26 -04:00
Dave Pugmire
9b2a257d9f Move include out of .h file. 2022-07-29 15:05:59 -04:00
Dave Pugmire
403d800584 Remove compiler warnings on dashboard 2022-07-29 13:55:37 -04:00
Dave Pugmire
6a200c62d9 Cuda fixes: device in headers.. 2022-07-29 13:39:38 -04:00
Dave Pugmire
0d15a015fa Remove unused virtuals..... 2022-07-29 11:14:24 -04:00
Dave Pugmire
0c2652e16d Test the variant fix from !2824 2022-07-29 10:54:19 -04:00
Dave Pugmire
f963f51907 Fix the benchmarks...... 2022-07-29 10:16:14 -04:00
Dave Pugmire
0800f19b43 Fix the particle advection examples. 2022-07-29 10:09:13 -04:00
Dave Pugmire
92ac6ae71b Move non-user-facing code into internal. 2022-07-29 10:01:39 -04:00
Sujin Philip
8587c82827 Merge branch 'release' into getfieldindex-not-throw-backport 2022-07-29 09:16:42 -04:00
Kenneth Moreland
c41c3b7a57 Fix Variant::CastAndCall SFINAE for auto return type functors
`Variant::CastAndCall` was using the C++11 style for an `auto` return
where the return type was specified with a `->` that got the `decltype`
of the return value of the functor. This was used as part of SFINAE to
pick whether you needed the const or non-const version.

However, this was causing a problem with functions that got an error
when deducing the return type for that. This was particularly
problematic for lambda functions. For example, say you have the
following simple `CastAndCall`.

```cpp
variant.CastAndCall([](auto& x){ ++x; });
```

To determine the return type of the lambda (`void`), the function has to
be compiled. But when it is compiled with a const type, which happens
when deducing the const version of `CastAndCall`, you get a compile
error. This error is not considered a substitution error (hence SFINAE),
it is an outright error. So you get a compile error just trying to
deduce the type.

The solution was to move to the C++14 version of an auto return type. In
this case, the return type is no longer important for SFINAE and is
delayed until the function is actually compiled with the specific
template parameters. This would be a problem if the const version of
`CastAndCall` was used when the non-const version was needed. But now
both versions will pass SFINAE and thus the non-const version will be
chosen as long as the `Variant` object itself is non-const. If the
`Variant` object itself is const, then that is in fact a legitimate
error, so a compile error is OK.

One thing I find wierd is that `CastAndCall` still has a `noexcept`
expression that will likewise cause a compile error in this case.
However, it is still working. I _think_ the difference is that
`noexcept` is not used to determine template substitution/overloaded, so
is therefore ignored until the function is actually compiled.
2022-07-29 06:50:34 -06:00
Dave Pugmire
5528a79aa2 cuda fixes. DEVICE_SOURCES is needed! 2022-07-29 08:37:03 -04:00
Tushar Athawale
1153f68d22 Merge topic 'ghostCellManagement'
aa01c51cb Addition of GhostCellField API to the Dataset Class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2776
2022-07-28 22:39:02 -04:00