Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,303 Commits 8 Branches 22 Tags 30 MiB
6ad53c7b70
Commit Graph

1365 Commits

Author SHA1 Message Date
Kenneth Moreland
091881d2a4 Use default storage in ArrayHandleCompositeVector test 
The idea of the test was to turn off the "default" storage to ensure
that the fancy array was not making assumptions about the storage of its
delegate array. But there is lots of code elsewhere that uses the
default storage (rightly so) to create intermediate arrays, which will
fail if you disable the default storage. This was causing a test to
fail, so turn default storage back on for this case.
 2017-09-27 10:05:24 -06:00
Kenneth Moreland
2625ae7866 Update VTK-m source to use new ArrayCopy functionality 2017-09-25 16:54:46 -06:00
Kenneth Moreland
f4ff589a9d Add version of ArrayCopy that takes a device adapter 
This is still more convenient than declaring DeviceAdapterAlgorithm just
to copy two arrays. Now the function works whether or not you know what
the device should be.
 2017-09-25 16:54:24 -06:00
Kenneth Moreland
65c7324ffe Create ArrayCopy method 
This is a convenience method to do a deep copy of an array. This comes
up a lot, but can be a pain if you don't have a specific device adapter
on which to do the copy.
 2017-09-25 16:28:44 -06:00
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
Sujin Philip
c07fb14bf1 Build CellSetExplicit.cxx for devices 2017-08-14 10:19:34 -04:00
Allison Vacanti
fcee1cd5e9 Deduce device adapter tag in interop::TransferToOpenGL. 2017-08-14 09:36:39 -04:00
Sujin Philip
9deea72f72 Merge topic 'update-buildconnectivity' 
4e1b026c Streamline CellSetExplicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !878
 2017-08-11 17:29:35 -04:00
Sujin Philip
4e1b026c8a Streamline CellSetExplicit 
1) Don't require a DeviceAdapter for the BuildConnectivity function (#131)
2) Explicitly instantiate default CellSetExplicit and CellSetSingleType
 2017-08-11 10:14:40 -04:00
Robert Maynard
3a8a64dfa3 Merge topic 'vtkm_cont_internal_now_uses_using' 
ac90e2dc vtkm::cont::internal now prefers 'using' over 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !875
 2017-08-11 08:23:06 -04:00
dongliangchu
389bda7ec2 refactoring unittest for multiblock filters 2017-08-10 16:08:10 -04:00
dongliangchu
3bff60d3c6 refactoring unittest for multiblock filters 2017-08-10 16:05:37 -04:00
Robert Maynard
ac90e2dc73 vtkm::cont::internal now prefers 'using' over 'typedef' 2017-08-10 15:26:05 -04:00
Allison Vacanti
326757b571 Remove ArrayHandleCuda. 
!861 (b0dba9a1) adds this functionality to basic ArrayHandles.
 2017-08-10 15:21:52 -04:00
Thomas Otahal
89b2700298 Merge topic 'external-faces-production' 
75517554 Move check for cell variables to it gets executed.
147247e8 Code formatting changes and compiler warning fixes.
a3fd135b Fix errors and warnings on Mac and Windows
347af497 Poly Data for External Faces
aeed7a07 Cell variables for External Faces
ad13e9b4 Merge branch 'master' into external-faces-production
ab25c160 External Faces Uniform and Rectilear grids

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !860
 2017-08-09 16:00:01 -04:00
Robert Maynard
87e1df76ea Merge topic 'print_summary_handle_uint8' 
531205c8 Printing of ArrayHanlde<vtkm::Vec< UInt/Int8 >> now works as intended.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !866
 2017-08-09 08:34:47 -04:00
Robert Maynard
531205c82c Printing of ArrayHanlde<vtkm::Vec< UInt/Int8 >> now works as intended. 
Now when printing ArrayHandles that contain vec's of UInt8/Int8 you see
the integer representation instead of the ascii representation.
 2017-08-08 16:38:20 -04:00
