Commit Graph

1169 Commits

Author SHA1 Message Date
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
Li-Ta Lo
607e8d988d remove vtkm_filter_common 2022-01-31 14:29:34 -07:00
Li-Ta Lo
8113d15ef7 Merge branch 'master' into field_conversion
# Conflicts:
#	benchmarking/BenchmarkFilters.cxx
#	vtkm/filter/CMakeLists.txt
#	vtkm/filter/testing/UnitTestSplitSharpEdgesFilter.cxx
2022-01-31 14:08:02 -07:00
Li-Ta Lo
f5eb84f646 move worklet/histogram to filter/density_estimate/worklet 2022-01-31 12:17:44 -07:00
Li-Ta Lo
79afd73b31 explicitly use CoordinateSystem as input field 2022-01-31 09:52:25 -07:00
Li-Ta Lo
cdc4c29c5f renamve vector_calculus -> vector_analysis 2022-01-31 08:58:38 -07:00
Abhishek Yenpure
7d10b4f32d Adding assert to unit test 2022-01-31 11:46:28 +05:30
Li-Ta Lo
2ab05f2613 remove unneeded #include of Worklet headers 2022-01-30 17:09:31 -07:00
Li-Ta Lo
63d4b02ad2 add ALL_BACKENDS 2022-01-30 16:54:25 -07:00
Li-Ta Lo
171e4ba9a2 uses DEVOCE_SOURCES 2022-01-30 16:52:26 -07:00
Li-Ta Lo
1e303d3d3d add missing newline 2022-01-30 16:06:51 -07:00
Li-Ta Lo
93b9f5d746 restore vtkm_filter_common with a dummy .cxx 2022-01-30 16:05:15 -07:00
Li-Ta Lo
c60d9e64dd migrate SurfaceNormal, VectorMagnitude 2022-01-30 14:31:52 -07:00
Li-Ta Lo
59cc8cbaeb Migrate Gradient filter 2022-01-30 12:18:22 -07:00
Li-Ta Lo
f08a3185f8 Migrate FieldConversion filters 2022-01-29 13:12:01 -07:00
Abhishek Yenpure
9b82e75ac0 Fixing the type of reduce accumulator 2022-01-29 09:23:58 +05:30
Li-Ta Lo
4fa5f2f29c Merge topic 'new_contour'
af87308b9 better type safety, coding style conformation
16b8ed769 Merge branch 'new_contour' of gitlab.kitware.com:ollielo/vtk-m into new_contour
d8fdda5c3 use the new CreateResult
3a9e9f1ac Merge branch 'master' into new_contour
83c6032c9 minor update
1b028ab61 delete unused worklet unit test
175f9010a Merge branch 'master' into new_contour
5e991e4bf Merge branch 'master' into new_contour
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2669
2022-01-28 15:13:34 -05:00
Li-Ta Lo
af87308b91 better type safety, coding style conformation 2022-01-28 12:20:01 -07:00
Vicente Bolea
9334986821 Merge topic 'cell-centered-advection'
91631760a Missing changes for cell centered velocity fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2663
2022-01-28 12:45:08 -05:00
Li-Ta Lo
d8fdda5c37 use the new CreateResult 2022-01-28 08:48:26 -07:00
Li-Ta Lo
3a9e9f1ac1 Merge branch 'master' into new_contour 2022-01-28 07:34:35 -07:00
Abhishek Yenpure
3b95d06140 Removing debug print statements 2022-01-28 18:52:09 +05:30
Abhishek Yenpure
d8af004e8b Removing undefined method error 2022-01-28 17:48:38 +05:30
Abhishek Yenpure
91631760a7 Missing changes for cell centered velocity fields 2022-01-27 20:07:53 -05:00
Li-Ta Lo
83c6032c94 minor update 2022-01-27 13:44:01 -07:00
Kenneth Moreland
5bd60a0b77 Add CreateResult to NewFilter and absorb field mapping
The original version of `Filter` classes had a helper header file named
`CreateResult.h` that had several forms of a `CreateResult` function that
helped correctly create the `DataSet` to be returned from a filter's
`DoExecute`. With the move to the `NewFilter` structure, these functions
did not line up very well with how `DataSet`s should actually be created.

