Commit Graph

7471 Commits

Author SHA1 Message Date
Robert Maynard
b59913fad3 Log CDash build ids from each step of the build process
This can help track down a weird CDash bugs caused by multiple
in-flight builds that get canceled and result in bad CDash
reporting
2020-05-13 15:58:34 -04:00
Vicente Bolea
ba77f36347 Merge topic 'fix-optimizing-threadindices'
d5906eccd add ThreadIndicesTopologyMap optimized specializations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2027
2020-05-12 18:08:32 -04:00
Nick
9d9e332b0d Merge topic 'bov_test'
2fc636c27 Test BOV reader. Fix slow WritePortal().Set(idx, val) loop.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2081
2020-05-12 16:18:44 -04:00
Vicente Adolfo Bolea Sanchez
d5906eccd9 add ThreadIndicesTopologyMap optimized specializations
This commit splits ThreadIndicesTopologyMap into two
different specializations which can be instanciated with the
tags: DefaultScatterAndMaskTag and CustomScatterAndMaskTag.

These specialization will allow ThreadIndicesTopologyMap
instances to avoid holding in memory InputIndex, OutputIndex and ThreadIndex
variables when Mask = MaskNone and Scatter = ScatterIdentity which in this case
are not needed since no transformation are done.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-05-12 13:45:43 -04:00
Robert Maynard
12c29b5529 Merge topic 'dashboard_warnings'
51e600e7e Remove no_discard warnings from unneeded calls of a rng
e17726ad0 Correct implicit signed conversion warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2082
2020-05-12 10:43:32 -04:00
Robert Maynard
51e600e7e2 Remove no_discard warnings from unneeded calls of a rng 2020-05-12 09:38:18 -04:00
Robert Maynard
e17726ad0b Correct implicit signed conversion warnings 2020-05-12 09:38:18 -04:00
NAThompson
2fc636c276 Test BOV reader. Fix slow WritePortal().Set(idx, val) loop. 2020-05-11 17:08:44 -04:00
Nick
990ae4b9a6 Merge topic 'readportalget2'
afe9c2a2b Update UnitTestTimer.cxx
46faf574f ReadPortal().Get(idx) is slow in a loop.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2078
2020-05-08 18:25:14 -04:00
Dave Pugmire
3bb5a6ffed Merge topic 'addUniformDataSet'
bbfdbbb2d Add uniform dataset to data dir.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2079
2020-05-08 16:59:51 -04:00
dpugmire
bbfdbbb2d3 Add uniform dataset to data dir. 2020-05-08 15:45:01 -04:00
Li-Ta Lo
f670103fe6 Merge topic 'marching_cell_wedge'
08da38bd4 use the new VTKDataSetReader
97094cfb8 Merge branch 'master' into marching_cell_wedge
8c0787b5d Merge branch 'master' into marching_cell_wedge
aef44b5c9 change sample input file in unit test
2880be2ea rename sample input for wedge contour
52f0d5b2d Fix MarchingCell for Wedge

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2070
2020-05-08 15:11:35 -04:00
Nick
afe9c2a2b0 Update UnitTestTimer.cxx 2020-05-08 15:00:02 -04:00
Nick
e813ce6844 Merge topic 'typo_fix2'
9da8c8140 Trivial typo fix.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2077
2020-05-08 14:56:04 -04:00
Nick
bc64e91784 Merge topic 'benchmark_units'
b07797f12 Update benchmarking/Benchmarker.h
acc6f3fb0 Apply suggestion to benchmarking/Benchmarker.h
f1f021b51 Default units to milliseconds.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2073
2020-05-08 14:53:54 -04:00
Li-Ta Lo
08da38bd49 use the new VTKDataSetReader 2020-05-08 11:14:47 -06:00
Li-Ta Lo
97094cfb88 Merge branch 'master' into marching_cell_wedge 2020-05-08 09:45:52 -06:00
NAThompson
46faf574fa ReadPortal().Get(idx) is slow in a loop. 2020-05-08 11:30:59 -04:00
Nick
b07797f12b Update benchmarking/Benchmarker.h 2020-05-08 11:17:06 -04:00
Nick
acc6f3fb08 Apply suggestion to benchmarking/Benchmarker.h 2020-05-08 11:17:06 -04:00
NAThompson
f1f021b51d Default units to milliseconds. 2020-05-08 11:17:06 -04:00
NAThompson
9da8c81409 Trivial typo fix. 2020-05-08 10:59:09 -04:00
Kenneth Moreland
dcf5ecdd36 Merge topic 'example-fixes'
1a461594c Do not allow preprocessor directives inside of macro calls
ddf038742 Use finite types when serializing fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2074
2020-05-08 10:34:30 -04:00
Li-Ta Lo
8c0787b5de Merge branch 'master' into marching_cell_wedge 2020-05-07 16:51:35 -06:00
Kenneth Moreland
1a461594c2 Do not allow preprocessor directives inside of macro calls
This actually results in undefined behavior in C/C++. Get around the
problem in this instance by building a string first and then calling the
macro.
2020-05-07 14:01:14 -06:00
Kenneth Moreland
ddf038742d Use finite types when serializing fields
When serializing fields, you have to select what underlying data types
of the field you want to support serializing. With recent changes in the
default policy, attempts to serialize a field often resulted in trying
to use the `vtkm::ListUniversal` type list, which is infinite.
Obviously, this cannot be compiled.

