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
Matt Larsen
9d2340ce10
Merge branch 'release' into master
2021-04-27 17:24:22 -04:00
Matt Larsen
0d3d03b267
Merge topic 'init_ray_status_release' into release
...
c5cf81864 add status init to rays
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2486
2021-04-27 17:24:21 -04:00
Matt Larsen
c5cf81864f
add status init to rays
2021-04-27 13:18:37 -07:00
Kenneth Moreland
e3e1a76072
Disable deprecation for MSVC 2017
...
Although technically supported, this version of the visual studio likes
to put the warnings where templates are defined (rather than
instantiated). That makes it impossible to suppress a warning when, for
example, when a deprecated class is legitmately used in an std template
to implement other deprecated functionality.
To prevent this, disable deprecations on MSVC compilers before 2019. I
doubt any developers are using this compiler anywhere but the dashboard,
and the warnings should legitimately appear elsewhere.
2021-04-26 12:47:44 -06:00
Vicente Adolfo Bolea Sanchez
6a041f6c61
CI: Fetch main repo tags from forks
...
Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2021-04-23 20:25:18 -04:00
Li-Ta Lo
9c54941d2b
Merge topic 'particle_density_cell_set'
...
e76387373 explicitly cast cell set to structured 3D to supress warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2483
2021-04-23 13:49:09 -04:00
Li-Ta Lo
e763873739
explicitly cast cell set to structured 3D to supress warnings
2021-04-23 09:48:29 -06:00
Nick Thompson
3c8e160229
Merge topic 'NAThompson-master-patch-56961'
...
25c14a7ea Fix uninitialized variable warning on gcc-10.3
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nickolas Davis <nadavi@sandia.gov>
Merge-request: !2482
2021-04-21 14:25:56 -04:00
Nick Thompson
25c14a7ea9
Fix uninitialized variable warning on gcc-10.3
2021-04-21 16:31:31 +00:00
Nick Thompson
4f3ff257fa
Merge topic 'NAThompson-master-patch-83719'
...
9f1ef651c Update UnitTestError.cxx
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2481
2021-04-17 16:29:55 -04:00
Nick Thompson
9f1ef651c4
Update UnitTestError.cxx
2021-04-16 17:46:43 +00:00
Nick Thompson
9d46f7981d
Merge topic 'print_particle'
...
7e7d41a73 Make sure to #include<ostream>
dee5d209d Overload stream operator to print vtkm::Particle.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2479
2021-04-15 10:14:43 -04:00
Kenneth Moreland
237aff05e6
Merge topic 'rendering-mesh-conn-no-virtual'
...
6b144abe4 Remove virtual methods from MeshConnectivity in rendering
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2464
2021-04-15 10:09:24 -04:00
Nick Thompson
7e7d41a730
Make sure to #include<ostream>
2021-04-15 09:19:55 -04:00
Nick Thompson
dee5d209d4
Overload stream operator to print vtkm::Particle.
2021-04-15 08:36:53 -04:00
Li-Ta Lo
c63bf12f19
Merge topic 'alpine_sampling_2d'
...
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
2021-04-14 13:49:06 -04:00
Nick Thompson
4df064f379
Merge topic 'meaningless_diff'
...
82361fc45 Better message on failure for DifferenceOfProducts.
384fea5ce Make sure arguments are placed in correct order.
cddb6f7b6 Do not flush the stream when you're just going to convert it to string.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2474
2021-04-13 21:28:57 -04:00
Nick Thompson
82361fc45e
Better message on failure for DifferenceOfProducts.
2021-04-13 19:09:55 -04:00
Nick Thompson
384fea5ced
Make sure arguments are placed in correct order.
2021-04-13 16:00:23 -04:00
Nick Thompson
cddb6f7b6d
Do not flush the stream when you're just going to convert it to string.
2021-04-13 14:37:20 -04:00
Nick Thompson
294624adf5
Merge topic 'fix_testerror'
...
794872eb0 Fix error in unit test.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2472
2021-04-13 12:45:59 -04:00