Commit Graph

6699 Commits

Author SHA1 Message Date
Allison Vacanti
e110de0486 Merge topic 'oliver_parallel'
627cdc99b Fix host/device flags.
7148ab342 Fix type conversion warning when `size_t` differs from `vtkm::Id`.
1d9f6b37c Add support for boundary augmentation for MPI optimization
2a1e1dcfd Parallel Contour Tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1737
2019-09-13 09:58:24 -04:00
Robert Maynard
6c6c05fb97 Merge topic 'fix-gcc-4-8-ice'
785f7994c Fix VecTraits internal compile errors with GCC 4.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1845
2019-09-13 08:11:26 -04:00
Kenneth Moreland
785f7994c7 Fix VecTraits internal compile errors with GCC 4.8
GCC 4.8 seems to have issues with the templated using statements
in VecTraits. Hopefully this change works around that problem.
2019-09-12 18:12:02 -06:00
Nickolas Davis
234d1ac751 Merge topic 'fix-unit-test-error'
adb6bc4c3 Change StackTrace failure condition in UnitTestError.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1840
2019-09-12 17:37:49 -04:00
Allison Vacanti
1a63ebe2b3 Merge topic 'doc_updates'
024b8a306 Fix formatting of CodingConventions.md.
48c31b57a Bump clang version to 5.0.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1841
2019-09-12 16:00:52 -04:00
Allison Vacanti
024b8a3067 Fix formatting of CodingConventions.md.
The current page has some issue:

https://gitlab.kitware.com/vtk/vtk-m/blob/master/docs/CodingConventions.md
2019-09-12 15:16:30 -04:00
Allison Vacanti
48c31b57a2 Bump clang version to 5.0.
This is the minimum required by our minimum supported CUDA version.
2019-09-12 15:14:03 -04:00
Allison Vacanti
627cdc99b7 Fix host/device flags.
ArrayHandles don't exist in the execution environment, and functions
that use them must be marked `VTKM_CONT`.
2019-09-12 14:54:44 -04:00
Nickolas Davis
adb6bc4c37 Change StackTrace failure condition in UnitTestError.cxx 2019-09-12 14:37:55 -04:00
Allison Vacanti
7148ab3425 Fix type conversion warning when size_t differs from vtkm::Id. 2019-09-12 13:56:43 -04:00
Oliver Ruebel
1d9f6b37cf Add support for boundary augmentation for MPI optimization 2019-09-12 12:26:01 -04:00
Sujin Philip
2a1e1dcfd9 Parallel Contour Tree
This work updates Gunther Contour tree work to be parallel.
With contributions from: @oruebel, @dcamp and @sujin.philip.
2019-09-12 12:17:37 -04:00
Li-Ta Lo
d8cbc990f5 Merge topic 'tangle_source'
05b679250 Merge branch 'master' into tangle_source
a6c044df9 added changelog
0d818701c put VTKM_SOURCE_EXPORT in .cxx
e0aae7d86 remove EXPORT from .cxx
4d7de67ee use VTKM_SOURCE_EXPORT
cd49136d5 add copyright notice, add installation of header
0c094a568 used the Tangle source
aeb8877a9 add newline at EOF, minor change based review
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1804
2019-09-12 11:18:52 -04:00
Nickolas Davis
864d8bd5ea Merge topic '394-logging-cleanup'
e3ab59fb2 limit the count to the actual number of function calls
b71421c8a have Run() take int references (so that multiple calls with argc will allow loguru to correctly modify the value)
cc86740c9 bad whitespace fix
8917bbe72 Supply the default log level only through cmake args
a0b164b42 remove static var, directly init logging to INFO level for testing inside Run Function
374989fc2 remove duplicate include
325c75fd7 store What as a member var
ede1f7832 something is still fishy
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1774
2019-09-11 18:40:19 -04:00
nadavi
e3ab59fb2f limit the count to the actual number of function calls 2019-09-11 16:12:18 -06:00
nadavi
b71421c8a0 have Run() take int references (so that multiple calls with argc will allow loguru to correctly modify the value) 2019-09-11 16:12:18 -06:00
nadavi
cc86740c9a bad whitespace fix 2019-09-11 16:12:18 -06:00
nadavi
8917bbe72b Supply the default log level only through cmake args 2019-09-11 16:12:18 -06:00
nadavi
a0b164b42c remove static var, directly init logging to INFO level for testing inside Run Function 2019-09-11 16:12:18 -06:00
nadavi
374989fc2c remove duplicate include 2019-09-11 16:12:18 -06:00
nadavi
325c75fd70 store What as a member var 2019-09-11 16:12:18 -06:00
nadavi
ede1f78323 something is still fishy 2019-09-11 16:12:18 -06:00
nadavi
ac0faa3d97 different strack traces for different machines 2019-09-11 16:12:18 -06:00
nadavi
effef1b6ec make copyright exceptions found message more clear 2019-09-11 16:12:18 -06:00
nadavi
a7aae5fc3c rely solely on the SetStderrLogLevel function call instead of manually passing in -v flag 2019-09-11 16:12:18 -06:00
nadavi
3449f2dfb7 fix warning, only declare variable if logging is set 2019-09-11 16:12:18 -06:00
nadavi
7d8158301b something was overwritten... 2019-09-11 16:12:18 -06:00
nadavi
3a81321b16 formatting 2019-09-11 16:12:18 -06:00
nadavi
9f49bbab86 additional cmake fixes, improve default log level setting 2019-09-11 16:12:18 -06:00
nadavi
1fc542d068 add simple unit tests for Error 2019-09-11 16:12:18 -06:00
nadavi
d2d98dc5e0 Supply default logging level of INFO for tests 2019-09-11 16:12:18 -06:00
Nick Davis
f9a1afee69 store StackTrace in Error 2019-09-11 16:12:18 -06:00
Nick Davis
7562949075 Turned on Logging by default, set to WARNING level 2019-09-11 16:12:18 -06:00
Robert Maynard
fc28908788 Merge topic 'vtkm_supports_dropping_unused_symbols'
1bfcce19d VTK-m builds with separate function sections to allow smaller binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1831
2019-09-11 15:12:36 -04:00
Dave Pugmire
c98a06071a Merge topic 'particleAdvectionFloatType'
58a587a7f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particleAdvectionFloatType
a83629e95 compile error.
52fe3c403 compile warnings.
5af465efd Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particleAdvectionFloatType
bd9bc91ac Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particleAdvectionFloatType
c057f6b83 Merge branch 'particleAdvectionFloatType' of gitlab.kitware.com:dpugmire/vtk-m into particleAdvectionFloatType
9ca4cc2d0 type cleanup.
dff384572 Use vtkm::FloatDefault for particle advection code.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1827
2019-09-11 14:59:56 -04:00
Allison Vacanti
f8c60bd958 Merge topic '412_ArrayHandleDecorator'
885cce391 Add ArrayPortalDecorator.
29ea46fa5 Refactor IsWritableArrayHandle to use PortalSupportsSets.
dc98517b9 Clean up ArrayHandleCounting.
0dad55a04 Remove return statements in functions that return void.
abdd458b8 Remove unused member variable in Algorithm functor.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1828
2019-09-11 14:34:57 -04:00
Li-Ta Lo
05b6792500 Merge branch 'master' into tangle_source 2019-09-11 12:06:58 -06:00
Robert Maynard
1bfcce19dd VTK-m builds with separate function sections to allow smaller binaries
Consumers of VTK-m when enabling of dropping of unused functions
will see VTK-m functions dropped. Previously this didn't happen
as VTK-m didn't build object files with the correct flags for this.

