Commit Graph

10481 Commits

Author SHA1 Message Date
Roxana Bujack
0fa9c8d954 Merge topic 'partitionedCellLocator'
25f2ebf02 add partitioned cell locator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2893
2022-11-01 08:33:28 -04:00
roxana bujack
25f2ebf026 add partitioned cell locator 2022-11-01 11:08:18 +01:00
Kenneth Moreland
ef3c4c65c9 Merge topic 'no-execution-whole-array'
294581375 Removed ExecutionWholeArray class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2905
2022-10-31 14:41:54 -04:00
Kenneth Moreland
f4b972afaa Merge topic 'no-deprecated-virtual'
ea560e948 Remove deprecated virtual methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2903
2022-10-31 14:38:32 -04:00
Kenneth Moreland
89aaecff32 Merge topic 'rebuild-modules'
add7c68d5 Add make dependencies to rebuild CMake when vtkm.module files change

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2902
2022-10-31 11:56:45 -04:00
Kenneth Moreland
076e0a75b0 Merge topic 'fix-filter-tests'
96b447e69 Fix some deprecated hacks in modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2904
2022-10-31 09:58:13 -04:00
Kenneth Moreland
972a96b6c6 Merge topic 'external-lib-lists'
73cb38d86 Output complete list of libraries for external Makefiles
d87316fbf Create a list of all modules being built

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nicole Marsaglia <marsaglia1@llnl.gov>
Merge-request: !2901
2022-10-28 14:20:58 -04:00
Kenneth Moreland
ea560e9486 Remove deprecated virtual methods
Several revisions ago, the ability to use virtual methods in the
execution environment was deprecated. Completely remove this
functionality for the VTK-m 2.0 release.
2022-10-28 10:56:52 -06:00
Vicente Bolea
13ee0b5cdc Merge topic 'fixup-parallelism-ascent'
e99a56ea1 CI: Specify parallelism level ascent build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2906
2022-10-28 12:39:01 -04:00
Vicente Adolfo Bolea Sanchez
e99a56ea1e CI: Specify parallelism level ascent build 2022-10-27 17:23:59 -04:00
Kenneth Moreland
2945813755 Removed ExecutionWholeArray class
`ExecutionWholeArray` is an archaic class in VTK-m that is a thin wrapper
around an array portal. In the early days of VTK-m, this class was used to
transfer whole arrays to the execution environment. However, now the
supported method is to use `WholeArray*` tags in the `ControlSignature` of
a worklet.

Nevertheless, the `WholeArray*` tags caused the array portal transferred to
the worklet to be wrapped inside of an `ExecutionWholeArray` class. This
is unnecessary and can cause confusion about the types of data being used.

Most code is unaffected by this change. Some code that had to work around
the issue of the portal wrapped in another class used the `GetPortal`
method which is no longer needed (for obvious reasons). One extra feature
that `ExecutionWholeArray` had was that it provided an subscript operator
(somewhat incorrectly). Thus, any use of '[..]' to index the array portal
have to be changed to use the `Get` method.
2022-10-27 15:07:41 -06:00
Vicente Bolea
d694675027 Merge topic 'update-cmake'
55e8d258a CMAKE: update latest CI CMake to 3.23.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2892
2022-10-27 13:01:18 -04:00
Kenneth Moreland
add7c68d51 Add make dependencies to rebuild CMake when vtkm.module files change
Also improved a diagnostic when bad identifiers are used in vtkm.module
files.
2022-10-27 10:47:39 -06:00
Kenneth Moreland
96b447e69a Fix some deprecated hacks in modules
When the configure modules were first created, there were some hacks
around filters that had not yet moved to the new filter mechanism. These
can (and should) be removed.
2022-10-27 10:24:28 -06:00
Kenneth Moreland
239a5610d1 Merge topic 'strdup-warning'
dafa01e9e Add benchmark arguments without leaking memory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mark Bolstad <mbolsta@sandia.gov>
Merge-request: !2900
2022-10-27 10:21:46 -04:00
Kenneth Moreland
73cb38d860 Output complete list of libraries for external Makefiles
There is a Makefile include, `vtkm_config.mk`, and a package include,
`vtkm.pc`, that are configured so that external programs that do not use
CMake have a way of importing VTK-m's configuration. However, the set of
libraries was hardcoded. In particular, many of the new filter libraries
were missing.

