Commit Graph

1208 Commits

Author SHA1 Message Date
Kenneth Moreland
821e5f7473 Merge topic 'no-test-compile'
97f5ed640 Remove testing include from ZFP worklet headers
8d5e636ac Enable ci that compiles without testing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2738
2022-03-21 08:35:47 -04:00
Kenneth Moreland
13a3560f40 Merge topic 'rename-field-associations'
f8f41e0ef Update use of field association enumerations
56670dbba Rename field associations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2733
2022-03-18 13:39:13 -04:00
Kenneth Moreland
97f5ed640f Remove testing include from ZFP worklet headers
Several of the ZFP worklet headers included `vtkm/cont/testing/
MakeTestDataSet.h`. This is a problem because if testing is turned off,
then `MakeTestDataSet.h` attempts to include a file that is not
generated, so the compile just fails if testing is off (and the testing
library is not on). This include must be a remanent of some old testing
code during development. It can be safely removed.
2022-03-18 11:04:37 -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
df24ea138d Fix Histogram filter range for DataSet
In the transition of the `Histogram` filter to the new filter types, a
bug was introduced. The `Histogram` filter has an option to set the
range for which to compute the histogram. (The range of the data will be
used instead if none is specified.) This range was properly used when
computing the histogram on a `PartitionedDataSet`. However, when running
on a single `DataSet`, the new filter structure skipped over the
partition code that checked to see if the range was specified. (It also
skipped over the code that properly computed the range in MPI.)

This change properly checks to see if `Execute` was called with a single
`DataSet` and updates the `ComputedRange` appropriately.
2022-03-16 15:47:59 -06:00
Kenneth Moreland
55143ef894 Merge topic 'better-deprecated-headers'
5cb9792bd SurfaceNormal -> SurfaceNormals
b2947a1d7 Improve deprecation support of CellMeasures
5b7893a3f Support deprecated MeshQuality features
d22a509b5 Split CoordinateSystemTransform.h
c238cfea5 Improve deprecation support for moved or renamed headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2718
2022-03-04 14:40:29 -05:00
Li-Ta Lo
5cb9792bdc SurfaceNormal -> SurfaceNormals 2022-03-03 15:28:20 -07:00
Vicente Adolfo Bolea Sanchez
3956115969 unittests: relaxed test thresholds for Ascent 2022-02-22 22:00:32 -05:00
Li-Ta Lo
753b32b9a2 Merge topic 'contour_surface_normals'
82a5bde74 use SurfaceNomrals filter rather than worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2719
2022-02-17 10:07:09 -05:00
Li-Ta Lo
82a5bde744 use SurfaceNomrals filter rather than worklet 2022-02-16 14:59:46 -07:00
Kenneth Moreland
b2947a1d78 Improve deprecation support of CellMeasures
Moved deprecated class to new headers (so that indirect includes still
work).

Changed vtkm::filter::mesh_info::IntegrationType to a scoped enum (which
we favor in VTK-m).

Correct the implementation of the deprecated integration types (which
would not have actually compiled anyway).
2022-02-16 11:36:40 -07:00
Kenneth Moreland
5b7893a3f7 Support deprecated MeshQuality features
Reenable the `vtkm::filter::CellMetric` class and
`vtkm::filter::MetricNames` static variable for backward compatibility.
(Both are of course marked deprecated.)

Also, adjust names in the new `vtkm::filter::mesh_info::CellMetric` to
conform with the rest of VTK-m style for scoped enums.
2022-02-16 11:36:13 -07:00
Kenneth Moreland
d22a509b52 Split CoordinateSystemTransform.h
This header file contained two filters: `CylindricalCoordinateTransform`
and `SphericalCoordinateTransform`. By convention, each header (and
source) file should contain one filter. Now that filters are split into
separate libraries, there is little reason to combine things into header
files.
2022-02-16 07:24:04 -07:00
Kenneth Moreland
c238cfea50 Improve deprecation support for moved or renamed headers
VTK-m has a deprecation method that supports API changes in minor
releases. When an API change is made, the old API is marked with the
VTKM_DEPRECATED macro. If code attempts to use the old API, it still
works, but the compiler issues a warning that the thing is deprecated
and where to find the new API.