By allowing the linker to remove unused symbols we see a significant
saving the file size of VTK-m tests, examples, and benchmarks.
An OpenMP build of the tests and benchmarks goes from 168MB to
141MB which is roughly a 16% filesize reduction.

Initially I had presumed that these changes would increase link times.
But in measurements the total wall time for compilation of VTK-m has
stayed about the same ( seeing a decrease of 1.5% ). Presumably the
increased computation is offset by the reduction in file writing.
2019-09-11 13:34:25 -04:00
Robert Maynard
d7ecf2241a Merge topic 'vtkm_add_target_information_support_multiple_targets'
e37c2061c vtkm_add_target_information now supports multiple targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1838
2019-09-11 13:33:16 -04:00
Robert Maynard
f139d07c89 Merge topic 'rework_ghost_cell_classify_alg'
8c3a8da99 GhostCellClassify now more efficient as it uses WorkletPointNeighborhood

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1835
2019-09-11 13:06:21 -04:00
Allison Vacanti
885cce3914 Add ArrayPortalDecorator. 2019-09-11 12:50:59 -04:00
Allison Vacanti
29ea46fa52 Refactor IsWritableArrayHandle to use PortalSupportsSets. 2019-09-11 12:50:17 -04:00
Allison Vacanti
dc98517b98 Clean up ArrayHandleCounting.
- Remove Set method (fixes IsWritableArrayHandle check)
- s/ConstantValueType/ValueType/, looks like a copy/paste error.
2019-09-11 12:50:17 -04:00
Allison Vacanti
0dad55a042 Remove return statements in functions that return void. 2019-09-11 12:50:17 -04:00
Allison Vacanti
abdd458b8f Remove unused member variable in Algorithm functor. 2019-09-11 12:50:17 -04:00
Li-Ta Lo
a6c044df9a added changelog 2019-09-11 10:19:54 -06:00
Robert Maynard
ff4f4c8f6b Merge topic 'correct_ubsan_undefined_behavior'
c4e1262e1 Correct symbol visibility issues found by ubsan testing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1837
2019-09-11 12:02:33 -04:00
Dave Pugmire
58a587a7f6 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particleAdvectionFloatType 2019-09-11 10:38:22 -04:00
Robert Maynard
8c3a8da99b GhostCellClassify now more efficient as it uses WorkletPointNeighborhood
By using the dual of the cellset we can quickly compute the GhostCells
of structured data using WorkletPointNeighborhood boundary condition
object

Using a 1024x1024x512 test grid we see the following perf:

Master Serial : 5.658144 sec
This MR Serial: 0.519684 sec

Master OpenMP : 0.532256 sec
This MR OpenMP: 0.080604 sec
2019-09-11 10:06:45 -04:00
Robert Maynard
e37c2061cf vtkm_add_target_information now supports multiple targets
Instead of having to be called for each target you can now
pass multiple targets at once. Do note that if you pass multiple
targets you will need to pass all the sources from those targets
that need to be 'device' compiled.
2019-09-11 09:17:52 -04:00