Rather than try to maintain this list manually, use the module mechanism
in the CMake configuration to get a list of libraries built and
automatically build these lists.
2022-10-27 06:14:49 -06:00
Kenneth Moreland
d87316fbf1 Create a list of all modules being built 2022-10-26 15:56:28 -06:00
Vicente Adolfo Bolea Sanchez
55e8d258ad CMAKE: update latest CI CMake to 3.23.4 2022-10-26 17:18:15 -04:00
Kenneth Moreland
dafa01e9e9 Add benchmark arguments without leaking memory
The previous version of BenchmarkInSitu added arguments to its argv list
by using `strdup`. However, this method will leak memory, which is not
great. Replace this with a safer mechanism that will properly delete
memory at the end of the program (and satisfy any memory analyzers).

This also fixes a warning from MS about `strdup` being deprecated.
2022-10-26 15:16:15 -06:00
Kenneth Moreland
f8e5342e14 Merge topic 'conditional-library-compile'
ad1e7b5bd Add module mechanism

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2730
2022-10-26 15:35:19 -04:00
Kenneth Moreland
ad1e7b5bdb Add module mechanism
This mechanism sets up CMake variables that allow a user to select which
modules/libraries to create. Dependencies will be tracked down to ensure
that all of a module's dependencies are also enabled.

The modules are also arranged into groups.
Groups allow you to set the enable flag for a group of modules at once.
Thus, if you have several modules that are likely to be used together,
you can create a group for them.

This can be handy in converting user-friendly CMake options (such as
`VTKm_ENABLE_RENDERING`) to the modules that enable that by pointing to
the appropriate group.
2022-10-26 12:51:05 -06:00
Vicente Bolea
0893518f2d Merge topic 'timeout-ascent'
ed27cc307 CI: Adjust Ascent timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2899
2022-10-26 14:43:31 -04:00
Vicente Adolfo Bolea Sanchez
ed27cc3071 CI: Adjust Ascent timeout 2022-10-26 12:00:33 -04:00
Vicente Bolea
0fb0cb5e9f Merge topic 'oclf-in-every-mr'
d60c370d1 CI: Enable Ascent builds in MR
e4d23a4ae CI: remove unused variable warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2858
2022-10-25 16:57:08 -04:00
Kenneth Moreland
e4dc5e9dee Merge topic 'add-help'
6f84d938a AddHelp option to Initialize should add --help argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2895
2022-10-25 16:26:21 -04:00
Vicente Bolea
5c00416dda Merge topic 'add-spock-ci'
2df065869 CI: Enable Ascent builds in MR
4585cc3af CI: parametrize ccache installation path
aca3192cf CI: add ctest_submit_build.cmake
618d75c68 CI: rename ctest_build_submit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2896
2022-10-25 16:17:55 -04:00
Vicente Adolfo Bolea Sanchez
d60c370d1d CI: Enable Ascent builds in MR 2022-10-25 15:41:12 -04:00
Vicente Adolfo Bolea Sanchez
e4d23a4ae6 CI: remove unused variable warnings 2022-10-25 15:40:48 -04:00
Vicente Adolfo Bolea Sanchez
2df065869c CI: Enable Ascent builds in MR 2022-10-25 15:40:17 -04:00
Vicente Adolfo Bolea Sanchez
aca3192cf8 CI: add ctest_submit_build.cmake 2022-10-25 15:40:17 -04:00
Vicente Adolfo Bolea Sanchez
4585cc3af5 CI: parametrize ccache installation path 2022-10-25 15:40:17 -04:00
Vicente Adolfo Bolea Sanchez
618d75c682 CI: rename ctest_build_submit 2022-10-25 12:01:06 -04:00
Kenneth Moreland
6f84d938aa AddHelp option to Initialize should add --help argument
When you used the `AddHelp` option to `Initialize`, it added a
`--vtkm-help` option and `-h`, but not `--help`, which was weird. It
also avoided adding `--vtkm-help` when `AddHelp` was not used, but did
print out a usage statement under other circumstances.

