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
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 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
Vicente Bolea
820461b046
Merge topic 'pick-sampling-2d' into release
...
ed8d2fb35 Merge branch 'master' into alpine_sampling_2d
93b8ee97d Pasing range explicitly to NDHistogram worklet for ALPINE 2D sampling milestone
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2257
c63bf12f1 Merge topic 'alpine_sampling_2d'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2478
2021-05-13 12:30:00 -04:00
Vicente Bolea
f6fea89243
Merge branch 'release' into master
2021-05-13 12:30:00 -04:00
Kenneth Moreland
e0abb39810
Unify common storage types
...
The list defining the common storage types was defined in
DefaultTypes.h.in. The problem was that derived default types could not
just add their own type. They had to redefine the whole list.
Instead, move the list to StorageList.h. Also updated
DefaultTypesVTK.h.in to use this list when using XGC. This enables
ArrayHandleSOA for this case.
2021-05-13 08:18:33 -06:00
Nickolas Davis
c4117ede8a
Merge topic 'prefix-cmd-line-args'
...
968c66f94 add TODO to update kokkos initialize
18d7827db update vtkm test arguments
5fa8734bb update vtkm initialize flags to have 'vtkm' prefix and deprecate old flags
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2456
2021-05-12 09:57:47 -04:00
Sujin Philip
e97d72a528
Merge topic 'getfield-const'
...
7972070d7 PartitionedDataSet GetField should be const
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2488
2021-05-04 10:44:22 -04:00
Sujin Philip
7972070d7c
PartitionedDataSet GetField should be const
2021-04-30 16:27:58 -04:00
Vicente Bolea
85a1f7c528
Merge topic 'add-cdash-release-track'
...
3a89b477f CI: Add release track in cdash
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2470
2021-04-29 17:39:16 -04:00
Vicente Adolfo Bolea Sanchez
3a89b477f1
CI: Add release track in cdash
...
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2021-04-29 16:15:23 -04:00
Kenneth Moreland
68814a22db
Merge topic 'all-virtual-deprecated'
...
8eed21d08 Do not declare headers for virtual classes that are removed
cb3bb43ff Completely deprecate virtual methods
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nickolas Davis <nadavi@sandia.gov>
Merge-request: !2484
2021-04-28 21:45:23 -04:00
nadavi
968c66f949
add TODO to update kokkos initialize
2021-04-29 00:58:50 +00:00
nadavi
18d7827db7
update vtkm test arguments
2021-04-29 00:58:50 +00:00
nadavi
5fa8734bbc
update vtkm initialize flags to have 'vtkm' prefix and deprecate old flags
2021-04-29 00:58:50 +00:00
Vicente Bolea
57ed612aea
Merge topic 'update-cmake-tag-test'
...
6a041f6c6 CI: Fetch main repo tags from forks
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2477
2021-04-28 19:56:18 -04:00
Kenneth Moreland
8eed21d085
Do not declare headers for virtual classes that are removed
2021-04-28 15:28:06 -06:00
Kenneth Moreland
cb3bb43ff9
Completely deprecate virtual methods
...
Deprecate `VirtualObjectHandle` and all other classes that are used to
implement objects with virtual methods in the execution environment.
Additionally, the code is updated so that if the
`VTKm_NO_DEPRECATED_VIRTUAL` flag is set none of the code is compiled at
all. This opens us up to opportunities that do not work with virtual
methods such as backends that do not support virtual methods and dynamic
libraries for CUDA.
2021-04-28 07:28:32 -06:00
Kenneth Moreland
8d7edb4615
Merge topic 'msvc2017-no-deprecated'
...
e3e1a7607 Disable deprecation for MSVC 2017
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2485
2021-04-28 09:25:58 -04:00