A replacement for these functions have been added as protected helper
methods to `NewFilter` and `NewFilterField`. In addition to moving them
into the filter themselves, the behavior of `CreateResult` has been merged
with the map field to output functionality. The original implementation of
`Filter` did this mapping internally in a different step. The first design
of `NewFilter` required the filter implementer to call a
`MapFieldsOntoOutput` themselves. This new implementation wraps the
functionality of `CreateResult` and `MapFieldsOntoOutput` together so that
the `DataSet` will be created correctly with a single call to
`CreateResult`. This makes it easier to correctly create the output.
2022-01-27 13:27:39 -07:00
Abhishek Yenpure
1bee90c597 Adding VTKM_EXEC tag to test worklets 2022-01-27 19:11:36 +05:30
Abhishek Yenpure
9b1aebe2d6 Adding debug updates 2022-01-26 22:44:26 -08:00
Li-Ta Lo
1b028ab612 delete unused worklet unit test 2022-01-26 13:51:21 -07:00
Li-Ta Lo
175f9010a5 Merge branch 'master' into new_contour 2022-01-26 13:43:46 -07:00
Li-Ta Lo
0270367004 use CastAndCallScalarField 2022-01-25 12:18:15 -07:00
Li-Ta Lo
2540fb1b27 Merge branch 'master' into new_connected_components 2022-01-25 10:15:57 -07:00
Kenneth Moreland
ab86763c74 Merge topic 'cast-and-call-field'
32507a510 Update CrossProduct filter to new filter base class
72065024a Add CastAndCallScalarField and CastAndCallVecField to NewFilterField

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2681
2022-01-25 10:28:55 -05:00
Kenneth Moreland
ff43a2efa5 Merge topic 'universal-dot-product-filter'
0c47645ba Remove DotProduct from worklet directory
d76929a78 Allow dot product to work with any field type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2682
2022-01-25 10:11:05 -05:00
Kenneth Moreland
32507a5109 Update CrossProduct filter to new filter base class
This also provides a good opportunity to demonstrate and test the
CastAndCallVecField method of the new filter classes.
2022-01-25 07:23:48 -07:00
Kenneth Moreland
d76929a788 Allow dot product to work with any field type
The previous implementation of the `DotProduct` filter only worked with
arrays containing "common" types. The filter has been updated to use the
extract component feature of `UnknownArrayHandle` to support computing
the dot product of arrays of almost any type.
2022-01-24 15:02:20 -07:00
Kenneth Moreland
72065024aa Add CastAndCallScalarField and CastAndCallVecField to NewFilterField
These methods somewhat simplify doing the `CastAndCall` from an
`UnknownArrayhandle` that comes from an input field.

The motivation for this change is for the User's guide, where I am
having a chicken-and-egg problem of wanting to describe how to make a
simple filter implementation without having to go into details about
`UnknownArrayHandle`.
2022-01-24 14:18:53 -07:00
Kenneth Moreland
170a10e4b4 Fix slow ArrayCopy calls
The `ArrayCopy` method has been changed to be precompiled. It handles
most standard array types. But there are some special `ArrayHandle`
types that are not correctly handled, and these go to a slow fallback.
Find places in the code that use that fallback and fix them.

There are also some instances of replacing an `ArrayHandleCounting` with
an `ArrayHandleIndex`. This change is probably not strictly necessary to
make the `ArrayCopy` faster, but when it can be used `ArrayHandleIndex`
is generally better.
2022-01-24 14:15:45 -07:00
Kenneth Moreland
63c45efc04 GenerateIds filter does not require device compiler 2022-01-24 14:05:58 -07:00
Kenneth Moreland
aefc753329 Implement permutation mapping in vtkm_cont
There was a precompiled version of mapping permutations in the
filter library. However, there are reasons to be able to copy
a permutation of an array outside of filters. So add the
capability to the more general filter library.
2022-01-24 12:17:23 -07:00