Robert Maynard
08d4b3cf36 Merge topic 'clang_tidy' 
b85cdd90 Convert VTK-m over to use 'using' instead of 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !836
 2017-08-08 16:26:10 -04:00
Sujin Philip
38700ffae3 Merge topic 'fix-cellsets' 
4db096bf Update CellToPoint worklets
6ce8218d Implement CellToPoint for CellSetPermutation
46aa7451 Fix CellSetExplicit CellToPoint

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !848
 2017-08-07 14:20:10 -04:00
Robert Maynard
b85cdd9080 Convert VTK-m over to use 'using' instead of 'typedef' 2017-08-07 14:05:43 -04:00
Allison Vacanti
1a09338e0c Merge topic '43-ArrayHandleExtractComponent' 
84588c80 Add ArrayHandleExtractComponent.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !853
 2017-08-07 10:23:03 -04:00
Allison Vacanti
e1b78a21ea Merge topic '43-ArrayHandleSwizzle' 
030ef573 Add ArrayHandleSwizzle for reordering/removing components from a vec array.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !857
 2017-08-07 08:58:58 -04:00
dongliangchu
3b3734a3d3 merge formating changes 2017-08-04 16:39:36 -04:00
dongliangchu
ab0fe3ef3c merge formating changes 2017-08-04 15:44:07 -04:00
dongliangchu
63b1d6ecac merge formating changes 2017-08-04 15:40:41 -04:00
Allison Vacanti
030ef57380 Add ArrayHandleSwizzle for reordering/removing components from a vec array. 
This is tangentially related to #43.
 2017-08-04 13:42:38 -04:00
dongliangchu
b0213e7428 update unit test for MultiBlock class 2017-08-03 22:45:56 -04:00
dongliangchu
26f08f598a update unit test for MultiBlock class 2017-08-03 22:09:32 -04:00
dongliangchu
dde2f076e0 update unit test for MultiBlock class 2017-08-03 22:00:43 -04:00
dongliangchu
781be38f76 update unit test for MultiBlock class 2017-08-03 21:55:17 -04:00
dongliangchu
dc9f8cac3f update unit test for MultiBlock class 2017-08-03 21:39:56 -04:00
dongliangchu
e2012925b8 update unit test for MultiBlock class 2017-08-03 17:46:37 -04:00
Allison Vacanti
0a828189ad Reuse user-provided cuda device pointers when possible. 2017-08-03 17:21:13 -04:00
dongliangchu
83911d7ab8 update unit test for MultiBlock class 2017-08-03 16:40:18 -04:00
dongliangchu
78c40f8d91 update unit test for MultiBlock class 2017-08-03 16:24:44 -04:00
dongliangchu
5040c72dd3 update unit test for MultiBlock class 2017-08-03 16:18:59 -04:00
dongliangchu
235034c739 update unit test for MultiBlock class 2017-08-03 16:09:32 -04:00
dongliangchu
4c0071eeac update unit test for MultiBlock class 2017-08-03 16:03:13 -04:00
dongliangchu
a8650c9c4a update unit test for MultiBlock class 2017-08-03 15:51:53 -04:00
dongliangchu
2015387b9a update unit test for MultiBlock class 2017-08-03 15:43:12 -04:00
dongliangchu
106e351f3f update unit test for MultiBlock class 2017-08-03 15:40:32 -04:00
dongliangchu
028284d1c3 update unit test for MultiBlock class 2017-08-03 15:32:28 -04:00
dongliangchu
f50d2f2a45 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into multiblock 
keep with the newest codes of master branch
 2017-08-03 13:35:53 -04:00
