Commit Graph

11234 Commits

Author SHA1 Message Date
Kenneth Moreland
99c548ef52 Merge topic 'marching-cubes-instantiations'
db2dbbbcc Simplify MarchingCells execute method
0ee495f31 Split the compilation of ContourMarchingCells into instantiations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3089
2023-06-27 10:09:26 -04:00
Kenneth Moreland
db2dbbbccb Simplify MarchingCells execute method
The output arrays are always basic arrays containing `vtkm::Vec3f`, so
we don't need to template those arguments.
2023-06-27 09:07:44 -04:00
Kenneth Moreland
0ee495f310 Split the compilation of ContourMarchingCells into instantiations
Although the contour filter was recently divided into 2 filters, flying
edges and marching cubes, the marching cubes version still had many
conditions and was the file that took the longest to compile on Frontier.
To help speed up parallel compiles and prevent a single run of a
compiler from being overwhelmed, the compilation of all the marching
cubes conditions has been split up using instantiations.
2023-06-26 14:07:47 -04:00
Dave Pugmire
064501214a Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2023-06-23 13:49:59 -04:00
Kenneth Moreland
f67a9f29bf Merge topic 'add-point-index-start-unit-test-to-testing-extract-stuctured'
8f4d5fdf8 Remove some unneeded test comments and debug code
7bea5413c Revert from VOIIsGlobal to IncludeOffset. Add comment about deprecation reasoning.
523c8f3f2 Add test whether GlobalPointDimensions are preserved
84e719ae1 Set GlobalPointIndexStart correctly, copy GlobalPointDimensions
e55b700f7 Deprecate SetIncludeOffset and rename to SetVOIIsGlobal
e013ad126 Add test for GlobalPointIndexStart to TestingExtractStructured

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abdelilah Essiari <aessiari@lbl.gov>
Merge-request: !3086
2023-06-22 08:20:32 -04:00
Kenneth Moreland
8f4d5fdf80 Remove some unneeded test comments and debug code 2023-06-21 17:33:05 -04:00
Gunther H. Weber
7bea5413cf Revert from VOIIsGlobal to IncludeOffset. Add comment about deprecation reasoning. 2023-06-21 17:29:01 -04:00
Gunther H. Weber
523c8f3f21 Add test whether GlobalPointDimensions are preserved 2023-06-21 17:29:01 -04:00
Gunther H. Weber
84e719ae17 Set GlobalPointIndexStart correctly, copy GlobalPointDimensions 2023-06-21 17:29:00 -04:00
Gunther H. Weber
e55b700f75 Deprecate SetIncludeOffset and rename to SetVOIIsGlobal 2023-06-21 17:29:00 -04:00
Gunther H. Weber
e013ad126f Add test for GlobalPointIndexStart to TestingExtractStructured 2023-06-21 17:29:00 -04:00
Vicente Bolea
bce19a2e4c Merge topic 'update-diy'
188e5080b Merge branch 'upstream-diy' into update-diy
12b45d864 diy 2023-06-16 (3ee23f39)
1bea838be diy: set diy version to latest for/vtk-m
9c0b16414 remove gcc13 warning
d907d832a CI,opensuse: added sles build with gcc13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !3084
2023-06-21 15:01:36 -04:00
Sujin Philip
b4b45495c6 Merge topic 'arrayhandle-explicit-constructors'
fc9077e0c Mark ArrayHandle constructors taking buffers, as explicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3076
2023-06-21 14:59:35 -04:00
Sujin Philip
fc9077e0c5 Mark ArrayHandle constructors taking buffers, as explicit
This resolves a compiler ambiguity I hit during development.
In my case, I created an `ArrayHandleDecorator` with one of the arrays being
an `ArrayHandleTransform`. The ambiguity occurs in function
`DecoratorStorageTraits<...>::BuffersToArray`, here an `ArrayHandleTransform`
is constructed using buffers (`std::vector<vtkm::cont::internal::Buffer>`)

This constructor is not defined for `ArrayHandleTransform`, but it's defined for
its superclass (`vtkm::cont::ArrayHandle`). `ArrayHandleTransform` does have a
non-explicit constructor that takes the array to be transformed and the
transform-functor as parameters, where the later has a default value.
This produces the following ambiguous options for the compiler:

1. Create a "to-be-transformed" ArrayHandle instance using the buffers, call
   the `ArrayHandleTransform` constructor with this array with the defaulted
   functor parameter.
2. Create the superclass instance using the buffer and call the
  `ArrayHandleTransform` constructor that takes the superclass.

