Commit Graph

7498 Commits

Author SHA1 Message Date
Kenneth Moreland
06f5119c29 Fix deprecation warning
This came up when updating VTK-m in VTK.
2020-05-18 18:41:47 -06:00
Kenneth Moreland
f29a4712b0 Correct field types for ComputeMoments filter
This filter is designed to work on vectors of many sizes. It was written
when selecting field types was the responsibility of the policy. It is
now the responsibility of the filter to specify possible field types.

This change is required to compile the MomentInvariants module for VTK
without policies.
2020-05-18 18:39:22 -06:00
Kenneth Moreland
a20ec03d0b Disable proxies in filter benchmark
This is going to increase the compile time for the filter benchmark, but
the overall goal is to move this code into libraries. When that happens,
the benchmark will not have to compile any of the filter code and should
ultimately go much faster.
2020-05-18 13:03:14 -06:00
Kenneth Moreland
72cd0107ee Deprecate Execute with policy
The version of `Filter::Execute` that takes a policy as an argument is now
deprecated. Filters are now able to specify their own fields and types,
which is often why you want to customize the policy for an execution. The
other reason is that you are compiling VTK-m into some other source that
uses a particular types of storage. However, there is now a mechanism in
the CMake configuration to allow you to provide a header that customizes
the "default" types used in filters. This is a much more convenient way to
compile filters for specific types.

One thing that filters were not able to do was to customize what cell sets
they allowed using. This allows filters to self-select what types of cell
sets they support (beyond simply just structured or unstructured). To
support this, the lists `SupportedCellSets`, `SupportedStructuredCellSets`,
and `SupportedUnstructuredCellSets` have been added to `Filter`. When you
apply a policy to a cell set, you now have to also provide the filter.
2020-05-18 12:38:41 -06:00
Kenneth Moreland
963c871b76 Merge topic 'conversion-warnings'
f9d9b536d Fix conversion warnings in benchmarks and examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Nick Thompson <nathompson7@protonmail.com>
Merge-request: !2092
2020-05-15 16:00:23 -04:00
Nick
e5097aa314 Merge topic 'deprecate_read_portal_get'
9aa350ee3 Fix bad whitespace.
9991179e6 Do not use auto return type; it's not supported until C++14.
f1ee3f51f Merge branch 'master' into deprecate_read_portal_get
947104148 Merge branch 'master' into deprecate_read_portal_get
d961c185a Deprecate ReadPortal().Get pattern.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <alliepiper16@gmail.com>
Merge-request: !2085
2020-05-14 20:42:20 -04:00
Kenneth Moreland
f9d9b536d4 Fix conversion warnings in benchmarks and examples
These are caused when using 32-bit Id's. Although there are some
benchmarks that test for this, some code in benchmarking and examples is
not covered by them.
2020-05-14 17:16:19 -06:00
Nick
9aa350ee3d Fix bad whitespace. 2020-05-14 18:13:03 -04:00
Nick
9991179e6d Do not use auto return type; it's not supported until C++14. 2020-05-14 18:10:32 -04:00
Nick
f1ee3f51f1 Merge branch 'master' into deprecate_read_portal_get 2020-05-14 16:26:49 -04:00
Nick
f036ebd48f Merge topic 'fix_non_virtual_destructor'
a55596b38 Reorder member functions.
6fba7347a Mark pixel destructors as virtual to fix build error.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nickolas Davis <nadavi@sandia.gov>
Merge-request: !2091
2020-05-14 16:26:12 -04:00
Nick
a55596b38c Reorder member functions. 2020-05-14 16:10:33 -04:00
Nick
6fba7347a9 Mark pixel destructors as virtual to fix build error. 2020-05-14 14:29:34 -04:00
Nick
9471041484 Merge branch 'master' into deprecate_read_portal_get 2020-05-14 14:04:44 -04:00
Robert Maynard
cd1f6393c9 Merge topic 'deprecated_warnings_nvcc_gcc_7'
53c33e24a Assume NVCC has zero support for VTK_M_DEPRECATED_ATTRIBUTE_SUPPORTED

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2088
2020-05-14 08:50:16 -04:00
Robert Maynard
22f440ae56 Merge topic 'ci_log_cdash_buildid'
b59913fad Log CDash build ids from each step of the build process

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2090
2020-05-14 08:49:36 -04:00
Nickolas Davis
3a42ebf7bd Merge topic 'image-io'
24d022b02 Implement and test ImageReader and ImageWriter capabilities in the io library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1967
2020-05-13 19:20:42 -04:00
nadavi
24d022b02b Implement and test ImageReader and ImageWriter capabilities in the io library 2020-05-13 16:10:21 -06:00
Nick
8ccf73f1ed Merge topic 'timer_fix_2'
1f8e2db7b Remove unused variable from UnitTestTimer.
194c6f6b4 Attempt to make UnitTestTimer fail less often.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2089
2020-05-13 17:07:25 -04:00
Robert Maynard
b59913fad3 Log CDash build ids from each step of the build process
This can help track down a weird CDash bugs caused by multiple
in-flight builds that get canceled and result in bad CDash
reporting
2020-05-13 15:58:34 -04:00
Nick
97a95a489b Merge topic 'rename_symbol_visibility_option'
c18150d4b Revert "Add vtkm_cont as PUBLIC dependency of vtkm_rendering in a flailing attempt to green up windows build."
42786f6c1 Add vtkm_cont as PUBLIC dependency of vtkm_rendering in a flailing attempt to green up windows build.
331b80a78 More understandable VTKm options for symbol visibility.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2086
2020-05-13 15:45:46 -04:00
Robert Maynard
53c33e24ad Assume NVCC has zero support for VTK_M_DEPRECATED_ATTRIBUTE_SUPPORTED 2020-05-13 14:52:13 -04:00
NAThompson
c18150d4b8 Revert "Add vtkm_cont as PUBLIC dependency of vtkm_rendering in a flailing attempt to green up windows build."
This reverts commit 42786f6c18b7d2f07d8e66a599d17c752579443b.
2020-05-13 14:08:50 -04:00
NAThompson
1f8e2db7b2 Remove unused variable from UnitTestTimer. 2020-05-13 13:00:40 -04:00
NAThompson
194c6f6b42 Attempt to make UnitTestTimer fail less often. 2020-05-13 12:31:25 -04:00
NAThompson
42786f6c18 Add vtkm_cont as PUBLIC dependency of vtkm_rendering in a flailing attempt to green up windows build. 2020-05-13 12:01:24 -04:00
Vicente Bolea
ba77f36347 Merge topic 'fix-optimizing-threadindices'
d5906eccd add ThreadIndicesTopologyMap optimized specializations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2027
2020-05-12 18:08:32 -04:00
Nick
9d9e332b0d Merge topic 'bov_test'
2fc636c27 Test BOV reader. Fix slow WritePortal().Set(idx, val) loop.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2081
2020-05-12 16:18:44 -04:00
NAThompson
331b80a783 More understandable VTKm options for symbol visibility. 2020-05-12 16:02:16 -04:00
NAThompson
d961c185ac Deprecate ReadPortal().Get pattern. 2020-05-12 15:43:40 -04:00
Vicente Adolfo Bolea Sanchez
d5906eccd9 add ThreadIndicesTopologyMap optimized specializations
This commit splits ThreadIndicesTopologyMap into two
different specializations which can be instanciated with the
tags: DefaultScatterAndMaskTag and CustomScatterAndMaskTag.