dongliangchu
7b26c80d83 pull to keep up with the master branch 2017-08-03 13:35:42 -04:00
dongliangchu
f622e8a03c fix multiblock compiling macro issue 2017-08-03 12:21:37 -04:00
Thomas J. Otahal
347af49722 Poly Data for External Faces 
The external faces filter and worklet now pass input
PolyData (0D, 1D, and 2D) cells to the output. The external
faces filter has a flag to control this output (PassPolyData).
Added tests to the external faces filter and worklet.
 2017-08-03 09:19:22 -06:00
dongliangchu
d9cc8a7806 fix multiblock compiling macro issue 2017-08-02 16:17:31 -04:00
dongliangchu
5e8f76918f fix multiblock compiling macro issue 2017-08-02 16:02:37 -04:00
dongliangchu
6c953eccff fix multiblock compiling macro issue 2017-08-02 15:34:34 -04:00
Sujin Philip
6ce8218d09 Implement CellToPoint for CellSetPermutation 2017-08-02 15:19:06 -04:00
Sujin Philip
46aa74519a Fix CellSetExplicit CellToPoint 
The computation of CellToPoint was not correctly handling the case where some
points are not part of any cell.
 2017-08-02 15:19:06 -04:00
dongliangchu
73e3753d9e fix multiblock compiling macro issue 2017-08-02 15:18:55 -04:00
Allison Vacanti
84588c803f Add ArrayHandleExtractComponent. 
This is part of #43, which will ultimately simplify the
ArrayHandleCompositeVector to a new implementation that can be easily
written to. Part of this effort will remove the ability to pull a single
component from a vector-typed input ArrayHandle for use in the
CompositeVector, and this new class makes sure we can still support that
usecase.
 2017-08-02 12:22:08 -04:00
dongliangchu
999890f9b7 fix multiblock compiling macro issue 2017-08-01 23:29:29 -04:00
dongliangchu
95b88fdff1 fix multiblock compiling macro issue 2017-08-01 23:15:41 -04:00
dongliangchu
b75bfd34ce fix multiblock compiling macro issue 2017-08-01 22:16:00 -04:00
dongliangchu
f2070e35f8 fix multiblock compiling macro issue 2017-08-01 22:11:17 -04:00
dongliangchu
1bfc4766d8 fix multiblock compiling macro issue 2017-08-01 19:38:35 -04:00
dongliangchu
4abc2d1111 fix multiblock compiling macro issue 2017-08-01 19:29:54 -04:00
dongliangchu
d591eb7076 fix multiblock compiling macro issue 2017-08-01 19:25:46 -04:00
dongliangchu
cbf5d3f74e fix multiblock compiling macro issue 2017-08-01 18:01:02 -04:00
dongliangchu
9c9387e1fb fix multiblock compiling definition issue 2017-08-01 16:52:16 -04:00
dongliangchu
e54196b4d2 fix multiblock compiling definition issue 2017-08-01 16:10:53 -04:00
dongliangchu
711164f9eb fix multiblock compiling definition issue 2017-08-01 15:19:38 -04:00
dongliangchu
6257e284eb remove useless head file 2017-08-01 13:41:11 -04:00
Kenneth Moreland
6b4adc4424 Merge topic 'connectivity-interface' 
897ec9ff Test and fix issues with WholeCellSetIn with structured grids
03b6f62d Add a test for the WholeCellSetIn argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !855
 2017-07-31 11:28:21 -04:00
David C. Lonie
bd042ec567 Add CudaAllocator to encapsulate runtime managed memory logic. 
Unified memory is now used when we detect that the hardware supports it.
 2017-07-31 09:08:27 -04:00
Kenneth Moreland
03b6f62d05 Add a test for the WholeCellSetIn argument 
All types of cell sets should have a consistent interface. This is
tested (and fixed) for explicit and permutation cell sets. However, an
unfixed bug that has been identified is that permutation cell sets only
work for point to cell topologies. All others are not supported
correctly.
 2017-07-28 13:46:37 -06:00
