Commit Graph

6011 Commits

Author SHA1 Message Date
Robert Maynard
674fe1fbf2 StealArray now returns the array and free function as a Pair.
This helps reduces bugs when the callers ask to steal arrays
without getting the free function, or ask for the free function
after stealing the array.
2019-05-01 09:42:57 -04:00
Robert Maynard
75bf9d361c Merge topic 'testing_device_adapter_remove_array_manager_execution_usage'
065d11783 Testing Device Adapter now uses ArrayHandle for all device transfers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1651
2019-05-01 08:22:10 -04:00
Robert Maynard
a896f77988 Merge topic 'warnings_gcc_64'
3dda0ab2d Correct unused-parameter warnings from defaulted methods.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1663
2019-05-01 08:19:30 -04:00
Robert Maynard
065d117838 Testing Device Adapter now uses ArrayHandle for all device transfers
The consistent API for control to execution memory transfers is
the ArrayHandle class. Previously the tests would verify memory
transfer by calling the ArrayManagerExecution class directly. This
is problematic as the class isn't used by ArrayHandle<T, StorageBasic>.
2019-04-30 13:50:08 -04:00
Robert Maynard
3dda0ab2d6 Correct unused-parameter warnings from defaulted methods.
GCC 6 warns about defaulted methods when parameters have names.
2019-04-30 13:12:32 -04:00
Robert Maynard
a3df54017b Merge topic 'correct_leaks_found_by_asan'
27426b7bc Fix warnings found with clang-8 inside the OpenMP device adapter.
cec9af64b Update the lsan suppression to capture tbb leaks.
8ef2c4be7 TransferInfo doesn't leak when holding VirtualObjectTransferShareWithControl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1661
2019-04-30 08:17:38 -04:00
Robert Maynard
f3c038f6e0 Merge topic 'mark_more_methods_as_control_side_only'
d468784f0 Correct more host/device warnings from methods that should be host only

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1660
2019-04-29 17:12:18 -04:00
Robert Maynard
27426b7bcc Fix warnings found with clang-8 inside the OpenMP device adapter. 2019-04-29 17:05:10 -04:00
Robert Maynard
cec9af64b1 Update the lsan suppression to capture tbb leaks.
Additionally document that we only want to suppress the known
leak in loguru::set_thread_name.
2019-04-29 17:04:15 -04:00
Robert Maynard
8ef2c4be72 TransferInfo doesn't leak when holding VirtualObjectTransferShareWithControl
When TransferInfo is given memory from VirtualObjectTransferShareWithControl
it doesn't have a bound function ptr for the destruction. In those cases
we need to make sure the HostCopyOfDevice is properly deleted, otherwise
we will cause a memory leak.
2019-04-29 15:51:19 -04:00
Robert Maynard
33a30299d7 Merge topic 'more_minor_style_and_export_corrections'
bdabfbe11 Make sure ArrayPortalUniformPointCoordinates constructor is explicit
b3d951b50 vtkm::Range Include function now requires half as many min/max calls
ddaa0df26 ArrayHandleVirtualCoordinates now calls the proper parent constructor
61e800379 Make sure all execution side CellLocator objects have explicit destructors
307898ff6 Cleanup the CellLocatorBoundingIntervalHierarchy.cxx style.
0f31c69f3 Remove unnecessary constructor from ParameterContainer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1657
2019-04-29 14:17:55 -04:00
Robert Maynard
d468784f00 Correct more host/device warnings from methods that should be host only 2019-04-29 13:15:42 -04:00
Robert Maynard
c399a812ad Merge topic 'update_tao_cuda_pragmas'
967581cf1 Merge branch 'upstream-taotuple' into update_tao_cuda_pragmas
907846086 taotuple 2019-04-24 (57001975)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1659
2019-04-29 13:12:07 -04:00
Robert Maynard
967581cf16 Merge branch 'upstream-taotuple' into update_tao_cuda_pragmas
* upstream-taotuple:
  taotuple 2019-04-24 (57001975)
2019-04-29 09:12:58 -04:00
TaoCpp Tuple Upstream
907846086b taotuple 2019-04-24 (57001975)
Code extracted from:

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

