Commit Graph

5656 Commits

Author SHA1 Message Date
mclarsen
4cd4637c18 ray tracing now using shared pointers for intersectors 2019-02-22 08:06:04 -08:00
Matt Larsen
6b4a4267dc Merge topic 'fix/ray_bench'
53a8fa725 rebuilding everything each time for ray benchmark

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1554
2019-02-21 22:31:12 -05:00
mclarsen
53a8fa7259 rebuilding everything each time for ray benchmark 2019-02-21 15:58:53 -08:00
Matt Larsen
6851077ebb Merge topic 'fix/ExtractStructured'
bccb00df2 allow extract structured to output rectilinear coordinates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1553
2019-02-19 16:44:00 -05:00
mclarsen
bccb00df29 allow extract structured to output rectilinear coordinates 2019-02-19 08:11:09 -08:00
Ben Boeckel
e0c0e4b3da Merge topic 'fix-undef-errors'
e266dcb34 Merge branch 'upstream-taotuple' into fix-undef-errors
c2bd0a710 taotuple 2019-02-14 (b8ca98d2)
5b71c3467 brigand: fix intel check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1551
2019-02-14 16:35:58 -05:00
Ben Boeckel
e266dcb34f Merge branch 'upstream-taotuple' into fix-undef-errors
* upstream-taotuple:
  taotuple 2019-02-14 (b8ca98d2)
2019-02-14 16:29:33 -05:00
TaoCpp Tuple Upstream
c2bd0a710e taotuple 2019-02-14 (b8ca98d2)
Code extracted from:

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

at commit b8ca98d2d3c593a3ee6506a71629d3d92e89d327 (for/vtk-m).
2019-02-14 16:29:33 -05:00
Ben Boeckel
5b71c34675 brigand: fix intel check
This matches the check that CMake uses to detect the Intel compiler. It
also avoids warnings with `-Wundef`.
2019-02-14 16:26:14 -05:00
Haocheng LIU
bdcb76cadb Merge topic 'suppress-more-asan-warnings'
18ba2baf3 Suppress system lib memory leak warnings found by asan

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1550
2019-02-13 13:56:18 -05:00
Haocheng LIU
18ba2baf36 Suppress system lib memory leak warnings found by asan 2019-02-13 13:49:24 -05:00
Haocheng LIU
8699bb9d85 Merge topic 'suppress-loguru-memory-leak'
416586656 Suppress loguru memory leak

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1549
2019-02-12 11:24:33 -05:00
Haocheng LIU
4165866567 Suppress loguru memory leak
Due to a bug in pthread, loguru would leak 12 bytes memory from the main
thread when `loguru::init` is in use. Since GCC does not support
blacklist file, the suppression logic is added to
ctest_memcheck_supp_file file.

See details in loguru github issue #59.
2019-02-12 10:38:48 -05:00
Haocheng LIU
a2c03f2731 Merge topic 'revert-loguru-strdup-fix'
542bb3659 Merge branch 'upstream-loguru' into revert-loguru-strdup-fix
d39a72313 loguru 2019-02-12 (6ab123ef)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1548
2019-02-12 09:55:11 -05:00
Haocheng LIU
542bb36594 Merge branch 'upstream-loguru' into revert-loguru-strdup-fix
* upstream-loguru:
  loguru 2019-02-12 (6ab123ef)
2019-02-12 09:03:55 -05:00
Loguru Upstream
d39a72313c loguru 2019-02-12 (6ab123ef)
Code extracted from:

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

