Commit Graph

1211 Commits

Author SHA1 Message Date
Kenneth Moreland
fb6be2819d Merge topic 'doxygen-fixes'
52060f52 Fix many warnings from doxygen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !951
2017-09-22 14:05:24 -04:00
Robert Maynard
311618a15f Enable highest level of warnings(W4) under MSVC
This will make VTK-m warning level match the one used by VTK. This commit
also resolves the first round of warnings that W4 exposes.
2017-09-22 13:04:28 -04:00
Kenneth Moreland
52060f52c7 Fix many warnings from doxygen
There are still some warnings left:

* Some text in markdown files are incorrectly picked up as
  doxygen commands
* ArrayPortalTransform weirdly inherits from a specialized
  version of itself. It's technically correct C++ code, but
  gives doxygen fits.
2017-09-22 10:29:08 -06:00
Robert Maynard
427ff728ad Merge topic 'restore_tbb_schedule_explicit_grain_size'
9607f71c TBB 1D scheduling restored to using the explicit grain size.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !946
2017-09-21 16:45:42 -04:00
Robert Maynard
9607f71cd3 TBB 1D scheduling restored to using the explicit grain size. 2017-09-21 09:17:44 -04:00
Kenneth Moreland
c3a3184d51 Update copyright for Sandia
Sandia National Laboratories recently changed management from the
Sandia Corporation to the National Technology & Engineering Solutions
of Sandia, LLC (NTESS). The copyright statements need to be updated
accordingly.
2017-09-20 15:33:44 -06:00
Allison Vacanti
0b36596fd5 Merge topic '173_tbb_unique'
3b03177c Add TBB specialization of Unique.
94d668dd Add serial version of Unique.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !933
2017-09-20 14:35:08 -04:00
Allison Vacanti
3b03177c3f Add TBB specialization of Unique.
This performs roughly an order of magnitude better than the old
implementation on a quad core processor.
2017-09-20 09:47:22 -04:00
Allison Vacanti
1c68106c00 Merge topic '173_tbb_copyif'
3638b340 Specialize CopyIf for TBB backend.
81979ae0 Specialize CopyIf for serial backend.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !940
2017-09-19 15:44:05 -04:00
Allison Vacanti
3638b340ef Specialize CopyIf for TBB backend. 2017-09-19 11:09:27 -04:00
Allison Vacanti
81979ae08f Specialize CopyIf for serial backend. 2017-09-19 11:08:22 -04:00
Allison Vacanti
00320e5dc0 Use vtkm::UInt64 for byte sizes.
vtkm::Id could be just 32bits, which limits the number of values we
would be able to store for large arrays.
2017-09-19 09:21:14 -04:00
Allison Vacanti
c4c05d8b72 Merge topic 'remove_bad_assert'
c07c37ae Remove assert for incorrect assumption new TBB::RBK impl.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !938
2017-09-19 09:16:05 -04:00
Robert Maynard
70f294aeec Merge topic 'renar_warnings'
28ab480a Fix warnings on renar.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !937
2017-09-18 17:28:23 -04:00
Allison Vacanti
c07c37aea2 Remove assert for incorrect assumption new TBB::RBK impl.
The assertion assumes that the RHS of the join operation has not been
yet reduced, which is not correct.
2017-09-18 16:12:07 -04:00
Allison Vacanti
28ab480a40 Fix warnings on renar. 2017-09-18 15:33:02 -04:00
Allison Vacanti
6c7c4ddec0 Merge topic '173_tbb_reducebykey'
d174c0fe Add TBB specialization for ReduceByKey.
c9c7149c Fix typo in ReduceByKey docstring.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !928
2017-09-18 13:48:56 -04:00
Allison Vacanti
94d668dddf Add serial version of Unique.
Rather than falling back to the parallel-oriented algorithm in
DeviceAdapterGeneral, use std::unique.
2017-09-18 12:16:12 -04:00
Allison Vacanti
d174c0fe3b Add TBB specialization for ReduceByKey.
TBB's ReduceByKey was using the generic DeviceAdapterGeneral
implementation and was about 50x slower than the serial implementation,
which is very efficient.

