Commit Graph

2491 Commits

Author SHA1 Message Date
Patricia Kroll Fasel - 090207
6a88cde5d3 Remove unnecessary const parameters 2017-05-02 14:41:47 -06: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
4049b5b25e Add ClipWithImplicitFunction Filter
Rename current Clip filter to ClipWithField.
2017-05-01 16:56:54 -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
Patricia Kroll Fasel - 090207
0e3a98f827 Add subsample and include boundary 2017-04-27 14:53:51 -06:00
Robert Maynard
93a5662a7b Merge topic 'correct_missing_cuda_exec_include'
cc08589d Make sure ExecutionPolicy.h includes all headers it uses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !756
2017-04-27 13:00:44 -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
Robert Maynard
cc08589df6 Make sure ExecutionPolicy.h includes all headers it uses 2017-04-24 13:34:39 -04: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
Li-Ta Lo
58ef7c8de0 one more attemp to get the data type right 2017-04-20 15:09:38 -06:00
Samuel Li
6c1be79779 pass test on all 1 level DWT/IDWT cases 2017-04-20 11:13:25 -06:00
Li-Ta Lo
22d0e35521 attempt to fix warning on type conversion 2017-04-20 10:22:43 -06:00
David C. Lonie
ec6589d391 Only enable -fPIC on component static libraries when necessary. 2017-04-20 12:15:31 -04:00
Li-Ta Lo
ded4583aca attempt to fix warning on type conversion 2017-04-20 08:54:09 -06:00
Samuel Li
a9bf6d9402 better naming 2017-04-19 18:32:51 -06:00
Samuel Li
0f69a0b45e fix an indexing bug 2017-04-19 18:32:10 -06:00
Li-Ta Lo
897b2f0f63 add tests for 1, 2 and ARRAY_SIZE elements for both ScanInclusiveByKey and ScanExclusiveByKey 2017-04-19 13:38:28 -06:00
Li-Ta Lo
c05a2c323e Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey 2017-04-18 16:13:51 -06:00
Li-Ta Lo
0e97fcb94f handle the case of 0 or 1 element in the input for ScanExclusiveByKey 2017-04-18 16:12:36 -06:00
Kenneth Moreland
4758d3d978 Gracefully handle array range requests on empty arrays
Previously, The ArrayRangeCompute code would throw an exception if you
tried to compute the array range on an empty array. This change instead
returns empty ranges.
2017-04-18 14:43:05 -06:00
Li-Ta Lo
bea8e85c47 handle the case of 0 or 1 element in the input for ScanExclusiveByKey 2017-04-18 13:26:15 -06:00
Li-Ta Lo
a2085abaf6 add DerivedAlgorithm when calling other methods 2017-04-18 09:39:15 -06:00
Li-Ta Lo
0e107f5c3f remove unused InclusiveToExclusiveByKeyKernel functor 2017-04-18 09:34:52 -06:00
Patricia Kroll Fasel - 090207
14066d8692 Add filter for ExtractStructured 2017-04-18 08:32:13 -06:00
Li-Ta Lo
a205f21043 make ScanExclusiveByKey return void, rearrange parameter ordering 2017-04-17 16:11:02 -06:00
Li-Ta Lo
7023266585 add both generic and Thrust ScanExclusiveByKey 2017-04-17 15:03:49 -06:00
Robert Maynard
f1493cde0d Tetrahedralize and Triangulate don't generate warnings under CUDA. 2017-04-17 16:21:29 -04:00
Samuel Li
b619967d69 sync to debug 2017-04-14 17:15:17 -06:00
Patricia Kroll Fasel - 090207
e4283344fb Clean up 2017-04-14 14:59:42 -06:00
Samuel Li
f11c1bf928 change new error handling 2017-04-14 14:14:09 -06:00
Patricia Kroll Fasel - 090207
78148b0295 Rectilinear with subset and sample and tests 2017-04-14 14:06:28 -06:00
Samuel Li
fad49bdf80 Merge branch 'master' of gitlab.kitware.com:samuelli/vtk-m 2017-04-14 14:05:40 -06:00
Samuel Li
1179007f05 fix typo 2017-04-14 14:05:36 -06:00
Samuel Li
eaee6c3e4b merge from the latest 2017-04-14 14:00:16 -06:00
Patricia Kroll Fasel - 090207
49f8662572 Uniform subset and sample worklet and unit tests working 2017-04-14 13:34:51 -06:00
Li-Ta Lo
e77f9fac6a add CUDA implementation of ScanInclusiveByKey using Thrust library 2017-04-14 11:25:25 -06:00
Samuel Li
0175ee7a65 sync to debug 2017-04-14 10:42:55 -06:00
David Lonie
2a4e55770f Merge topic 'weak_vtable_warnings'
77baa8a2 Add test for exceptions thrown across library boundaries.
fd0e3e0e Remove vtable from WaveletFilter.
96bf0dac Give AxisAnnotation a virtual destructor.
4807b3c4 Silence warnings about unavoidable weak vtables.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !742
2017-04-14 08:56:03 -04:00
Samuel Li
10be50059c sync to debug on another machine 2017-04-13 18:25:14 -06:00
Patricia Kroll Fasel - 090207
d7a5379293 Use vtkm:Bounds for all bounding boxes 2017-04-13 14:45:53 -06:00
David C. Lonie
77baa8a295 Add test for exceptions thrown across library boundaries. 2017-04-13 15:16:35 -04:00
Robert Maynard
a4264fb558 Merge topic 'rendering_glew_extensions_osx'
23c4fe5f Before calling glewInit we need to make sure glew can load all extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !739
2017-04-13 14:48:36 -04:00
Patricia Kroll Fasel - 090207
0975e1894a Introduce subsampling parameter 2017-04-13 12:36:53 -06:00
David C. Lonie
fd0e3e0e3e Remove vtable from WaveletFilter.
This header-only class had a virtual destructor, but no other virtual
methods or subclasses.
2017-04-13 14:08:27 -04:00
David C. Lonie
96bf0dac1b Give AxisAnnotation a virtual destructor.
This is necessary since the class has virtual methods, and also
instructs the compiler that the class's vtable is to be stored in the
vtk_rendering library.
2017-04-13 14:07:41 -04:00
David C. Lonie
4807b3c472 Silence warnings about unavoidable weak vtables.
- Exception classes cannot be exported due to MSVC's design decisions.
  See http://stackoverflow.com/questions/24511376. We must leave these
  classes as header only and silence the warnings.
