Commit Graph

9439 Commits

Author SHA1 Message Date
Abhishek Yenpure
3237c58c2b Updating particle advection filters to use field associativity 2021-10-14 14:57:36 -07:00
Abhishek Yenpure
79bb38c2b3 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into cell-velocity-field 2021-10-14 14:48:37 -07:00
Li-Ta Lo
1de5fef122 minor fix 2021-10-14 14:42:02 -06:00
Li-Ta Lo
5e87ed858c make most of the vtkm_io library not DEVICE_SOURCE 2021-10-14 12:38:52 -06:00
Li-Ta Lo
14a788bb49 Merge topic 'osc_refactor'
1d2c4c290 fixed single/double precision converstion
e680815d5 add include sstream and see if it clears the dashboard
d59732766 remove comment about DeviceAdapter.h
08ad08b13 Merge branch 'master' into osc_refactor
7add915dd include DeviceAdapter.h in StorageVirtual.h
b9c2ddf9d add missing #include
5448ffb28 decouple Timer.h from device compiler
e90b186ba do not use device compiler to compile source unit tests
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2602
2021-10-14 12:15:20 -04:00
Kenneth Moreland
475261370d Fix newline issue in reproduce_ci_env.py
MR !2598 introduced some fixes to `reproduce_ci_env.py`. One of
them handled newlines in command lists by separating the command
lists by newlines in the Dockerfile (which generated a script).
Although this worked for some of the docker containers, I found
others, like rhel8, where the newlines were not escaped correctly.

Correct this problem by moving back to separating commands with
`&&`. This requires replacing newlines in commands with `&&`.
That in itself is no problem except that if you have a blank
line, you get `&& &&`, which is a syntax error for the shell.
So, avoid this by stripping newlines from commands.
2021-10-14 10:15:02 -06:00
Vicente Bolea
86cc1d1e32 Merge topic 'add-radeon-build'
98a1cc751 CI: add HIP builing build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2521
2021-10-14 12:09:51 -04:00
Li-Ta Lo
1d2c4c2906 fixed single/double precision converstion 2021-10-14 09:15:13 -06:00
Li-Ta Lo
e680815d58 add include sstream and see if it clears the dashboard 2021-10-14 07:24:55 -06:00
Sujin Philip
02f0a809fb Merge topic 'probe-point-fields-changelog'
9deb36132 Add release notes for commit abedf61e5cbfaee4abac

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2603
2021-10-14 08:29:18 -04:00
Li-Ta Lo
d59732766c remove comment about DeviceAdapter.h 2021-10-13 15:59:30 -06:00
Li-Ta Lo
08ad08b138 Merge branch 'master' into osc_refactor 2021-10-13 15:32:28 -06:00
Li-Ta Lo
534fccdbaa update CI for no_virtual 2021-10-13 15:30:02 -06:00
Li-Ta Lo
4817ffbc91 Merge branch 'master' into ollielo-master-patch-72902 2021-10-13 15:27:27 -06:00
Kenneth Moreland
4314b730e3 Merge topic 'dropped-symbols'
d5acf9106 Fix dropped UnknownArrayHandle symbols

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2604
2021-10-13 16:54:09 -04:00
Li-Ta Lo
7add915dd3 include DeviceAdapter.h in StorageVirtual.h 2021-10-13 14:40:51 -06:00
Vicente Adolfo Bolea Sanchez
98a1cc7514 CI: add HIP builing build
- It also adds CTEST_MAX_PARALLELISM to further control the number of
  parallelism level while building vtk-m.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2021-10-13 15:40:52 -04:00
Li-Ta Lo
b9c2ddf9d1 add missing #include 2021-10-13 13:22:26 -06:00
Li-Ta Lo
5448ffb28b decouple Timer.h from device compiler 2021-10-13 12:11:23 -06:00
Li-Ta Lo
e90b186ba8 do not use device compiler to compile source unit tests 2021-10-13 11:56:02 -06:00
Li-Ta Lo
35a6b8500a Enable NO_DEPRECATED_VIRTUAL by default 2021-10-13 13:20:28 -04:00
Kenneth Moreland
d5acf91067 Fix dropped UnknownArrayHandle symbols
For some reason, GCC is dropping the templated function instances use
for the `UnknownArrayHandle` constructor. Apparently, something in the
compiler or the linker is being over aggressive about removing unused
symbols and is actually dropping symbols that are being used. Maybe it
is because the functions are not directly called but their pointers are
used.

