Commit Graph

6002 Commits

Author SHA1 Message Date
Robert Maynard
0e847f2cb8 Merge topic 'remove_cellset_need_of_default_device'
46843ff4e CellSetExplicit has no dependency on default vtk-m device

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1636
2019-04-11 10:40:10 -04:00
Robert Maynard
661fb64de8 AtomicInterfaceControl functions are marked with VTKM_SUPPRESS_EXEC_WARNINGS 2019-04-11 10:01:32 -04:00
Allison Vacanti
0c70f9b9ac Add BitFieldIn/Out/InOut worklet signature tags.
These provide an appropriate BitPortal for use in worklets.
2019-04-11 08:27:17 -04:00
Allison Vacanti
a66510e819 Add ArrayHandleBitField, a boolean-valued AH backed by a BitField. 2019-04-11 08:27:17 -04:00
Allison Vacanti
56cc5c3d3a Add support for BitFields.
BitFields are:
- Stored in memory using a contiguous buffer of bits.
- Accessible via portals, a la ArrayHandle.
- Portals operate on individual bits or words.
- Operations may be atomic for safe use from concurrent kernels.

The new BitFieldToUnorderedSet device algorithm produces an ArrayHandle
containing the indices of all set bits, in no particular order.

The new AtomicInterface classes provide an abstraction into bitwise
atomic operations across control and execution environments and are used
to implement the BitPortals.
2019-04-11 08:27:17 -04:00
Allison Vacanti
d01b973821 Allow VTKM_SUPPRESS_EXEC_WARNINGS to be used inside macros. 2019-04-11 08:27:17 -04:00
Allison Vacanti
2f2ca93709 Add bit operations FindFirstSetBit and CountSetBits to Math.h. 2019-04-11 08:27:17 -04:00
Robert Maynard
9cf1dc1883 Merge topic 'cuda_reduce_handle_pair_output'
89ec4aae2 Reduction on CUDA handles different input and output types better

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1638
2019-04-10 19:17:23 -04:00
Sujin Philip
4a20c8fabd Merge topic 'remove-SimplePolymorphicContainer'
b391acf4c Remove SimplePolymorphicContainer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1634
2019-04-10 16:18:47 -04:00
Robert Maynard
3f80a5602d Merge topic 'correct_thrust_patch_for_cuda_10'
1d980ed14 Thrust Patches tried to apply CUDA 10.1 patches to CUDA 10.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1639
2019-04-10 14:47:38 -04:00
Robert Maynard
1d980ed147 Thrust Patches tried to apply CUDA 10.1 patches to CUDA 10.0 2019-04-10 14:46:56 -04:00
Robert Maynard
89ec4aae2f Reduction on CUDA handles different input and output types better
When reducing an input type that differs from the output type
you need to write a custom binary operator that also implements
how to do the unary transformation.
2019-04-10 14:44:44 -04:00
Robert Maynard
46843ff4ee CellSetExplicit has no dependency on default vtk-m device
The default vtk-m device is an outdated concept and this is the
first step of removing it from VTK-m.
2019-04-10 14:28:30 -04:00
Sujin Philip
b391acf4c0 Remove SimplePolymorphicContainer
The last place remaining where it is being used is DynamicCellSet, which can
instead use `vtkm::cont::CellSet` as it itself is polymorphic.
2019-04-10 14:00:39 -04:00
Robert Maynard
fda02b3a91 Merge topic 'thrust_stateless_resource_allocator_warnings'
f05940aac ThrustPatches now only patches fixes for relevant cuda versions
20d6201a9 Suppress thrust::mr::stateless_resource_allocator host/device warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1637
2019-04-10 13:35:39 -04:00
Robert Maynard
f05940aaca ThrustPatches now only patches fixes for relevant cuda versions
Rather than always patch Thrust functions, we now only patch
based on the Thrust version.
2019-04-10 11:18:42 -04:00
Robert Maynard
20d6201a98 Suppress thrust::mr::stateless_resource_allocator host/device warnings 2019-04-10 09:46:34 -04:00
Robert Maynard
ece078b82f Merge topic 'clang_warnings'
0130088b8 Suppress more self-assign-overloaded warnings found by clang
fa5455854 UnitTestArrayPortalValueReference doesn't warn when compiled with appleclang
5cc0d03f6 Merge branch 'upstream-diy' into clang_warnings
dbd3781d5 diy 2019-04-09 (f7a68da4)
5c2f2ebce suppress warnings found by Wself-assign-overloaded
77426f044 Correct casting long to long long warning from clang.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1635
2019-04-09 15:54:57 -04:00
Robert Maynard
0130088b86 Suppress more self-assign-overloaded warnings found by clang 2019-04-09 14:09:54 -04:00
Robert Maynard
fa54558542 UnitTestArrayPortalValueReference doesn't warn when compiled with appleclang 2019-04-09 12:26:22 -04:00
Robert Maynard
5cc0d03f64 Merge branch 'upstream-diy' into clang_warnings
* upstream-diy:
  diy 2019-04-09 (f7a68da4)
