Commit Graph

9107 Commits

Author SHA1 Message Date
Kenneth Moreland
3be3529ff3 Export tbb interface as vtkm::tbb
The dependent exports should be placed in the vtkm namespace.
2021-06-10 10:54:46 -06:00
Kenneth Moreland
a8825db59a Disable loading the TBBConfig.cmake file
Sourcing the file installed on dragnipur is causing a CMake error. I
don't know if it is an install error or a problem with FindTBB.cmake,
but this should get around the problem by just using the "old" method
for finding TBB.
2021-06-10 10:39:19 -06:00
Kenneth Moreland
5eb688da2a Update parallel radix sort for OpenMP
Some changes required for TBB bled into the implementation of OpenMP.
2021-06-10 10:39:18 -06:00
Kenneth Moreland
1eea0bee12 Use TBB task_group for radix sort
TBB 2020 introduced a new class called `task_group`. TBB 2021 removed
the old class `task` as its functionality was replaced by `task_group`.
Our parallel radix sort for TBB was implemented using `task`s, so change
it to use `task_group` (which actually cleans up the code a bit).
2021-06-10 10:39:13 -06:00
Kenneth Moreland
9d5d9e38a1 Remove testing headers from benchmarking
The code in `vtkm/cont/Testing.h` now requires a library, which is not
built if testing is not built. Thus, the benchmarking code was giving a
compile error if benchmarking was on but testing was off.

Change the benchmarking to not rely on anything in the Testing
framework. This means using classes in `vtkm/source` instead of
`MakeTestData`. Also avoid using the `TestValue` defined for the tests.
(In one case, we have a simple replacement.) Also had to fix a problem
with a header file not defining everything it needed to compile.
2021-06-10 09:41:26 -06:00
Kenneth Moreland
904e784e89 Remove TBB parallel_sort patch
Years ago we discovered a problem with TBB's parallel sort, which we
patch in our local repo and submitted a change to TBB, which has been
accepted.

The code to decide whether to use our parallel_sort patch does not work
with the latest versions of TBB because it requires including a header
that changed names to get the TBB version.

We no longer support any TBB version with this bug, so just remove the
patch from VTK-m.
2021-06-10 09:18:08 -06:00
Kenneth Moreland
0390c8b079 Pull FindTBB.cmake from VTK
The latest version of TBB changes the include directory where the
version is stored, so the old version of FindTBB.cmake would fail
because it could not open this file. This issue has already been fixed
by the FindTBB.cmake in VTK, so pull the latest version of that.
2021-06-10 09:12:24 -06:00
Dave Pugmire
3bd15950bd Clarify dimension values for 2d, 1d. fix test 2021-06-09 16:16:34 -04:00
Dave Pugmire
651345b491 cleanup included headers. 2021-06-09 14:02:42 -04:00
Dave Pugmire
aaa6855a6f Clean the code up a little. 2021-06-09 13:58:27 -04:00
Dave Pugmire
3588209562 Add helper class to build curvilinear datasets. 2021-06-09 13:50:01 -04:00
Ben Boeckel
65ad7b3721 Merge topic 'set-lfs-url-gl'
5288bb896 lfs: set default url to gitlab repo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2506
2021-06-02 19:43:43 -04:00
Ben Boeckel
7e576483cb Merge topic 'cmake-guard-testing-directories'
b719911d1 cmake: use `if (TEST)` to detect tests that are enabled
4c7fe13a9 cmake: avoid adding testing directories if testing is disabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2508
2021-06-02 18:05:59 -04:00
Sujin Philip
749e972772 Merge topic 'add-slice-filter'
d1b22046e Add Slice filter and tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2501
2021-06-02 09:38:27 -04:00
Ben Boeckel
b719911d1b cmake: use if (TEST) to detect tests that are enabled
It's just simpler in this case.
2021-06-01 18:40:46 -04:00
Ben Boeckel
4c7fe13a98 cmake: avoid adding testing directories if testing is disabled
Some testing directories have side effects such as installing headers or
compiling code that ultimately doesn't end up getting used.
2021-06-01 18:40:40 -04:00
Vicente Bolea
0282a875eb Merge topic 'add-update-diy'
9bcf78b83 diy: update tag
9c267d177 Merge branch 'upstream-diy' into add-update-diy
fba17abf9 diy 2021-05-26 (b21d798e)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2505
2021-06-01 17:33:17 -04:00
Vicente Adolfo Bolea Sanchez
9bcf78b830 diy: update tag 2021-06-01 10:33:46 -04:00
Vicente Adolfo Bolea Sanchez
9c267d1770 Merge branch 'upstream-diy' into add-update-diy
# By Diy Upstream
* upstream-diy:
  diy 2021-05-26 (b21d798e)
2021-06-01 10:33:30 -04:00
Diy Upstream
fba17abf93 diy 2021-05-26 (b21d798e)
Code extracted from:

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