at commit 6ab123efcb343cd7f02793e9e4352651bacf8f5b (for/vtk-m).
2019-02-12 09:03:55 -05:00
Haocheng LIU
858c788244 Merge topic 'free-annotations-in-View'
d19524016 Refactor View class and fix its memory leak

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1546
2019-02-12 08:58:00 -05:00
Haocheng LIU
d195240165 Refactor View class and fix its memory leak 2019-02-11 16:32:27 -05:00
Haocheng LIU
7978f773d5 Merge topic 'fix-loguru-memory-leak'
e3e63ff60 Merge branch 'upstream-loguru' into fix-loguru-memory-leak
81b7d5be5 loguru 2019-02-11 (2569911a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1547
2019-02-11 13:39:39 -05:00
Loguru Upstream
81b7d5be5c loguru 2019-02-11 (2569911a)
Code extracted from:

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

at commit 2569911a3b27d2da1ee04b80cb2e8c8581c4b9e3 (for/vtk-m).
2019-02-11 13:18:19 -05:00
Haocheng LIU
e3e63ff605 Merge branch 'upstream-loguru' into fix-loguru-memory-leak
* upstream-loguru:
  loguru 2019-02-11 (2569911a)
2019-02-11 13:18:19 -05:00
Robert Maynard
5cb45cefa3 Merge topic 'suppress_osx_static_link_warnings'
1ca15bab7 Suppress OSX weak symbol linking warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1545
2019-02-11 10:23:05 -05:00
Robert Maynard
9c644cc9c7 Merge topic 'fix-copyright-check'
d3ab05a7b Fix copyright statement check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1543
2019-02-11 08:37:01 -05:00
Robert Maynard
1ca15bab7d Suppress OSX weak symbol linking warning 2019-02-11 08:36:01 -05:00
Robert Maynard
4c20451606 Merge topic 'add_copyright_to_diy_serialization'
4b0d56e7d Add Copyright to diy/serialization.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1544
2019-02-11 08:32:08 -05:00
Robert Maynard
4b0d56e7d0 Add Copyright to diy/serialization.h 2019-02-11 08:31:14 -05:00
Kenneth Moreland
d3ab05a7b8 Fix copyright statement check
Do not check for the copyright statement for files in the third party
directory. These files shouldn't have the VTK-m copyright. Frankly, I
don't understand why this has not been a problem before.
2019-02-10 03:02:57 -07:00
Dave Pugmire
b59df302e5 Merge topic 'AddGhostZone2'
bebbd92e3 Filter for adding ghost zones.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1540
2019-02-09 16:27:16 -05:00
Robert Maynard
421c354fee Merge topic 'diy_conditional_serialization'
451bff6f1 vtkmdiy: Use the new mangled VTKM_DIY_ defines
7d307b96c Merge branch 'upstream-diy' into diy_conditional_serialization
0adcc4d45 diy 2019-02-08 (72a201e1)
74acc2a7b vtkmdiy: Support only including the serialization headers of diy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !1541
2019-02-08 19:30:49 -05:00
Robert Maynard
451bff6f14 vtkmdiy: Use the new mangled VTKM_DIY_ defines 2019-02-08 14:31:34 -05:00
Robert Maynard
7d307b96ce Merge branch 'upstream-diy' into diy_conditional_serialization
* upstream-diy:
  diy 2019-02-08 (72a201e1)
2019-02-08 14:25:51 -05:00
Diy Upstream
0adcc4d456 diy 2019-02-08 (72a201e1)
Code extracted from:

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

at commit 72a201e1d5f8e35c9e28b66ce9faa34dd5365680 (for/vtk-m).
2019-02-08 14:25:51 -05:00
Robert Maynard
74acc2a7bb vtkmdiy: Support only including the serialization headers of diy 2019-02-08 11:40:59 -05:00
Dave Pugmire
bebbd92e32 Filter for adding ghost zones. 2019-02-07 15:26:20 -05:00
Haocheng LIU
4e1fd2892c Merge topic 'fix-Timer-example-compile-error'
6e6968d97 Fix diy include and Timer construction errors in examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1539
2019-02-06 17:10:33 -05:00
Haocheng LIU
6e6968d97f Fix diy include and Timer construction errors in examples 2019-02-06 15:28:09 -05:00
Robert Maynard
2ad330802e Merge topic 'diy_dont_clobber_macro'
ad98d818c VTK-m now doesn't clobber external DIY installations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !1538
2019-02-06 08:20:07 -05:00
Robert Maynard
ad98d818ce VTK-m now doesn't clobber external DIY installations
Fixes #334
2019-02-05 13:05:14 -05:00
Robert Maynard
6b3f60ee86 Merge topic 'remove_check_build_test'
4b47a4d92 Remove VTKmCheckSourceInBuild
45c24109a Add changelog for VTKmCheckSourceInInstall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1537
2019-02-05 12:58:35 -05:00
Haocheng LIU
0696ae135e Merge topic 'asynchronize-timer'
415252c66 Introduce asynchronous and device independent timer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU <haocheng.liu@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1530
2019-02-05 12:02:59 -05:00
Haocheng LIU
415252c662 Introduce asynchronous and device independent timer
The timer class now is asynchronous and device independent. it's using an
similiar API as vtkOpenGLRenderTimer with Start(), Stop(), Reset(), Ready(),
and GetElapsedTime() function. For convenience and backward compability, Each
Start() function call will call Reset() internally and each GetElapsedTime()
function call will call Stop() function if it hasn't been called yet for keeping
backward compatibility purpose.

Bascially it can be used in two modes:

* Create a Timer without any device info. vtkm::cont::Timer time;

  * It would enable timers for all enabled devices on the machine. Users can get a
specific elapsed time by passing a device id into the GetElapsedtime function.
If no device is provided, it would pick the maximum of all timer results - the
logic behind this decision is that if cuda is disabled, openmp, serial and tbb
roughly give the same results; if cuda is enabled it's safe to return the
maximum elapsed time since users are more interested in the device execution
time rather than the kernal launch time. The Ready function can be handy here
to query the status of the timer.

* Create a Timer with a device id. vtkm::cont::Timer time((vtkm::cont::DeviceAdapterTagCuda()));

  * It works as the old timer that times for a specific device id.
2019-02-05 12:01:56 -05:00
Robert Maynard
9a94c8c59d Merge topic 'handle_busy_cuda_device_better'
d0a70946b Simplify the DeviceAdapterRuntimeDetectorCuda to not do a kernel launch.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1533
2019-02-04 17:43:43 -05:00
Robert Maynard
d0a70946b8 Simplify the DeviceAdapterRuntimeDetectorCuda to not do a kernel launch.
The kernel launch component of the runtime device adapter is fairly
pointless. If the hardware supports CUDA we should expect that
VTK-m has the correct kernel versions.

Plus in the original version if the CUDA device was being used
and the kernel launch returns cudaErrorDevicesUnavailable it
was never possible to restore CUDA support. Now what happens
is that the runtime tracker is marked as failed, but the
calling code can always go back and trying the device again.
2019-02-04 13:27:20 -05:00
Robert Maynard
4b47a4d92c Remove VTKmCheckSourceInBuild 2019-02-04 12:09:35 -05:00
Robert Maynard
45c24109af Add changelog for VTKmCheckSourceInInstall 2019-02-04 12:09:25 -05:00
Haocheng LIU
610bfc21ee Merge topic 'enable-pthread-with-logging-on'
6107f548b Link pthread when logging is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1535
2019-01-31 11:07:27 -05:00
Haocheng LIU
6107f548b1 Link pthread when logging is enabled 2019-01-30 16:34:58 -05:00
Robert Maynard
bcb347bf97 Merge topic 'test_vtkm_install'
9580b1921 Introduces SourceInInstall which verifies that VTK-m install its headers
c501500e1 Install missing headers found by VTKmCheckSourceInInstall
baaa47af4 Reduce verbosity of VTKmCheckCopyright
545a2ce91 VTKmCheckSourceInBuild now shows all missing files in a directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !1532
2019-01-29 17:27:09 -05:00
Robert Maynard
9580b1921e Introduces SourceInInstall which verifies that VTK-m install its headers
Fixes #342
2019-01-29 16:48:35 -05:00
Robert Maynard
c501500e1d Install missing headers found by VTKmCheckSourceInInstall 2019-01-29 14:46:27 -05:00