2019-04-09 11:42:54 -04:00
Diy Upstream
dbd3781d5c diy 2019-04-09 (f7a68da4)
Code extracted from:

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

at commit f7a68da4fbe93ae7a8699b66f125a98ace842998 (for/vtk-m).
2019-04-09 11:42:54 -04:00
Robert Maynard
5c2f2ebce9 suppress warnings found by Wself-assign-overloaded 2019-04-09 11:42:45 -04:00
Robert Maynard
77426f0447 Correct casting long to long long warning from clang. 2019-04-09 11:42:45 -04:00
Sujin Philip
e7b26f5c88 Merge topic 'bugfixes-ArrayHandleVirtual'
dae779b9f ArrayHandleVirtual bugfixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1632
2019-04-09 08:36:12 -04:00
Sujin Philip
830f16c44c Merge topic 'bugfix-MakeTestDataset'
2bbf501c5 Fix a bug in MakeTestDataset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1633
2019-04-09 08:35:34 -04:00
Sujin Philip
2bbf501c53 Fix a bug in MakeTestDataset
In Make3DExplicitDataSetZoo, only 25 cells are added, but the variable `nCells`
is set to 27.
2019-04-08 16:41:56 -04:00
Sujin Philip
dae779b9f8 ArrayHandleVirtual bugfixes
After the change to `ArrayHandleVirtual` where it became a subclass of
`vtkm::cont::ArrayHandle`, a few extra changes are required.

