Commit Graph

3119 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Robert Maynard
451930f03a Merge topic 'adjust_tbb_grain_size'
5f55be17 Update the TBB grain size to be a more reasonable default.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !740
2017-04-07 12:27:01 -04: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 Fasel
efc21fb6a0 Merge topic 'extract-subset'
5b651172 Merge branch 'master' into extract-subset
6ac23147 Add unit test for Box ImplicitFunction
8190187d Error on empty constructor ExtractGeometryByVOI
836e9472 VTKM_EXEC on operator caused CUDA synchronization error
f3b4b29e Use float not double for defining ImplicitFunctions
c7e03050 Warnings
be977850 Change subset extraction on points to use WorkletMapCellToPoint
11e0a252 Floating point warnings
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !736
2017-03-31 13:56:45 -04: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