This patch improves TBB's RBK implementation significantly, though it still
does not scale well. On a quad core processor, this implementation performs
comparably or slightly worse than the highly efficient serial algorithm.
More than 4 cores may be needed to see sufficient parallel speedup that
would overcome the TBB overhead, and grain size does not seem to affect the
performance significantly.
2017-09-15 14:25:16 -04:00
Dave Pugmire
74c383562c Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-09-11 17:19:19 -04:00
Allison Vacanti
c9c7149ca3 Fix typo in ReduceByKey docstring. 2017-09-11 15:59:08 -04:00
Dave Pugmire
e5843882d9 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-09-08 14:38:11 -04:00
Kenneth Moreland
1e7b3e6e8b More control over device in ConvertNumComponentsToOffsets
Previously, ConvertNumComponentsToOffsets always used TryCompile on the
global set of runtime devices. That is still the default behavior, but
now you are able to specify your own runtime tracker. Also, there are
now versions of ConvertNumComponentsToOffsets that take a device adapter
tag.
2017-09-07 15:08:55 -06:00
Matt Larsen
50956b8074 fixing triangulator and adding a fast path for 3D structured cell sets 2017-09-04 08:17:01 -07:00
dongliangchu
f492f7ff7c reviewed version 1 2017-08-30 12:37:15 -04:00
dongliangchu
a0cdad52e5 reviewed version 1 2017-08-30 10:30:29 -04:00
Dave Pugmire
7e69b9606d Fix merges with master. 2017-08-28 16:58:44 -04:00
Dave Pugmire
1c0f721b96 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-08-28 15:27:04 -04:00
Dave Pugmire
7e348db5ac Remove duplicate definitions of GetIndices 2017-08-28 15:07:11 -04:00
Dave Pugmire
863c403f98 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 14:50:46 -04:00
Dave Pugmire
6714124b0c remove whitespace. 2017-08-28 14:44:56 -04:00
Dave Pugmire
c398654df9 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 14:43:04 -04:00
dongliangchu
90c870f2f5 reviewed version 1 2017-08-24 10:50:14 -04:00
Robert Maynard
ce80383238 Adds WorkletPointNeighborhood and DispatcherPointNeighborhood types.
VTK-m is now able to run algorithms on structured points that require the
local point neighbors in a highly efficient manner.
2017-08-23 16:42:00 -04:00
Robert Maynard
0cbc3db016 Merge topic 'stolen_arrays_can_still_be_used_as_input'
c385b21a StorageBasic is now treated like users memory after being stolen.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !891
2017-08-22 09:09:58 -04:00
dongliangchu
1d80d5b69c reviewed version 1 2017-08-21 13:11:04 -04:00
dongliangchu
ff4ce72d4e reviewed version 1 2017-08-20 15:02:52 -04:00
dongliangchu
eb4320ab17 reviewed version 1 2017-08-20 14:00:11 -04:00
dongliangchu
fffc0282a5 reviewed version 1 2017-08-18 19:20:15 -04:00
dongliangchu
424b37ec97 reviewed version 1 2017-08-18 16:28:33 -04:00
Robert Maynard
c385b21acd StorageBasic is now treated like users memory after being stolen.
Previously once an ArrayHandle was stolen it was placed in an invalid state
where it could not used again by VTK-m. Now instead after being stolen it
is placed into a state where it is identical to memory allocated outside
of VTK-m and passed in.
2017-08-18 08:24:49 -04:00
Robert Maynard
b9e69217ae Merge topic 'typedef_to_using_round_4'
f6863594 Convert VTK-m over to use 'using' instead of 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !885
2017-08-17 16:38:49 -04:00
Sujin Philip
72a6cf4a21 Change cuda calls to use the per-thread stream. 2017-08-17 11:03:02 -04:00
Robert Maynard
f68635941e Convert VTK-m over to use 'using' instead of 'typedef' 2017-08-17 10:47:25 -04:00
Robert Maynard
0c435d39f4 Merge topic 'remove_lines_with_only_semicolon'
a487017f Remove lines that only contain a semi-colon.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !886
2017-08-17 09:34:15 -04:00
Robert Maynard
a487017fd1 Remove lines that only contain a semi-colon. 2017-08-16 14:31:17 -04:00
Robert Maynard
89f439999a Reduce the amount of typedef statements in DeviceAdapters
By using the auto keyword and decltype we can reduce the number of
complex typedefs that exist when writing device adapter algorithms.
The goal being that it is easier for developers to see the actual
algorithms being implemented, by reducing the amount of template
'noise'.
2017-08-16 14:23:21 -04:00
Robert Maynard
e095831199 ArrayHandleReverse now supports shrink/allocate under all conditions.
Previously ArrayHandleReverse would only work if it was provided an explicit
users array to map too. But this doesn't need to be so, if a user wants to
start by constructing an ArrayHandleReverse we should allow that.

The side effect of this, is that some very tricky code in the DeviceAdapters
can be removed, that explicitly was added to allow output to ArrayHandleReverse
2017-08-16 14:20:05 -04:00
Sujin Philip
dfb38f9349 Merge topic 'cellsetexplicit-gpu-impl'
c07fb14b Build CellSetExplicit.cxx for devices

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !883
2017-08-14 14:02:00 -04:00
Allison Vacanti
23755bd635 Merge topic '150-interop_device_refactor'
fcee1cd5 Deduce device adapter tag in interop::TransferToOpenGL.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !880
2017-08-14 12:19:06 -04:00