To get around this problem, mark these templated functions in
UnknownArrayHandle.h with the `used` attribute to force the compiler/
linker to keep them. There should be no consequence to that as these
function templates are only instantiated if they are used.
2021-10-13 07:33:13 -06:00
Li-Ta Lo
54772fb60c change as suggested by code review 2021-10-12 16:22:31 -06:00
Kenneth Moreland
149e5aba87 Merge topic 'device-sources-clarification'
8ea7fbc35 Add clarification for DEVICE_SOURCES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2601
2021-10-12 17:44:16 -04:00
Sujin Philip
9deb36132b Add release notes for commit abedf61e5cbfaee4abac 2021-10-12 17:41:57 -04:00
Li-Ta Lo
f8d23dc432 unique_ptr<>::release does not delete, unqie_ptr<>::reset() does 2021-10-12 14:42:33 -06:00
Li-Ta Lo
e392109a1a add unit test for Oscillator, fix bug in point v.s. cell dims 2021-10-12 14:04:40 -06:00
Kenneth Moreland
8ea7fbc350 Add clarification for DEVICE_SOURCES
The `vtkm_add_target_information` CMake function has a `DEVICE_SOURCES`
option that allows you to list which sources need to be compiled with a
device compiler. Added some hints to the documentation about which
source code needs to be listed in `DEVICE_SOURCES`.
2021-10-12 13:50:42 -06:00
Kenneth Moreland
8e6a8d8cd4 Merge topic 'write-binary'
8f1c453c0 Support writing binary files to legacy VTK files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !2599
2021-10-12 15:33:45 -04:00
Li-Ta Lo
c212946dbf move OscillatorSource out of Oscillator 2021-10-12 13:24:55 -06:00
Li-Ta Lo
29e459062c move OscillatorSource worklet to be within Oscillator.cxx 2021-10-12 13:11:47 -06:00
Li-Ta Lo
6ffb75c5a5 use pimpl pattern for osc worklet 2021-10-12 12:17:58 -06:00
Kenneth Moreland
8f1c453c0b Support writing binary files to legacy VTK files
The legacy VTK file writer writes out in ASCII. This is helpful when a
human is trying to read the file. However, if you have more than a
trivial amount of data, the file can get impractically large. To get
around this, `VTKDataSetWriter` now has a flag that allows you to write
the data in binary format.
2021-10-11 13:08:59 -06:00
Kenneth Moreland
b4bb02830a Merge topic 'variant-get-unsupported-type'
e9da34310 Handle `Variant::Get` for types not supported by the `Variant`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2596
2021-10-08 08:31:32 -04:00
Kenneth Moreland
df6c43fa9a Merge topic 'reproduce-ci-fixes'
ecacc89b7 Make reproduce_ci_env.py more tolerant of scripts
28b800d21 Merge dictionaries when extending CI builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Vicente Bolea <vicente.bolea@kitware.com>
Tested-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2598
2021-10-06 13:48:25 -04:00
Kenneth Moreland
9ff36b954a Merge topic 'single-type-reverse-connection'
c699a1708 Fix performance issue with CellSetSingleType reverse connections

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2597
2021-10-05 17:02:28 -04:00
Kenneth Moreland
ecacc89b7d Make reproduce_ci_env.py more tolerant of scripts
When `reproduce_ci_env.py` makes its docker container, it creates a pair
of scripts, `setup-gitlab-env.sh` and `run-gitlab-stage.sh`, inside the
container. These scripts came from the `before_script` and `script` CI
configuration parameters, respectively.

These two scripts were created by joining each item in the CI
configuration lists with `&&` onto a single line. However, this meant
that each list item had to be on its own line or it didn't work. A
recent configuration change meant that one of the configurations
contained multiple shell commands separated by newlines. This change
builds the script with multiple lines (which have to be carefully
escaped in the generated dockerfile).