In this situation, option 2 is the correct choice.

The ambiguity is resolved by marking the constructors that take
buffers as explicit. These constructors are also added for the
derived classess via the `VTK_M_ARRAY_HANDLE_SUBCLASS_IMPL` macro.
2023-06-21 13:50:33 -04:00
Vicente Adolfo Bolea Sanchez
188e5080bd Merge branch 'upstream-diy' into update-diy
# By Diy Upstream
* upstream-diy:
  diy 2023-06-16 (3ee23f39)
2023-06-19 20:07:20 -04:00
Diy Upstream
12b45d864b diy 2023-06-16 (3ee23f39)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit 3ee23f39193a00e4b601b65bb970d0631eec1662 (for/vtk-m-20230616-g40ea01f9).
2023-06-19 20:07:20 -04:00
Vicente Adolfo Bolea Sanchez
1bea838be9 diy: set diy version to latest for/vtk-m 2023-06-19 20:06:59 -04:00
Vicente Adolfo Bolea Sanchez
9c0b16414b remove gcc13 warning 2023-06-19 20:06:59 -04:00
Vicente Adolfo Bolea Sanchez
d907d832a3 CI,opensuse: added sles build with gcc13 2023-06-19 20:06:59 -04:00
Kenneth Moreland
845ddd6572 Merge topic 'index-from-boundary-state'
a1e8d029c Get the 3D index from a BoundaryState in WorkletPointNeighborhood

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3080
2023-06-19 15:14:32 -04:00
Kenneth Moreland
a1e8d029c5 Get the 3D index from a BoundaryState in WorkletPointNeighborhood
There are occasions when you need a worklet to opeate on 2D or 3D
indices. Most worklets operate on 1D indices, which requires recomputing
the 3D index in each worklet instance. A workaround is to use a worklet
that does a 3D scheduling and pull the working index from that.

The problem was that there was no easy way to get this 3D index. To
provide this option, a feature was added to the `BoundaryState` class
that can be provided by `WorkletPointNeighborhood`.

Thus, to get a 3D index in a worklet, use the
`WorkletPointNeighborhood`, add `Boundary` as an argument to the
`ExecutionSignature`, and then call `GetCenterIndex` on the
`BoundaryState` object passed to the worklet operator.
2023-06-19 10:29:18 -06:00
Kenneth Moreland
05ff345b1f Merge topic 'array-range-instantiations'
46a613d18 Speed up compilation of ArrayRangeCompute.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3079
2023-06-19 12:22:17 -04:00
Li-Ta Lo
e5c6a39172 Merge topic 'rendering_cpp_cleanup'
362efb637 try to surpress warning for window
3f680a5be Merge branch 'master' into rendering_cpp_cleanup
7bbda42fe clean up Annontations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3081
2023-06-19 11:19:27 -04:00
Kenneth Moreland
46a613d183 Speed up compilation of ArrayRangeCompute.cxx
The file `ArrayRangeCompute.cxx` was taking a long time to compile with
some device compilers. This is because it precompiles the range computation
for many types of array structures. It thus compiled the same operation
many times over.