1. Functions with `ArrayHandleVirtual` as parameters will not be callable
with the superclass `ArrayHandle`. This is fixed by changing the argument
types to the superclass.
2. Add Serialization classes specializations for the superclass, as "is-a"
relation is not considered for class template parameters.
2019-04-08 15:42:53 -04:00
Robert Maynard
d0d33f9807 Merge topic 'correct_cellhelper_overrides'
364bdce53 Correctly override the proper PrepareForExecution method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1631
2019-04-05 17:37:08 -04:00
Robert Maynard
364bdce530 Correctly override the proper PrepareForExecution method 2019-04-05 17:14:46 -04:00
Robert Maynard
68bf5b6153 Merge topic 'correct_clang_as_cuda_compiler_warnings'
58884a729 Fix warnings found when cuda is the cuda host compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1630
2019-04-05 16:02:28 -04:00
Robert Maynard
58884a7299 Fix warnings found when cuda is the cuda host compiler 2019-04-05 15:40:03 -04:00
Robert Maynard
107edaff75 Merge topic 'move_device_adapter_tag_to_vtkm_cont'
1d20ae4f7 Move DeviceAdapterTag to vtkm/cont

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1624
2019-04-05 08:03:53 -04:00
Robert Maynard
34dd533179 Merge topic 'refactor_celllocator_prepareforexec'
30aedf287 Refactor the design of CellLocator::PrepareForExecution

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1627
2019-04-05 08:03:32 -04:00
Kenneth Moreland
3048bd2b4c Merge topic 'pyexpander-python3'
e43770a37 Update pyexpander input files to work with python 3
23f0905a1 Support pyexpander using python 3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1628
2019-04-04 16:18:35 -04:00
Kenneth Moreland
e43770a376 Update pyexpander input files to work with python 3
Python 3 does not use xrange anymore. Use the range function instead.
2019-04-04 11:20:56 -06:00
Robert Maynard
30aedf287f Refactor the design of CellLocator::PrepareForExecution
The try execute functor now doesn't need to be a member of the
class. This helps with the separation of concerns.
2019-04-04 13:17:49 -04:00
Kenneth Moreland
23f0905a1e Support pyexpander using python 3
When you install pyexpander with pip under python 3, the executable
script is now named expander3.py instead of expander.py. Support using
either file.
2019-04-04 11:05:13 -06:00
Robert Maynard
1d20ae4f7b Move DeviceAdapterTag to vtkm/cont 2019-04-04 11:58:51 -04:00
Robert Maynard
6306ca66ce Merge topic 'refactor_cast_and_call_location'
72cb6343b Move vtkm::cont::CastAndCall into a header in vtkm/cont

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1622
2019-04-04 10:05:22 -04:00
Robert Maynard
72fc8d5e5c Merge topic 'vtkm_build_against_test_install'
7ea2accbc Correct issues when using a cuda enabled install of vtk-m.
001d1b0f4 VTK-m can now build and test against temporary installed vtkm.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1621
2019-04-04 09:52:06 -04:00
Robert Maynard
96cb87c50a Merge topic 'make_cellset_api_consistent'
18f3b0dcc Document all the free functions for VariantArrayHandle
5180d6a73 DynamicCellSet has the same free function support as VariantArrayHandle
8f545662d CellSet uses NewInstance to be consistent with the rest of VTK-m

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1620
2019-04-04 09:36:05 -04:00
Robert Maynard
c9ffc3bde2 Merge topic 'update_supported_cuda_versions'
61d41c9d7 Update what VTK-m versions of dependencies we test against.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1626
2019-04-04 09:34:34 -04:00
Robert Maynard
61d41c9d7f Update what VTK-m versions of dependencies we test against.
We had a out of date set of versions listed in our README.
2019-04-04 09:33:00 -04:00
Robert Maynard
7f612502ac Merge topic 'remove_unneeded_cont_exec_markup'
f1056affa Move select functions to host only to remove host/device suppressions
4f2156dfa Thrust detail::aligned_reinterpret_cast doesn't warn now
f4840618c Make sure ThrustPatches is included before thrust.
b2bbd66e6 Merge branch 'upstream-taotuple' into update_taoo
4ec6fc812 taotuple 2019-04-03 (8e70fa8a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1607
2019-04-04 09:32:04 -04:00
Robert Maynard
18f3b0dccc Document all the free functions for VariantArrayHandle 2019-04-03 18:10:31 -04:00
Robert Maynard
5180d6a733 DynamicCellSet has the same free function support as VariantArrayHandle 2019-04-03 18:10:31 -04:00
Robert Maynard
8f545662d7 CellSet uses NewInstance to be consistent with the rest of VTK-m 2019-04-03 18:10:31 -04:00
Robert Maynard
7ea2accbc1 Correct issues when using a cuda enabled install of vtk-m. 2019-04-03 18:08:56 -04:00
Robert Maynard
001d1b0f47 VTK-m can now build and test against temporary installed vtkm.
We now have a couple of the examples also being built against
the installed version of VTK-m as a test. This allow us to verify
that VTK-m installs and can be found properly.
2019-04-03 18:08:56 -04:00