This changes the behavior to add `--vtkm-help`, `--help`, and `-h` when
`AddHelp` is on and only `--vtkm-help` when it is off.
2022-10-24 14:38:37 -06:00
Kenneth Moreland
1527018861 Merge branch 'release-1.9' 2022-10-14 08:23:09 -04:00
Kenneth Moreland
875418b4b4 Merge topic 'tutorial-readme'
a656862e0 Update the tutorial README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tushar Athawale <athawaletm@ornl.gov>
Merge-request: !2890
2022-10-14 08:23:09 -04:00
Kenneth Moreland
721537d028 Merge topic 'tutorial-readme' into release-1.9
a656862e0 Update the tutorial README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tushar Athawale <athawaletm@ornl.gov>
Merge-request: !2890
2022-10-14 08:23:09 -04:00
Kenneth Moreland
a656862e0a Update the tutorial README
This README should replace the page at https://m.vtk.org. Doing so will
make it easier to maintain the tutorial information.
2022-10-13 14:50:02 -06:00
Ben Boeckel
1075af2107 Merge branch 'release-1.9' 2022-10-13 14:08:56 -04:00
Ben Boeckel
618c40a91b Merge branch 'release-1.8' into release-1.9 2022-10-13 14:08:56 -04:00
Ben Boeckel
441d570da4 Merge topic 'fix-clip-typelist'
42cb62028 Clip should use `VTKM_DEFAULT_TYPE_LIST` in CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2889
2022-10-13 14:08:56 -04:00
Ben Boeckel
b6e0391f28 Merge topic 'fix-clip-typelist' into release-1.9
42cb62028 Clip should use `VTKM_DEFAULT_TYPE_LIST` in CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2889
2022-10-13 14:08:56 -04:00
Ben Boeckel
0d793e8158 Merge topic 'fix-clip-typelist' into release-1.8
42cb62028 Clip should use `VTKM_DEFAULT_TYPE_LIST` in CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2889
2022-10-13 14:08:55 -04:00
Kenneth Moreland
937fea1e91 Merge branch 'release' into master 2022-10-13 13:18:20 -04:00
Kenneth Moreland
e6971e2b36 Merge branch 'release-1.8' into release 2022-10-13 13:18:20 -04:00
Kenneth Moreland
55dbfb6f45 Merge branch 'release-1.7' into release-1.8 2022-10-13 13:18:20 -04:00
Kenneth Moreland
ca39bd4ea6 Merge topic 'contour-bug-v1.7' into release-1.7
a195ce883 Fix Flying Edges z-boundary condition with non-square input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2876
2022-10-13 13:18:19 -04:00
Sujin Philip
42cb620289 Clip should use VTKM_DEFAULT_TYPE_LIST in CastAndCall
This was causing an issue in VTK as the VTK specific typelist was not
being used. This resulted in a field's type being changed from `UInt8` to
`Float32` and caused a test to fail.
2022-10-13 12:14:45 -04:00
Kenneth Moreland
4d863a9cba Merge branch 'release-1.9' 2022-10-12 16:21:06 -04:00
Kenneth Moreland
45ae18d46a Merge topic 'tutorial-edits' into release-1.9
689ba00e4 Minor formatting changes to tutorial examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2887
2022-10-12 16:21:06 -04:00
Kenneth Moreland
f030a9dbfb Merge topic 'tutorial-edits'
689ba00e4 Minor formatting changes to tutorial examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2887
2022-10-12 16:21:06 -04:00