We have recently run into an issue when the API changes have a header
file renamed or moved. We still keep the old header file with the old
API, so code including that file will still work. However, sometimes
code expected the contents of that header file without directly
including that header file. In these cases, the code could get an error
about missing classes.

As an example, consider the change from `DynamicCellSet` to
`UnknownCellSet`/`UncertainCellSet`. The deprecated `DynamicCellSet` is
still around. But there is a lot of code that did not directly include
DynamicCellSet.h. This header file was necessarily included by
DataSet.h. Now, when this code uses `vtkm::cont::DynamicCellSet`, you
get a confusing error that the class does not exist. Backward
compatibility broken.

In response to this, we should be more careful about where we put the
deprecated API. Instead of containing the deprecated API, moved headers
should be empty except for a warning and an inclusion of the new header
file. The deprecated API should be moved to the new header file. For
example, in the case of `DynamicCellSet`, the implementation for the
deprecated `DynamicCellSet` is moved to UnknownCellSet.h, which is
included by anything that was including DynamicCellSet.h before.
2022-02-16 07:08:05 -07:00
Li-Ta Lo
a462552c2c use CreateResult that accepts a CoordSystem 2022-02-15 08:08:48 -07:00
Li-Ta Lo
f09032aaaf migrate geometry refinement filters 2022-02-11 20:52:43 -07:00
Li-Ta Lo
c635e6d6c5 Merge topic 'no_backends'
05d34aa8a delete unneeded list append
d41e1e40f remove ALL_BACKENDS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2711
2022-02-10 11:21:16 -05:00
Li-Ta Lo
04a042789f Merge topic 'create_result'
ae4ad5239 remove #include<CreateResult.h>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2708
2022-02-10 10:01:07 -05:00
Li-Ta Lo
d41e1e40f0 remove ALL_BACKENDS 2022-02-09 16:15:08 -07:00
Li-Ta Lo
3392decbc3 Merge topic 'zfp'
33c875455 migrate zfp filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2707
2022-02-09 16:36:05 -05:00
Li-Ta Lo
ae4ad5239f remove #include<CreateResult.h> 2022-02-09 13:32:00 -07:00
Li-Ta Lo
33c8754555 migrate zfp filters 2022-02-09 12:52:56 -07:00
Li-Ta Lo
e37900c4c5 Merge topic 'image_processing'
d0d20f10d type safety for stencil operation
e7aee0076 move Swap.h last
c65ed1772 revert thust::swap
d6a6075bf call thrust::swap
438787b02 temp disable ImageMedian
b99f12d2e restore ComputeMeoments
ec3db07c6 temp disable ImageMedian
6157678a9 temp disable ComputeMoment
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2701
2022-02-09 10:37:08 -05:00
Li-Ta Lo
d0d20f10d1 type safety for stencil operation 2022-02-09 08:00:47 -07:00
Kenneth Moreland
d5b388a61e Support backward compatibility with PointElevation filter
The interface for `PointElevation` changed the `SetLowPoint` and
`SetHighPoint` methods to accept a `vtkm::Vec3f_64` instead of 3
`vtkm::Float64`. This means all code using `PointElevation` wrong.