Also modified these strings to escape quotes (`"`). This is important as
the dockerfile generates these scripts using an `echo` command that
needs to quote all of the arguments together.
2021-10-05 14:18:25 -06:00
Kenneth Moreland
28b800d21d Merge dictionaries when extending CI builds
When one CI build YAML spec extended another, the `reproduce_ci_env.py`
script was overwritting local configuration with the configuration being
extended. This change merges all configuration together (which appears
to be how the GitLab CI works).
2021-10-05 13:11:44 -06:00
Kenneth Moreland
c699a17087 Fix performance issue with CellSetSingleType reverse connections
When building the reverse connections (visit points with cells) for
`CellSetSingleType`, the fast path for building these was not built due
to a templating error.
2021-10-05 12:53:57 -06:00
Kenneth Moreland
ae3c7c096b Merge topic 'source-field-names'
03a4750a3 Change Oscillator output field name to oscillating
a3462b41c Change Wavelet output field name to RTData
ea1a55359 Name tangle source fields appropriately
a68422d45 Add GenerateIds filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2595
2021-10-05 10:59:48 -04:00
Jieyang Chen
723e133055 Merge topic 'hip-support'
a157c0e84 Add changes for supporting Kokkos/HIP

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2554
2021-10-05 10:42:55 -04:00
Kenneth Moreland
03a4750a3f Change Oscillator output field name to oscillating 2021-10-05 08:20:27 -06:00
Kenneth Moreland
d2c296aa00 Merge topic 'unknownarray-copy-methods'
d1160638b Add copy methods to `UnknownArrayHandle`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2590
2021-10-05 10:15:45 -04:00
Kenneth Moreland
a3462b41ce Change Wavelet output field name to RTData
This matches the output field name in VTK and ParaView for the
equivalent source. This change allows this source to be used as a drop-
in replacement for the VTK source (which could be very useful).
2021-10-04 13:44:27 -06:00
Kenneth Moreland
ea1a55359f Name tangle source fields appropriately
The `Tangle` source would create a point field generically named
`nodevar`. This name was not indicitive of the data or its source. Thus,
the output point field has been renamed `tangle`.

The `Tangle` source was also creating a cell field (named `cellvar`).
This field was really just a mirror of the cell indices (counting from 0
on up). This field has been removed from the input. If you want such a
field, you can now use the `GenerateIds` filter to add it to any data
set.
2021-10-04 13:44:27 -06:00
Kenneth Moreland
a68422d454 Add GenerateIds filter
This filter adds a pair of fields to a `DataSet` which mirror the
indices of the points and cells, respectively. These fields are useful
for tracking the provenance of the elements of a `DataSet` as it gets
manipulated by the filters. It is also convenient for adding indices to
operations designed for fields and for testing purposes.
2021-10-04 13:44:18 -06:00
Kenneth Moreland
e9da343109 Handle Variant::Get for types not supported by the Variant
Previously, if you called `Get` on a `Variant` with a type that is not
in the list of types supported by the `Variant`, that would attempt to
look up the type at index `-1` and could spin the compiler into an
endless loop.

Instead, check for the case where you are attempting to get a type from
the `Variant` not listed in its templat arguments. In this case, instead
of producing a compiler error, produce a runtime error. Although this
increases the possibility that a bad compile path is being generated, it
simplifies creating templated code that produces cases we don't care
about.
2021-10-04 10:19:25 -06:00
Vicente Bolea
0f42446698 Merge topic 'expand-include-testing-lib'
557124f6f testing/Testing.h when VTKm_ENABLE_TESTING_LIBRARY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2593
2021-10-04 12:17:19 -04:00
Manish Mathai
b7470b0afc Remove leftover debug statement 2021-10-03 02:13:59 -04:00
Manish Mathai
8f025a2c56 Batch text and line annotation rendering
This commit makes `LineRenderer` and `TextRenderer` to batch line and
text rendering. Batching them has shown a significant speedup,
especially when usin CUDA.
2021-10-02 14:13:14 -07:00