Dave Pugmire
6a480bad65 Fix compiler warnings. Add ArrayHandle method for getting cell id 2017-07-27 10:10:43 -04:00
dongliangchu
440a6be88e Expand MultiBlock Functionality 2017-07-20 15:11:12 -04:00
Robert Maynard
76532264c3 Correct signed to unsigned warnings in ArrayManagerExecutionCuda. 2017-07-20 10:42:09 -04:00
mclarsen
8d6f60b38d Removing references to VTKM_DEVICE_ADAPTER_OPENMP since it does not exist and will fail to compile 2017-07-18 14:19:54 -07:00
David C. Lonie
379c3a0fad Use current device when allocating managed memory. 2017-07-13 12:55:22 -04:00
David Lonie
0f1ce4760f Merge topic 'basic-array-leak-fix' 
49d57c0d Fix memory leak in ArrayHandleBasicImpl.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !835
 2017-07-12 17:12:40 -04:00
Robert Maynard
3a71c58e4f Merge topic 'doxygen_tweaks' 
98f8c2e0 Doxygen now excludes the thrust policy namespace.
cb4cae86 Cleanup the aligned allocator doxygen.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !834
 2017-07-12 08:54:31 -04:00
David C. Lonie
49d57c0d9e Fix memory leak in ArrayHandleBasicImpl. 
The execution resources were not being freed when the shared storage
object was destroyed.
 2017-07-11 15:48:34 -04:00
Robert Maynard
cb4cae8685 Cleanup the aligned allocator doxygen. 2017-07-11 08:48:36 -04:00
Li-Ta Lo
65910f139c put return value back to ScanInclusivePortal 2017-07-10 12:11:51 -06:00
Li-Ta Lo
16b61d8697 Make ScanInclusiveByKey and ScanInclusiveByKey void functions. 
These two algorithms does not return meaningful return values. Generic interface and
implementation are both void. Remove erronous return type and statement for CUDA backend.
 2017-07-07 15:11:42 -06:00
Robert Maynard
c09e88d214 Improve the overall doxygen content for vtk-m. 2017-07-07 11:14:25 -04:00
Robert Maynard
09a08fea8d Correct errors in TaskTuner found from the TestBuilds. 2017-07-07 08:40:03 -04:00
Robert Maynard
c11f29c093 Move the parameter sweeping code to a separate header. 
The parameter sweeping code is only enabled when tuning for new GPU's
so we should move it to a separate header to make DeviceAdapterAlgorithmThrust
easier to read.
 2017-07-05 14:58:19 -04:00
Robert Maynard
f9906bbe05 CellSetExplicit can now build reverse connectivity even when empty. 
Before we would try to access the -1 index of the connectivity array
 2017-07-03 13:45:08 -04:00
David C. Lonie
b2c3e41645 Refactor array transfer logic for basic storage. 
The old templated array transfer mechanism generated a lot of code
that ended up doing a simple, type-agnostic memcpy for most devices.
This patch specialized array handles for basic storage and uses a
fast-path array transfer implementation. This reduces the size of the
vtkm_cont library by 27% on gcc (from 6.2MB to 4.5MB).
 2017-06-29 13:18:44 -04:00
David C. Lonie
d4d7683f17 Initialize member variables of ArrayPortalFromIterators. 2017-06-29 09:51:06 -04:00
dongliangchu
b15aa10b73 Applying cell filter to multiblock data 2017-06-22 14:28:00 -04:00
dongliangchu
e9ab997939 Applying cell filter to multiblock data 2017-06-20 16:23:14 -04:00
Robert Maynard
cfda0593be ArrayManagerExecutionThrustDevice stops generating casting warnings. 2017-06-16 08:50:32 -04:00
David C. Lonie
959db03ca0 Add option to print full arrayhandle in summary. 
Useful for quickly debugging.
 2017-06-13 10:21:41 -04:00