The new implementation compiles just as many cases. However, the
compilation is split into many different translation units using the
instantiations feature of VTK-m's configuration. Although this rarely
reduces the overall CPU time spent during compiling, it prevents parallel
compiles from waiting for this one build to complete. It also avoids
potential issues with compilers running out of resources as it tries to
build a monolithic file.
2023-06-19 08:37:15 -06:00
Vicente Bolea
017a9e3b48 Merge topic 'fix-lfs-ascent'
cb0f80698 ci,ascent: disable git-lfs pre-push hook

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3085
2023-06-15 18:08:09 -04:00
Vicente Adolfo Bolea Sanchez
cb0f806988 ci,ascent: disable git-lfs pre-push hook 2023-06-15 17:41:14 -04:00
Li-Ta Lo
362efb637c try to surpress warning for window 2023-06-14 10:04:43 -06:00
Li-Ta Lo
3f680a5be3 Merge branch 'master' into rendering_cpp_cleanup 2023-06-12 14:03:26 -06:00
Li-Ta Lo
7bbda42fe5 clean up Annontations 2023-06-12 14:02:47 -06:00
Kenneth Moreland
bde9c9b8a3 Merge topic 'flat-logical-convert-names'
29c96a24f Rename structured connectivity index conversion methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3075
2023-06-09 11:03:54 -04:00
Li-Ta Lo
75d0dd9bf8 Merge topic 'rendering_cpp_cleanup'
c8caecfef try to supress warning on windows
85b4b18fc properly call make_unique
10bcf618f non-virtual color table annotations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3077
2023-06-07 17:59:53 -04:00
Li-Ta Lo
c8caecfefc try to supress warning on windows 2023-06-05 13:08:38 -06:00
Kenneth Moreland
7488ad731d Merge topic 'compute-moments-any-vec-size'
4064a3bd0 Allow ComputeMoments to operate on any scalar field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3065
2023-06-05 14:42:20 -04:00
Li-Ta Lo
85b4b18fca properly call make_unique 2023-06-05 11:20:49 -06:00
Li-Ta Lo
10bcf618f6 non-virtual color table annotations 2023-06-05 09:05:53 -06:00
Kenneth Moreland
4064a3bd06 Allow ComputeMoments to operate on any scalar field
Previously, the `ComputeMoments` filter only operated on a finite set of
array types as its input field. This included a prescribed list of `Vec`
sizes for the input. The filter has been updated to use more generic
interfaces to the field's array (and float fallback) to enable the
computation of moments on any type of scalar field.
2023-06-05 08:44:03 -04:00
Roxana Bujack
ddada34223 Merge topic 'addMomentsTest'
8a44ea4a9 adapt pixel wrongnes ratio
47441e841 add render test for moments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3070
2023-06-05 08:34:19 -04:00
Kenneth Moreland
29c96a24fa Rename structured connectivity index conversion methods
The structured connectivity classes are templated on two tags to
determine what 2 incident topological elements are being accessed. Back
in the day, these were called the "from" elements and "to" elements, as
taken from VTK filter names like `PointDataToCellData`. However, these
names were found to be very confusion, and after much debate they have
been renamed to the visit element type and the incident element type.
Meaning that a worklet is "visiting" elements of a particular type (such
as visiting each cell) and can access "incident" elements of a
particular type (such as the points incident on the cell).

I found a few methods converting flat and logical indices using the old,
confusing from/to convention. This changes them to the new convention.
2023-06-02 15:31:24 -04:00
Li-Ta Lo
40a30dbfe7 Merge topic 'rendering_cpp_cleanup'
62eb0e3f3 copying Actor into Scene
04b6d96aa enable copying for Actor and ConnectivityProxy
09c78eec4 use unique_ptr for PIMPL ConnectivityProxy
b2880566d move Actor
6b0d2e369 use unique_ptr for PIMPL Actor
fe211adfd Merge branch 'master' into rendering_cpp_cleanup
b4f17b851 use unique_ptr for PIMPL for View

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3074
2023-06-02 12:43:49 -04:00
Li-Ta Lo
62eb0e3f3d copying Actor into Scene 2023-06-02 10:36:39 -06:00
Li-Ta Lo
04b6d96aab enable copying for Actor and ConnectivityProxy 2023-06-02 10:32:44 -06:00
Li-Ta Lo
09c78eec43 use unique_ptr for PIMPL ConnectivityProxy 2023-06-01 14:54:27 -06:00
Li-Ta Lo
b2880566d5 move Actor 2023-06-01 12:36:23 -06:00
Li-Ta Lo
6b0d2e369c use unique_ptr for PIMPL Actor 2023-06-01 11:28:49 -06:00
Li-Ta Lo
fe211adfd8 Merge branch 'master' into rendering_cpp_cleanup 2023-06-01 10:14:17 -06:00
Li-Ta Lo
c5ddf1e543 Merge topic 'parallel_projection'
6508d47cb Remove 3DPara
c39ff5f86 add include CanvasRayTracer.h
ca1fe424c cleanup Camera
d660a53b8 clean up Ray and RayOperator
9ed11540f cleanup Camera

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3072
2023-06-01 12:05:21 -04:00
Li-Ta Lo
6508d47cbc Remove 3DPara 2023-06-01 10:53:35 -04:00
roxana bujack
8a44ea4a91 adapt pixel wrongnes ratio 2023-06-01 15:41:39 +02:00
Kenneth Moreland
7037f64bba Merge topic 'add-gpu-to-gpu-conn'
1e2749580 diy,mpi: Enable GPU AWARE MPI buffers
662f93e07 Merge branch 'upstream-diy' into add-gpu-to-gpu-conn
928900c63 diy 2023-03-28 (6837fb55)
6d69301b7 DIY: bump new version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2987
2023-05-31 17:23:26 -04:00
Kenneth Moreland
144f20636b Merge topic 'split-advection-test'
2631e5561 Split up the particle advection/streamline test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !3067
2023-05-31 10:03:48 -04:00