- TransferResource in BufferState.h must remain a header-only class since
  there is no vtkm_interop library to compile the class into.
- The VTKDataSetReader hierarchy must similarly remain header-only since
  there is no vtkm_io library.
- The OptionParser Action classes are part of a header-only utility and
  cannot be easily compiled into a library.
-
2017-04-13 14:06:33 -04:00
Li-Ta Lo
da8a2315ce add wip for exclusive scan by key 2017-04-13 11:50:56 -06:00
Patricia Kroll Fasel - 090207
9d8d5ed5d3 Pass Vec instead of arrays for bounds and samples. Check validity of values. 2017-04-10 15:56:00 -06:00
Li-Ta Lo
ff37e31e63 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into scanbykey 2017-04-07 13:44:20 -06:00
Samuel Li
14a94e7886 fix a typo; sync to test 2017-04-06 17:57:40 -06:00
Robert Maynard
5f55be17e7 Update the TBB grain size to be a more reasonable default.
We not only update the TBB grain size to be a more value, we also specify
a grain size for the 3D scheduler.
2017-04-06 16:34:15 -04:00
Patricia Kroll Fasel - 090207
f9a77e053d UnitTest of geometry only on worklet 2017-04-06 14:11:49 -06:00
Patricia Kroll Fasel - 090207
348fac5462 Add methods to subset the data to match the geometry 2017-04-06 13:34:06 -06:00
David C. Lonie
cbfe5fddd9 Fix up various issues with ArrayHandles in vtkm_cont. 2017-04-05 15:45:11 -07:00
Robert Maynard
355eea887c Get the vtkm cont cuda object to compile properly. 2017-04-05 15:45:10 -07:00
David C. Lonie
6ecc22bb8c First pass at compiling ArrayHandle into vtkm_cont. 2017-04-05 15:45:01 -07:00
Patricia Kroll Fasel - 090207
de419db1de Geometry for Uniform, Rectilinear 1D,2D,3D. 2017-04-05 12:33:05 -06:00
Robert Maynard
23c4fe5fd8 Before calling glewInit we need to make sure glew can load all extensions 2017-04-05 14:18:37 -04:00
Patricia Kroll Fasel - 090207
d2eb251bb4 Separate ExtractUniform and ExtractRectilinear 2017-04-05 09:36:25 -06:00
Patricia Kroll Fasel - 090207
6256324195 Start of ExtractStructured worklet which only gathers geometry 2017-04-04 14:00:04 -06:00
Li-Ta Lo
18c2f2413a Merge branch 'master' into scanbykey 2017-03-31 12:17:50 -06:00
Patricia Kroll Fasel - 090207
5b651172cf Merge branch 'master' into extract-subset 2017-03-30 16:34:50 -06:00
Patricia Kroll Fasel - 090207
6ac2314796 Add unit test for Box ImplicitFunction 2017-03-30 16:31:38 -06:00
Patricia Kroll Fasel - 090207
8190187d7d Error on empty constructor ExtractGeometryByVOI 2017-03-30 12:23:00 -06:00
Patricia Kroll Fasel - 090207
836e947200 VTKM_EXEC on operator caused CUDA synchronization error 2017-03-30 11:22:07 -06:00
Patricia Kroll Fasel - 090207
f3b4b29e40 Use float not double for defining ImplicitFunctions 2017-03-29 16:24:42 -06:00
Patricia Kroll Fasel - 090207
c7e0305097 Warnings 2017-03-29 15:13:34 -06:00
Patricia Kroll Fasel - 090207
be97785036 Change subset extraction on points to use WorkletMapCellToPoint 2017-03-29 14:04:58 -06:00
Li-Ta Lo
847c73b7d4 first attemp at segmented inclusive scan 2017-03-29 09:29:11 -06:00
Patricia Fasel
d9234e39c7 Merge topic 'tri-tet-fix'
9e90b31a Merge branch 'tri-tet-fix' of gitlab.kitware.com:Fasel/vtk-m into tri-tet-fix
7c64785f Fix warnings and add to tetrahedralize unit test
7f4d5de2 remove unused code in CMakeList.txt
fb8a8369 update examples/tetrhedra to use filters instead of worklets
8d5ce894 Merge branch 'tri-tet-fix' of gitlab.kitware.com:Fasel/vtk-m into tri-tet-fix
9dcfbf36 Throw error bad type on structured
5ff1d2b1 Use CastAndCall on DynamicCellSet in filters
ee4c3190 fixed compiler errors
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !735
2017-03-29 10:38:18 -04:00
Patricia Kroll Fasel - 090207
11e0a252d9 Floating point warnings 2017-03-28 16:07:56 -06:00
Patricia Kroll Fasel - 090207
16c211816c Add in Mask.h worklet and test 2017-03-28 14:42:22 -06:00
Patricia Kroll Fasel - 090207
84a9254868 Extract using ImplicitFunction for VOI removed from filters 2017-03-28 14:15:15 -06:00
Patricia Kroll Fasel - 090207
7c64785f3c Fix warnings and add to tetrahedralize unit test 2017-03-28 09:43:32 -06:00
Robert Maynard
1d84a8dbf4 Merge topic 'refactor_marching_cubes'
b4d542e3 MarchingCubes now merges points correctly when it has multiple iso contours

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !733
2017-03-28 09:45:56 -04:00
Patricia Kroll Fasel - 090207
9dcfbf368f Throw error bad type on structured 2017-03-27 16:25:38 -06:00
Patricia Kroll Fasel - 090207
5ff1d2b1a0 Use CastAndCall on DynamicCellSet in filters 2017-03-27 16:09:18 -06:00
Kenneth Moreland
f4f56798c2 Merge topic 'input-range-to-transport'
0b12cab1 Fix overshadowing of class member with template parameter
d68b2113 Remove TransportTagReducedValuesIn
dc192b79 Add input range to arguments of transport

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !734
2017-03-27 13:43:01 -04:00
Patricia Kroll Fasel - 090207
6f49c50dd1 Attempt partial specialization of Run() in worklets 2017-03-27 11:41:37 -06:00
Patricia Kroll Fasel - 090207
9f06a1ea37 Merge branch 'master' into extract-subset 2017-03-27 08:58:17 -06:00
Patricia Kroll Fasel - 090207
36b480993d Move the processing of scatter cell data to worklet from the filter. 2017-03-24 16:34:53 -06:00
Kenneth Moreland
0b12cab1dd Fix overshadowing of class member with template parameter 2017-03-24 15:36:58 -06:00
Kenneth Moreland
d68b211346 Remove TransportTagReducedValuesIn
Now that the transport takes the input range as one of its arguments,
this functionality can be implemented by the more general
TransportTagArrayIn.
2017-03-24 15:32:27 -06:00
Robert Maynard
b4d542e345 MarchingCubes now merges points correctly when it has multiple iso contours
The previous version of point merging incorrectly merged points across
multiple iso contours, this version fixes that issue.