dongliangchu
f382cdd5a6 worklet for multiblock data 2017-06-12 09:22:46 -04:00
Sujin Philip
c4e3102084 Simplify ArrayHandleImplicit template 2017-06-08 16:46:45 -04:00
Sujin Philip
6ce2a43d41 Simplify ArrayHandleTransform template 2017-06-08 16:46:45 -04:00
Sujin Philip
749c0c8920 Add Worklet and Filter for faceted surface normals 2017-06-08 09:37:12 -04:00
dongliangchu
add3299b61 Template function for applying filter to multiblock data 2017-06-01 16:43:40 -04:00
dongliangchu
14a7f22377 Template function for applying filter to multiblock data 2017-05-31 23:16:12 -04:00
dongliangchu
da097c6308 Template function for applying filter to multiblock data 2017-05-30 21:52:24 -04:00
Sujin Philip
7ee57a822e Mark CellSetStructured functions as const 
1) GetPointDimensions
2) GetCellDimensions
 2017-05-30 11:36:48 -04:00
Robert Maynard
5dd346007b Respect VTK-m convention of parameters all or nothing on a line 
clang-format BinPack settings have been disabled to make sure that the
VTK-m style guideline is obeyed.
 2017-05-26 13:53:28 -04:00
Robert Maynard
3297dbab41 Merge topic 'install_vtkm_cont_serial_internal' 
4c58867f Properly install all the vtkm serial headers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci <berk.geveci@kitware.com>
Merge-request: !786
 2017-05-26 11:20:39 -04:00
Robert Maynard
4c58867f61 Properly install all the vtkm serial headers. 2017-05-26 10:50:15 -04:00
Sujin Philip
3016c2d5f9 Merge topic 'fix-datasetbuilder' 
5751ed7a Fix DataSetBuilder for Uniform and Rectilinear

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !781
 2017-05-26 10:46:15 -04:00
Robert Maynard
ac4b2a1a3b Merge topic 'array_handle_reverse_write_2' 
af61c7e6 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2
869c9789 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2
14592b82 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into array_handle_reverse_write_2
1c50c86a remove commented out code to print values to stdout
80d4ee90 Enable output to ArrayHandleReverse
f64cb5ef Added test for using ArrayHandleReverse as output of ScanInclusiveByKey
87fe6768 thruw ErrorBadType, add PrepareForOutput from Pat
60542804 fixed a typo and added write support for ArrayHandleReverse

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !783
 2017-05-25 17:50:29 -04:00
Sujin Philip
5751ed7a13 Fix DataSetBuilder for Uniform and Rectilinear 
Allow 1 and 2 dimensional data along any orthogonal plane/axis.
 2017-05-25 17:07:14 -04:00
Li-Ta Lo
869c978976 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2 
Merged and resolved conflict after clang-format.
 2017-05-25 11:14:39 -06:00
Li-Ta Lo
14592b8279 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into array_handle_reverse_write_2 2017-05-25 09:05:14 -06:00
Robert Maynard
60a405ef65 Add TaskTiling1D/3D which use faux virtuals to reduce binary size. 
Redesigns the TBB and Serial backends and the vtkm::exec::Task concept so that
we can re-use the same launching logic for all Worklets, instead of generating
per worlet code. To keep the performance the same the TilingTask now is past
a range of indices to work on, rather than a single index.

Binary size reduction:
WorkletTests_SERIAL old - 19MB
WorkletTests_SERIAL new - 18MB

WorkletTests_TBB old - 39MB
WorkletTests_TBB new - 18MB

libvtkAcceleratorsVTKm old - 48MB
libvtkAcceleratorsVTKm new - 19MB
 2017-05-25 11:00:01 -04:00
Li-Ta Lo
1c50c86a2b remove commented out code to print values to stdout 2017-05-25 08:49:10 -06:00
Kitware Robot
4ade5f5770 clang-format: apply to the entire tree 2017-05-25 07:51:37 -04:00
dongliangchu
c7769ba172 testing filter on multiblock 2017-05-24 18:54:56 -04:00
Li-Ta Lo
f64cb5efb4 Added test for using ArrayHandleReverse as output of ScanInclusiveByKey 
Relexed the constrain for ArrayHandleReverse to allocate storage for the
underlying ArryaHandle
 2017-05-24 16:02:46 -06:00