at commit b21d798e1a1dc3712a15c4803f1c70941c996bbc (for/vtk-m-20210531-master).
2021-06-01 10:33:30 -04:00
Vicente Bolea
7bee0f344f Merge branch 'release' 2021-06-01 10:21:03 -04:00
Vicente Bolea
92294a14b4 Merge topic 'update-to-v1.6.0'
13a117e0e 1.6.0 is our 8th official release of VTK-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2507
2021-06-01 10:21:03 -04:00
Vicente Adolfo Bolea Sanchez
13a117e0e8 1.6.0 is our 8th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/1.6/release-notes.md

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
v1.6.0
2021-05-28 17:38:09 -04:00
Vicente Adolfo Bolea Sanchez
5288bb896e lfs: set default url to gitlab repo
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2021-05-28 16:33:02 -04:00
Vicente Bolea
4da290ea11 Merge branch 'release' into master 2021-05-28 12:21:43 -04:00
Vicente Bolea
a13347ca96 Merge topic 'enable-ci-release' into release
c1b57550d CI: Enable default builds in release commits

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2502
2021-05-28 12:21:43 -04:00
Vicente Adolfo Bolea Sanchez
c1b57550d5 CI: Enable default builds in release commits 2021-05-28 11:53:01 -04:00
Sujin Philip
d1b22046eb Add Slice filter and tests 2021-05-28 11:35:51 -04:00
Vicente Bolea
3dbc8a2663 Merge branch 'release' into master 2021-05-27 16:38:51 -04:00
Vicente Bolea
bb35e7baa1 Merge topic 'backport-missed-mrs-v1.6.0' into release
50a755b09 Merge topic 'add-cdash-release-track' into backport-missed-mrs-v1.6.0
af9e546fa Merge topic 'fix-599-ci-add-benchmark-job' into backport-missed-mrs-v1.6.0
7aa0a5402 CI: Add release track in cdash
f4386cfb8 CI: adds ubuntu1804 build with benchmarks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2500
2021-05-27 16:38:51 -04:00
Vicente Adolfo Bolea Sanchez
50a755b09f Merge topic 'add-cdash-release-track' into backport-missed-mrs-v1.6.0
Merge-request: !2470
2021-05-27 15:01:26 -04:00
Vicente Adolfo Bolea Sanchez
af9e546faa Merge topic 'fix-599-ci-add-benchmark-job' into backport-missed-mrs-v1.6.0
Merge-request: !2406
2021-05-27 15:01:26 -04:00
Vicente Adolfo Bolea Sanchez
7aa0a54029 CI: Add release track in cdash
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
(cherry picked from commit 3a89b477f17983a2e0e68cf77ae5fbe25a96ce0f)
2021-05-27 15:01:26 -04:00
Vicente Adolfo Bolea Sanchez
f4386cfb86 CI: adds ubuntu1804 build with benchmarks
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
(cherry picked from commit d4cfe340096c2269197bedaa65ae45d734257ae5)
2021-05-27 15:01:26 -04:00
Vicente Bolea
4a3c3c5e86 Merge branch 'release' 2021-05-25 15:36:12 -04:00
Vicente Bolea
908b0a83ea Merge topic 'update-to-v1.6.0-rc2'
1cf9ebd5f 1.6.0-rc2 is our Nth official release of VTK-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2497
2021-05-25 15:36:12 -04:00
Vicente Adolfo Bolea Sanchez
1cf9ebd5f0 1.6.0-rc2 is our Nth official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/1.6/release-notes.md

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
v1.6.0-rc2
2021-05-25 14:58:25 -04:00
Vicente Bolea
3b446cc1f8 Merge branch 'release' into master 2021-05-25 14:54:04 -04:00
Vicente Bolea
b0030482bf Merge topic 'backport-fix-fetcht-tags' into release
a5b9baf2b CI: Fetch main repo tags from forks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2496
2021-05-25 14:54:04 -04:00
Vicente Adolfo Bolea Sanchez
a5b9baf2b2 CI: Fetch main repo tags from forks
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
(cherry picked from commit 6a041f6c619ee8c028ceb6db29ab423958d9816e)
2021-05-25 13:40:27 -04:00
Ben Boeckel
73db99d31a Merge topic 'add-release-config'
8dcac290d CI: adds .kitware-release.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2494
2021-05-25 11:31:27 -04:00
Vicente Adolfo Bolea Sanchez
8dcac290d2 CI: adds .kitware-release.json
(cherry picked from commit b14a5e7abe552d7501ca29a6e581112a46725711)
2021-05-24 18:26:39 -04:00
Vicente Bolea
1fcae770d3 Merge topic 'add-kitware-release-json' into release
b14a5e7ab CI: adds .kitware-release.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2492
2021-05-20 21:09:55 -04:00
Vicente Bolea
a38fdd4e4e Merge branch 'release' into master 2021-05-20 21:09:55 -04:00
Vicente Adolfo Bolea Sanchez
b14a5e7abe CI: adds .kitware-release.json 2021-05-19 21:09:47 -04:00
Sujin Philip
0a401c2ace Merge topic 'fix-dataset-reader'
57f516811 Support reading Global and Pedigree ids
a01e4335d Support reading new format cells
d7b2fec44 Fix reading of string arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2490
2021-05-17 12:52:41 -04:00
Sujin Philip
57f5168114 Support reading Global and Pedigree ids 2021-05-17 09:52:21 -04:00
Sujin Philip
a01e4335d2 Support reading new format cells 2021-05-17 09:51:21 -04:00
Sujin Philip
d7b2fec447 Fix reading of string arrays 2021-05-17 09:51:12 -04:00
Kenneth Moreland
560ed9b2f6 Merge topic 'common-storage-in-vtk-xgc-types'
e0abb3981 Unify common storage types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2491
2021-05-13 12:55:39 -04:00