Instead, when the `vtkm::ListUniversal` list is encountered, use
`vtkm::TypeListAll` instead.
2020-05-07 13:58:08 -06:00
Allison Vacanti
07bdef1fdc Merge topic 'portal_from_const_iterators_supports_sets'
2d4d54b17 Remove Set method from const ArrayPortalFromIterators specialization...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2072
2020-05-07 10:13:50 -04:00
Li-Ta Lo
aef44b5c97 change sample input file in unit test 2020-05-05 14:24:21 -06:00
Allison Vacanti
2d4d54b170 Remove Set method from const ArrayPortalFromIterators specialization...
...and add unit test.

Related to !2071, #502.
2020-05-05 13:55:54 -04:00
Nick
de74a96195 Merge topic 'temporal_advection_fix'
34585fdff Fix TemporalAdvection example by removing call to .Set on a ReadPortal().

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2071
2020-05-05 11:57:27 -04:00
Li-Ta Lo
2880be2ea8 rename sample input for wedge contour 2020-05-05 09:29:04 -06:00
Robert Maynard
2151c0a375 Merge topic 'add_windows_shell_ci_worker'
b033b28ef Add a windows10 vs2019 + shell builder
1e5c19a28 ContourTreeUniformAugmented compiles with visual studio + cuda
0ee0bf7cb Correct vtkm/Deprecated.h to work with CUDA and VS2019

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2055
2020-05-05 11:19:46 -04:00
NAThompson
34585fdff5 Fix TemporalAdvection example by removing call to .Set on a ReadPortal(). 2020-05-05 10:23:16 -04:00
Vicente Bolea
cc68cc2d58 Merge topic 'refactor-194-dataset-addfield-replace-dup'
3b55797d4 replaces Dataset fields vector to a map

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2058
2020-05-04 19:25:06 -04:00
Li-Ta Lo
52f0d5b2d5 Fix MarchingCell for Wedge
Fixed error in one entry of number_of_triangles table for MarchineCells that results in missing triangles for wedge cell type as reported by issue #496.
2020-05-04 15:32:41 -06:00
Robert Maynard
b033b28efd Add a windows10 vs2019 + shell builder
In a future merge request will test CUDA support on windows
2020-05-04 12:02:56 -04:00
Robert Maynard
1e5c19a285 ContourTreeUniformAugmented compiles with visual studio + cuda 2020-05-04 12:02:56 -04:00
Robert Maynard
0ee0bf7cb2 Correct vtkm/Deprecated.h to work with CUDA and VS2019 2020-05-04 12:02:56 -04:00
Vicente Adolfo Bolea Sanchez
3b55797d41 replaces Dataset fields vector to a map
This refactor aims to increase the performance of
AddField / Getfield at the expense of memory usage and
some bits of performances when only few fields are used

Moving to non-contiguous memory will impact cpu cache benefits,
however, since each of the Field has again another pointer to
its actual data, this benefits where actually just small.

Also the choice of map v.s. unordered_map is about the number of
elements, very likely few rehashing happenings from until <100

This will also reduce the memory fragmentation caused by vectors.

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
2020-05-01 14:05:03 -04:00
Vicente Bolea
048652e25b Merge topic 'fix-303-remove-opengl-rendering-classes'
48ee2e518 removed classes related to OpenGL/OSMESA/EGL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2010
2020-05-01 13:44:33 -04:00
Robert Maynard
5d1a8e6d05 Merge topic 'ci_test_examples'
33c166790 Make sure merge request ci builds examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2069
2020-05-01 11:02:14 -04:00
Robert Maynard
33c1667904 Make sure merge request ci builds examples 2020-05-01 08:45:50 -04:00
Nick
becb289694 Merge topic 'deprecate_reader'
9a68931c0 Do not add half-baked 1.6 release notes; let Robert consolidate release notes.
01b61be46 Start release notes for 1.6
697369fc1 Remove deprecation warnings throughout the project.
d610176ab First commit demos backwards compatibility and printing of warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2067
2020-05-01 07:53:21 -04:00
NAThompson
9a68931c0b Do not add half-baked 1.6 release notes; let Robert consolidate release notes. 2020-05-01 07:31:35 -04:00
Vicente Adolfo Bolea Sanchez
48ee2e5182 removed classes related to OpenGL/OSMESA/EGL 2020-04-30 18:24:01 -04:00
NAThompson
01b61be464 Start release notes for 1.6 2020-04-30 13:58:06 -04:00
Kenneth Moreland
1c703b94c4 Merge topic 'filter-specifies-own-field-types'
882dcacca Have filter specify its own field types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2064
2020-04-30 10:01:20 -04:00
NAThompson
697369fc14 Remove deprecation warnings throughout the project. 2020-04-30 08:12:04 -04:00
NAThompson
d610176aba First commit demos backwards compatibility and printing of warnings. 2020-04-30 07:37:55 -04:00
Nick
e87e0a4dae Merge topic 'reader_oversegmented'
b82051746 Test that no warnings are generated and tests pass.
20c6e6933 Deprecate writer/ directory.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2065
2020-04-29 14:47:35 -04:00