Commit Graph

3062 Commits

Author SHA1 Message Date
Robert Maynard
f1cb8e4934 Merge topic 'install_ClipWithField'
d84c9459 Properly install clip with fields hxx file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !760
2017-05-05 14:31:35 -04:00
Robert Maynard
d84c945904 Properly install clip with fields hxx file 2017-05-05 10:19:53 -04:00
Robert Maynard
b19e03ee13 Merge topic 'replace_null_with_nullptr'
57ab48fe Replace occurrences of NULL with nullptr.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !757
2017-05-04 13:13:59 -04:00
Robert Maynard
57ab48fe8e Replace occurrences of NULL with nullptr. 2017-05-04 10:50:57 -04:00
Patricia Fasel
5a4c029719 Merge topic 'extract-structured'
6a88cde5 Remove unnecessary const parameters
0e3a98f8 Add subsample and include boundary
14066d86 Add filter for ExtractStructured
e4283344 Clean up
78148b02 Rectilinear with subset and sample and tests
49f86625 Uniform subset and sample worklet and unit tests working
d7a53792 Use vtkm:Bounds for all bounding boxes
0975e189 Introduce subsampling parameter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !744
2017-05-03 10:21:14 -04:00
Robert Maynard
c7cb279baf Merge topic 'refactor_functor_base'
022c36fa Add vtkm::exec::TaskBase, and rename WorkletInvokeFunctor to TaskSingular

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !751
2017-05-03 08:29:16 -04:00
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
Kenneth Moreland
80342dcf72 Merge topic 'range-on-empty-arrays'
4758d3d9 Gracefully handle array range requests on empty arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !749
2017-04-24 13:49:01 -04: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
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
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
Kenneth Moreland
534905b326 Merge topic 'find-tbb-search-paths'
3219abc1 Look for TBB includes/libs in previously selected directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !748
2017-04-18 16:41:18 -04: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
Kenneth Moreland
3219abc11e Look for TBB includes/libs in previously selected directories
In the FindTBB module, add the directory of the TBB includes and the
directory of the base tbb library to the list of paths to search for
TBB includes and libs, respectively. The reason is that TBB has its
initial includes and libraries and then has its support libraries.
Rather than enter entire paths 9 separate times, this allows you to
select the include directory once and one TBB library and the rest will
be automatically populated.
2017-04-18 13:03:06 -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
Robert Maynard
f0d126aab7 Merge topic 'triangulate_warnings'
f1493cde Tetrahedralize and Triangulate don't generate warnings under CUDA.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !745
2017-04-18 08:09:07 -04: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
Patricia Kroll Fasel - 090207
e4283344fb Clean up 2017-04-14 14:59:42 -06:00
Patricia Kroll Fasel - 090207
78148b0295 Rectilinear with subset and sample and tests 2017-04-14 14:06:28 -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
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
Robert Maynard
17356a1acb Merge topic 'add_pascal_support_to_cmake'
e1695da0 VTK-m now makes it easy to compile with Pascal support.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !743
2017-04-14 08:50:16 -04:00
Patricia Kroll Fasel - 090207
d7a5379293 Use vtkm:Bounds for all bounding boxes 2017-04-13 14:45:53 -06:00
Robert Maynard
e1695da085 VTK-m now makes it easy to compile with Pascal support. 2017-04-13 15:34:08 -04: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