The marching cubes had a fairly complex block of logic for point merging
since it had to handle numerous runtime switches. This refactor this
logic so it is easier to follow.
2017-03-24 17:28:06 -04:00
Kenneth Moreland
dc192b793d Add input range to arguments of transport
Previously the arguments to the operator of a vtkm::cont::arg::Transport
were the control object, the input domain object, and the output range.
If you wanted to, for example, check the size of an input array to make
sure it matched the input range, you would have to know the meaning of
the input domain object to query its range. This made it hard to create
generic transports, like TransportTagArrayIn, that accept data from
multiple different input domains but need to know the input range.
2017-03-24 15:14:18 -06:00
Patricia Kroll Fasel - 090207
3a1a6aece3 Added mapping of cell data onto output dataset 2017-03-23 17:14:39 -06:00
Patricia Kroll Fasel - 090207
984af5a2b4 Reorganize Triangulate and Tetrahedralize and write filters. 2017-03-23 11:58:00 -06:00
Patricia Kroll Fasel - 090207
6cb3f9165d Merge branch 'master' into extract-subset 2017-03-22 11:18:34 -06:00
Patricia Kroll Fasel - 090207
9effab0063 Add Mask filter and tests. 2017-03-21 16:11:06 -06:00
Patricia Kroll Fasel - 090207
9f0c99920c Add filters and tests for ExtractPoints and ExtractGeometry, by id only. 2017-03-21 15:14:35 -06:00
Patricia Kroll Fasel - 090207
54171e1d87 Third version of ExtractGeometry which finally looks more like
Threshold.  CellSetSingleType returned for extract points and
CellSetPermutation returned for extract cells.
2017-03-20 14:40:53 -06:00
Patricia Kroll Fasel - 090207
d1e8de3efe Add ExtractCellSetStructured by id, by implicit function, 2D, 3D 2017-03-17 17:00:59 -06:00
Robert Maynard
2481dd6248 Merge topic 'multi_iso_value_contour'
5566afdd Allow MarchingCubes to handle multiple iso-contour values.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !730
2017-03-17 14:16:17 -04:00
Patricia Kroll Fasel - 090207
ad66b2be33 Add extraction subdirectory. ExtractGeometry entry point for point and
cell extraction.
2017-03-16 14:53:16 -06:00