Li-Ta Lo
87fe676886 thruw ErrorBadType, add PrepareForOutput from Pat 2017-05-24 12:17:20 -06:00
Li-Ta Lo
6054280431 fixed a typo and added write support for ArrayHandleReverse 2017-05-24 09:58:44 -06:00
Ben Boeckel
db36ee22b0 cont: move VTKM_SUPPRESS_EXEC_WARNINGS to above declarations 
Most uses of this macro appeared before any associated `template` lines.
Make them consistent. This also makes clang-format happier.
 2017-05-23 14:34:20 -04:00
Robert Maynard
881a6b1c9c Correct warnings in ImplicitFunction when using std::copy 2017-05-23 10:49:52 -04:00
Robert Maynard
0e31418fae Improve the quality of normals from MarchingCubes. 2017-05-23 10:49:19 -04:00
Robert Maynard
6da48cf3c1 Remove unneeded methods from the Connectivity classes. 2017-05-23 10:49:19 -04:00
Robert Maynard
b56f160434 Add CastAndCall specializations for the concrete CellSet types. 2017-05-23 10:49:19 -04:00
Robert Maynard
9d75e7b775 Remove unneeded member variables from tbb ScheduleKernelId3 2017-05-23 10:49:19 -04:00
dongliangchu
65a9bfc376 reorganizing multiblock test codes into two files 2017-05-22 16:34:22 -04:00
Robert Maynard
7ed77a4547 Merge topic 'array_handle_reverse_unused_param' 
7afda0d1 Correct unused parameter warnings in ArrayHandleReverse

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !772
 2017-05-19 16:59:49 -04:00
Robert Maynard
7afda0d148 Correct unused parameter warnings in ArrayHandleReverse 2017-05-19 15:38:26 -04:00
Kitware Robot
efbde1d54b clang-format: sort include directives 2017-05-18 12:59:33 -04:00
dongliangchu
315e50c42a fixing test error and applying worklet on multiblock 2017-05-17 14:34:55 -04:00
dongliangchu
0d71a72b69 fixing test error and applying worklet on multiblock 2017-05-17 14:32:46 -04:00
Sujin Philip
67febc27ad Add ImplicitFunction for Cylinder and Frustum 2017-05-16 09:38:28 -04:00
dongliangchu
faf6ee30af fixing test error 2017-05-11 16:16:45 -04:00
dongliangchu
ad90424247 fixing test error 2017-05-11 16:00:15 -04:00
dongliangchu
303e2f1cf8 fixing test error 2017-05-11 15:25:08 -04:00
dongliangchu
27cb83d87f fixing test error 2017-05-11 15:20:01 -04:00
dongliangchu
5aa1851e87 remove unnecessary include file 2017-05-11 15:13:01 -04:00
dongliangchu
9e8de89643 test on various dataset for multiblock class 2017-05-11 14:27:43 -04:00
dongliangchu
fb3bf2e296 Merge branch 'MultiBlock' of https://gitlab.kitware.com/dongliangchu/vtk-m into multiblock 2017-05-11 14:05:55 -04:00
dongliangchu
dffc1ac545 small tweak for multiblock class and its unit test 2017-05-11 11:05:47 -04:00
Li-Ta Lo
d6e354382c Merge topic 'other_topic' 
0ef22acc removed kdtree subdirectory
970b5685 add ArrayHandleReverse.h in CMakeLists.txt
d5c5b12d update comment about ArrayHandleReverse

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !764
 2017-05-10 17:39:45 -04:00