at commit 5700197521301b5dd102f81d0073f83e15e5a7e5 (for/vtk-m).
2019-04-29 09:12:58 -04:00
Robert Maynard
bdabfbe116 Make sure ArrayPortalUniformPointCoordinates constructor is explicit
We have had problems in the past with host/device default constructors
2019-04-26 10:23:59 -04:00
Robert Maynard
b3d951b501 vtkm::Range Include function now requires half as many min/max calls 2019-04-26 10:21:36 -04:00
Robert Maynard
ddaa0df261 ArrayHandleVirtualCoordinates now calls the proper parent constructor
Previously it was calling the ArrayHandle<T,StorageTagVirtual>
constructor and not the ArrayHandleVirtual constructor which
generated a warning with some compilers
2019-04-26 10:11:04 -04:00
Robert Maynard
61e8003793 Make sure all execution side CellLocator objects have explicit destructors 2019-04-26 10:10:21 -04:00
Sujin Philip
b0abb89f66 Merge topic 'add-exports'
ee2999d19 Some classes should be exported

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1656
2019-04-25 12:16:30 -04:00
Sujin Philip
ee2999d19b Some classes should be exported 2019-04-25 09:50:49 -04:00
Robert Maynard
307898ff65 Cleanup the CellLocatorBoundingIntervalHierarchy.cxx style. 2019-04-24 10:13:35 -04:00
Robert Maynard
0f31c69f32 Remove unnecessary constructor from ParameterContainer 2019-04-24 10:12:43 -04:00
Robert Maynard
9937f51fe1 Merge topic 'thrust_patch_order'
63c931e63 Correct location of ThrustPatches which clang formatter moved

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1653
2019-04-23 17:37:05 -04:00
Robert Maynard
a36d321501 Merge topic 'cuda_device_tag_unit_test_errors'
6fafcf01f correct compile issues caused by clang formatting.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1655
2019-04-23 17:36:44 -04:00
Robert Maynard
6fafcf01fd correct compile issues caused by clang formatting.
A couple of tests require vtkm/testing/Testing to be the first include
2019-04-23 17:16:26 -04:00
Kenneth Moreland
4b98b16b27 Merge topic 'math-h-clang-formatting'
90dd8a0ef Correct clang formatting in Math.h.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1654
2019-04-23 17:11:36 -04:00
Kenneth Moreland
90dd8a0ef7 Correct clang formatting in Math.h.in
There is a small section in the code generated from Math.h.in that is
subject to clang formatting. A recent change reformatted that bit of
Math.h, so we need to update Math.h.in accordingly.
2019-04-23 13:28:35 -07:00
Robert Maynard
63c931e639 Correct location of ThrustPatches which clang formatter moved 2019-04-23 15:02:58 -04:00
Robert Maynard
bd544754a4 Merge topic 'no_odr_violation_on_cuda_tag'
ff687016e For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1648
2019-04-23 14:40:38 -04:00
Robert Maynard
e7924e76cc Merge topic 'remove_unneeded_diy_include_path'
030b03e47 Remove unneeded diy build include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1652
2019-04-23 14:40:11 -04:00
Robert Maynard
030b03e470 Remove unneeded diy build include directory
The diy build configured files are all located by the include
from the root vtkm include directory, so this include isn't needed
2019-04-22 15:00:30 -04:00
Robert Maynard
ff687016ee For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files
It is very easy to cause ODR violations with DeviceAdapterTagCuda.
If you include that header from a C++ file and a CUDA file inside
the same program we an ODR violation. The reasons is that the C++
versions will say the tag is invalid, and the CUDA will say the
tag is valid.

The solution to this is that any compilation unit that includes
DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled
must be invoked by the cuda compiler.
2019-04-22 10:39:54 -04:00
Sujin Philip
4fd7682e41 Merge topic 'remove-thread-local'
13ef17eaa Remove thread_local from RuntimeDeviceNames

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1650
2019-04-22 09:11:50 -04:00
Sujin Philip
13ef17eaa7 Remove thread_local from RuntimeDeviceNames
Older Mac compilers that are still supported by VTK don't support
`thread_local`.
2019-04-19 16:03:48 -04:00
Robert Maynard
ce3b42806b Merge topic 'remove_device_adapter_error'
d8cc067ca Remove DeviceAdapterError as it isn't needed any more.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1649
2019-04-19 08:09:30 -04:00
Robert Maynard
d8cc067caa Remove DeviceAdapterError as it isn't needed any more.
Fixes #277

DeviceAdapterError existed to make sure that the default device adapter
template was being handled properly. Since the default device adapter doesn't
exist, and nothing is templated over it we can now remove DeviceAdapterError.
2019-04-18 15:09:57 -04:00
Robert Maynard
3931b17247 Merge topic 'correct_field_tag_docs'
21c84798c FieldIn/Out/InOut documentation updated to fact they aren't templated

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1647
2019-04-18 13:59:36 -04:00
Robert Maynard
21c84798c7 FieldIn/Out/InOut documentation updated to fact they aren't templated
Fixes #366
2019-04-18 13:23:20 -04:00
Robert Maynard
ab1f7b0409 Merge topic 'simplify_benchmark_cmake_code'
5a26051fc benchmarking cmake code simplified

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1646
2019-04-18 13:14:54 -04:00
Robert Maynard
5a26051fc8 benchmarking cmake code simplified 2019-04-18 10:29:24 -04:00
Robert Maynard
2c026508b3 Merge topic 'correct_openmp_timeouts'
9c2920072 UnitTestBoundingIntervalHierarchy handles systems under load better
671c1df5c Timer logs the proper device name when called with an invalid device
d3d66a331 GameOfLife example always uses the proper device adapter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1645
2019-04-18 08:05:12 -04:00
Robert Maynard
9c29200723 UnitTestBoundingIntervalHierarchy handles systems under load better
The UnitTestBoundingIntervalHierarchy has historically had problems
when the machine is already under-load when the algorithm is executed.
By limiting the number of openMP threads the test uses we can
reduce the amount of CPU time slicing that this test causes.
2019-04-17 16:16:08 -04:00
Robert Maynard
671c1df5c9 Timer logs the proper device name when called with an invalid device 2019-04-17 16:01:15 -04:00
Robert Maynard
d3d66a3312 GameOfLife example always uses the proper device adapter
Previously the example would only time using the serial device
adapter, which wouldn't work when the user explicitly specified
a device on the command line.
2019-04-17 14:58:32 -04:00
Robert Maynard
39cf9dacb6 Merge topic 'consolidate_licenses'
df5765bd7 update LICENSE.txt file
6d9c2af79 remove warning in file due to non-reference exception catch
fbcea82e7 conslidate the license statement
fd59fd1d4 Print error in copyright only on first mis-match

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1609
2019-04-17 14:49:26 -04:00
nadavi
df5765bd7c update LICENSE.txt file 2019-04-17 10:57:13 -06:00
nadavi
6d9c2af795 remove warning in file due to non-reference exception catch 2019-04-17 10:57:13 -06:00
nadavi
fbcea82e78 conslidate the license statement 2019-04-17 10:57:13 -06:00
nadavi
fd59fd1d4a Print error in copyright only on first mis-match 2019-04-17 10:56:31 -06:00