Why not have both?
2022-02-08 13:43:33 -07:00
Li-Ta Lo
e7aee0076f move Swap.h last 2022-02-08 13:14:32 -07:00
Li-Ta Lo
438787b024 temp disable ImageMedian 2022-02-08 12:01:49 -07:00
Li-Ta Lo
b99f12d2ee restore ComputeMeoments 2022-02-08 11:59:22 -07:00
Li-Ta Lo
ec3db07c66 temp disable ImageMedian 2022-02-08 11:54:24 -07:00
Li-Ta Lo
6157678a9a temp disable ComputeMoment 2022-02-08 11:50:59 -07:00
Li-Ta Lo
b81d200a63 Merge branch 'master' into image_processing
# Conflicts:
#	vtkm/filter/CMakeLists.txt
#	vtkm/filter/testing/CMakeLists.txt
2022-02-08 11:03:32 -07:00
Li-Ta Lo
260d256121 make deprecated header more compatable to old one 2022-02-08 10:01:01 -07:00
Li-Ta Lo
04e494dd4b tidy-up language usage 2022-02-08 09:44:57 -07:00
Li-Ta Lo
85d03c01e3 resolve TODO 2022-02-08 08:10:59 -07:00
Li-Ta Lo
236d4c8a2b add newline at eof 2022-02-08 07:22:46 -07:00
Li-Ta Lo
ee0f112f0e migrate mesh info filters 2022-02-08 07:18:24 -07:00
Li-Ta Lo
a0b4e6d61c remove unused data member 2022-02-07 11:09:59 -07:00
Li-Ta Lo
ea15fb4810 rename shadowing var names 2022-02-07 10:51:04 -07:00
Li-Ta Lo
c161ea03ce migrate image processing filters 2022-02-07 10:03:08 -07:00
Li-Ta Lo
f3c65d3404 Merge topic 'field_transform'
b8c1f5aac make calling to emplace_back type safe
43dd4638e use auto in range-based for loop
9958394fa tidy-up language usage and coding style conformation
b3327e544 move auto field = ... around to minimize accidential capture
455c20437 Migrate field_transform

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2696
2022-02-02 17:18:07 -05:00
Kenneth Moreland
8ae8394690 Merge topic 'fix-inefficient-component-extract'
9e0a38f5d Remove unused typedef
5063527bb Document that an inefficient component extract warning is expected
e16fa28d6 Fix range warning in ArrayHandleCast
2aed0b81c Avoid inefficient component extractions in serialization test
c3b6febb2 Fix ArrayHandleMultiplexer exec test
4b30939dd Fix inefficient copy when extracting rectilinear grids

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2697
2022-02-02 16:56:23 -05:00
Li-Ta Lo
b8c1f5aac3 make calling to emplace_back type safe 2022-02-02 13:59:27 -07:00
Li-Ta Lo
43dd4638ed use auto in range-based for loop 2022-02-02 13:20:04 -07:00
Li-Ta Lo
6a465e8bed tidy-up language usage 2022-02-02 12:44:00 -07:00
Li-Ta Lo
e48cc867b2 Merge branch 'histogram_worklet' into new_filter_clean_up 2022-02-02 10:20:13 -07:00
Li-Ta Lo
9958394fa6 tidy-up language usage and coding style conformation 2022-02-02 09:52:51 -07:00
Abhishek Yenpure
53651c82bf Merge topic 'mir-float-fix'
ae98d4f25 Fixing dashboard warnings
a0a333949 Fixing dashboard warnings
d3756d8ef Fixing dashboard warnings
397ffaad2 Fixing dashboard warnings
7f2badfce Fixing dashboard warnings
4db0cecc1 Fixing dashboard warnings
8ddcad824 Fixing dashboard warnings
7d10b4f32 Adding assert to unit test
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2674
2022-02-02 11:48:31 -05:00
Li-Ta Lo
b3327e544a move auto field = ... around to minimize accidential capture 2022-02-02 05:45:24 -07:00
Li-Ta Lo
455c204373 Migrate field_transform 2022-02-01 11:51:01 -07:00
Kenneth Moreland
4b30939dda Fix inefficient copy when extracting rectilinear grids
The `ExtractStructured` code was calling `ArrayCopy` on a permutation of
odd arrays, which was causing problems with the copy. Specifically use
`ArrayCopyDevice` to ensure the copy happens efficiently.
2022-02-01 09:21:43 -07:00