dongliangchu
d24e57aaac multiblock class and its unit test 2017-05-09 20:27:03 -04:00
Li-Ta Lo
970b568510 add ArrayHandleReverse.h in CMakeLists.txt 2017-05-08 11:49:18 -06:00
Li-Ta Lo
d5c5b12dee update comment about ArrayHandleReverse 2017-05-08 09:24:09 -06:00
Li-Ta Lo
cfea9b32d0 Merge topic 'array_handle_reverse' 
5226fa8b add read only (for the moment) test and implementation of ArrayHandleReverse (a.k.a reverse iterator)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !763
 2017-05-08 10:54:16 -04:00
Li-Ta Lo
5226fa8b53 add read only (for the moment) test and implementation of ArrayHandleReverse (a.k.a reverse iterator) 2017-05-05 13:45:23 -06:00
Sujin Philip
5eb6d3f142 Fix some errors in the clipping code 2017-05-05 15:34:08 -04:00
Robert Maynard
57ab48fe8e Replace occurrences of NULL with nullptr. 2017-05-04 10:50:57 -04:00
Robert Maynard
022c36fa4f Add vtkm::exec::TaskBase, and rename WorkletInvokeFunctor to TaskSingular 
Previously WorkletInvokeFunctor inherited from vtkm::exec::FunctorBase,
which is also the base class for all users Worklets and for all functors
based to DeviceAdapter::Schedule.

This is done for a few reasons. The first is that we reduce the
minimum size of user worklets. Previously the users worklet would hold
a reference to the error message, and so would the wrapper class added
when calling DeviceAdapter::Schedule. Now we only have the users worklet
holding a reference.

Second, by refactoring to have two base classes we can better improve
the documentation on what responsibilities FunctorBase.h has, compared
to TaskBase.
 2017-05-02 16:38:43 -04:00
Sujin Philip
e9898cc5cf Merge topic 'virtual-methods' 
4049b5b2 Add ClipWithImplicitFunction Filter
82d02e46 Modify ImplicitFunctions to use Virtual Methods
968960c1 Add Virtual Methods Framework

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !750
 2017-05-02 16:12:04 -04:00
Sujin Philip
82d02e46ef Modify ImplicitFunctions to use Virtual Methods 2017-05-01 16:55:59 -04:00
Sujin Philip
968960c1a1 Add Virtual Methods Framework 2017-05-01 16:51:42 -04:00
Li-Ta Lo
244697c93e Merge topic 'scanbykey' 
987b51f6 add comments on ScanInclusiveByKey and ScanExclusiveByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !754
 2017-04-27 11:33:17 -04:00
Li-Ta Lo
987b51f604 add comments on ScanInclusiveByKey and ScanExclusiveByKey 2017-04-26 16:31:20 -06:00
Robert Maynard
80b9d74a23 Merge topic 'embed_more_into_vtkm_cont' 
ec6589d3 Only enable -fPIC on component static libraries when necessary.
cbfe5fdd Fix up various issues with ArrayHandles in vtkm_cont.
355eea88 Get the vtkm cont cuda object to compile properly.
6ecc22bb First pass at compiling ArrayHandle into vtkm_cont.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !715
 2017-04-26 13:47:10 -04:00
Li-Ta Lo
0ba9784082 Merge topic 'scanbykey' 
5c735a38 this should resovle all the type conversion warnings
d8b02329 Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey
58ef7c8d one more attemp to get the data type right
22d0e355 attempt to fix warning on type conversion
ded4583a attempt to fix warning on type conversion
897b2f0f add tests for 1, 2 and ARRAY_SIZE elements for both ScanInclusiveByKey and ScanExclusiveByKey
c05a2c32 Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey
0e97fcb9 handle the case of 0 or 1 element in the input for ScanExclusiveByKey
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !746
 2017-04-25 15:54:25 -04:00
Li-Ta Lo
5c735a385c this should resovle all the type conversion warnings 2017-04-25 10:12:11 -06:00
Li-Ta Lo
d8b02329c5 Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey 2017-04-20 15:13:05 -06:00