These specialization will allow ThreadIndicesTopologyMap
instances to avoid holding in memory InputIndex, OutputIndex and ThreadIndex
variables when Mask = MaskNone and Scatter = ScatterIdentity which in this case
are not needed since no transformation are done.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-05-12 13:45:43 -04:00
Robert Maynard
12c29b5529 Merge topic 'dashboard_warnings'
51e600e7e Remove no_discard warnings from unneeded calls of a rng
e17726ad0 Correct implicit signed conversion warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2082
2020-05-12 10:43:32 -04:00
Robert Maynard
51e600e7e2 Remove no_discard warnings from unneeded calls of a rng 2020-05-12 09:38:18 -04:00
Robert Maynard
e17726ad0b Correct implicit signed conversion warnings 2020-05-12 09:38:18 -04:00
NAThompson
2fc636c276 Test BOV reader. Fix slow WritePortal().Set(idx, val) loop. 2020-05-11 17:08:44 -04:00
Nick
990ae4b9a6 Merge topic 'readportalget2'
afe9c2a2b Update UnitTestTimer.cxx
46faf574f ReadPortal().Get(idx) is slow in a loop.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2078
2020-05-08 18:25:14 -04:00
Dave Pugmire
3bb5a6ffed Merge topic 'addUniformDataSet'
bbfdbbb2d Add uniform dataset to data dir.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2079
2020-05-08 16:59:51 -04:00
dpugmire
bbfdbbb2d3 Add uniform dataset to data dir. 2020-05-08 15:45:01 -04:00
Li-Ta Lo
f670103fe6 Merge topic 'marching_cell_wedge'
08da38bd4 use the new VTKDataSetReader
97094cfb8 Merge branch 'master' into marching_cell_wedge
8c0787b5d Merge branch 'master' into marching_cell_wedge
aef44b5c9 change sample input file in unit test
2880be2ea rename sample input for wedge contour
52f0d5b2d Fix MarchingCell for Wedge

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2070
2020-05-08 15:11:35 -04:00
Nick
afe9c2a2b0 Update UnitTestTimer.cxx 2020-05-08 15:00:02 -04:00
Nick
e813ce6844 Merge topic 'typo_fix2'
9da8c8140 Trivial typo fix.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2077
2020-05-08 14:56:04 -04:00
Nick
bc64e91784 Merge topic 'benchmark_units'
b07797f12 Update benchmarking/Benchmarker.h
acc6f3fb0 Apply suggestion to benchmarking/Benchmarker.h
f1f021b51 Default units to milliseconds.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2073
2020-05-08 14:53:54 -04:00
Li-Ta Lo
08da38bd49 use the new VTKDataSetReader 2020-05-08 11:14:47 -06:00
Li-Ta Lo
97094cfb88 Merge branch 'master' into marching_cell_wedge 2020-05-08 09:45:52 -06:00
NAThompson
46faf574fa ReadPortal().Get(idx) is slow in a loop. 2020-05-08 11:30:59 -04:00
Nick
b07797f12b Update benchmarking/Benchmarker.h 2020-05-08 11:17:06 -04:00
Nick
acc6f3fb08 Apply suggestion to benchmarking/Benchmarker.h 2020-05-08 11:17:06 -04:00
NAThompson
f1f021b51d Default units to milliseconds. 2020-05-08 11:17:06 -04:00
NAThompson
9da8c81409 Trivial typo fix. 2020-05-08 10:59:09 -04:00
Kenneth Moreland
dcf5ecdd36 Merge topic 'example-fixes'
1a461594c Do not allow preprocessor directives inside of macro calls
ddf038742 Use finite types when serializing fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2074
2020-05-08 10:34:30 -04:00