Commit Graph

4248 Commits

Author SHA1 Message Date
Thomas Otahal
5e72f96b99 CPU parallel radix sorting
Created split implementation. Parallel radix
sort calls moved to vtkm_cont library.

Added key value radix sorts. SortByKey will invoke
radix sort when the key is a fundamental C++ numeric
or character type.

Added fast path for vtkm::SortLess and vtkm::SortGreater
calls to Sort and SortByKey.
2018-01-31 14:08:14 -07:00
Robert Maynard
bfc66729ff Merge topic 'suppress_doxygen_warnings'
1de5b9cd Suppress warnings generated by doxygen when building documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1075
2018-01-31 14:47:19 -05:00
Matt Larsen
cd8a8871e4 Merge topic 'vr_fix'
d476adf1 fixing issue with volume renderer where initial samples were outside the cell set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1074
2018-01-31 13:16:29 -05:00
Robert Maynard
1de5b9cd40 Suppress warnings generated by doxygen when building documentation 2018-01-31 13:08:03 -05:00
Matt Larsen
d476adf1f6 fixing issue with volume renderer where initial samples were outside the cell set 2018-01-30 14:46:34 -08:00
Sujin Philip
9e466f8cd2 Merge topic 'add-probe'
34bae569 Add Probe worklet and filter
4cd306ea Fix a bug in CellLocator
cf1957ca Add make_VecFromPortalPermute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1064
2018-01-30 15:08:49 -05:00
Robert Maynard
e006744af8 Merge topic 'correct_vs2017_inclusive_scan_warnings'
d70c31d4 Serial ScanInclusive now makes sure to always use WrappedBinaryOperator.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1072
2018-01-30 14:55:18 -05:00
Robert Maynard
d70c31d449 Serial ScanInclusive now makes sure to always use WrappedBinaryOperator.
By using WrappedBinaryOperator we will not get warnings on vs2017 when
scanning <32bit arrays, and at the same time also properly support
fancy arrays.
2018-01-30 11:57:13 -05:00
Sujin Philip
34bae5690d Add Probe worklet and filter 2018-01-30 10:43:18 -05:00
Sujin Philip
5cd37de408 Merge topic 'remove-unused-file'
2afaaa04 Remove unused file vtkm/exec/ImplicitFunction.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1069
2018-01-30 10:03:42 -05:00
Robert Maynard
f7549677e2 Merge topic 'dashboard_warnings'
296112ac Suppress DIY warnings from showing up on the VTK-m dashboard.
82dfc0e6 correct shadow warning in ConnectivityTracer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1071
2018-01-30 09:18:26 -05:00
Robert Maynard
296112ac4b Suppress DIY warnings from showing up on the VTK-m dashboard. 2018-01-30 08:58:19 -05:00
Robert Maynard
82dfc0e690 correct shadow warning in ConnectivityTracer 2018-01-30 08:49:49 -05:00
Robert Maynard
0c5a087e41 Merge topic 'dont_allow_rvalue_tasks'
ef611239 Don't allow DeviceTaskTypes to construct tasks from rvalues.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1062
2018-01-30 08:37:29 -05:00
Robert Maynard
0465921c95 Merge topic 'misc-typos'
45239449 More typos
80b11afa Misc. typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1070
2018-01-30 08:36:31 -05:00
luz.paz
45239449a6 More typos
these need a little  more review.
2018-01-30 06:51:47 -05:00
luz.paz
80b11afa24 Misc. typos
Found via `codespell -q 3` via downstream VTK
2018-01-30 06:51:47 -05:00
Matt Larsen
cee6e243fb Merge topic 'annotations_enhancement'
c6565cde correcting compile error with CanvasGL
c57fad48 Depth no considered with annotations. Fix for volume renderer. Consistent color blending.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1068
2018-01-29 19:40:50 -05:00
Matt Larsen
c6565cdecb correcting compile error with CanvasGL 2018-01-29 13:41:06 -08:00
Sujin Philip
2afaaa04d9 Remove unused file vtkm/exec/ImplicitFunction.h 2018-01-29 15:23:49 -05:00
Matt Larsen
c57fad48ee Depth no considered with annotations. Fix for volume renderer. Consistent color blending. 2018-01-29 11:39:21 -08:00
Sujin Philip
62fe3a81b9 Merge topic 'add-VirtualCoords-IsType'
b5f71644 Add IsType to ArrayHandleVirtualCoordinates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1066
2018-01-29 13:39:15 -05:00
Robert Maynard
800a1823b7 Merge topic 'determine-version-context'
32cc61f7 VTKmDetermineVersion: list the project we found the version for

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1065
2018-01-29 10:24:15 -05:00
Utkarsh Ayachit
34d7ff2eba Merge topic 'fix-doxygen'
da2e8511 skip `fmt` and `tthread` from doxygen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1067
2018-01-29 10:14:02 -05:00
Utkarsh Ayachit
da2e851187 skip fmt and tthread from doxygen 2018-01-26 13:31:10 -05:00
Sujin Philip
b5f71644fe Add IsType to ArrayHandleVirtualCoordinates
Makes the interface compatible with DynamicArrayHandle.
2018-01-25 11:02:52 -05:00
Ben Boeckel
32cc61f7b0 VTKmDetermineVersion: list the project we found the version for
It's confusing inside of VTK and ParaView.
2018-01-24 09:17:57 -05:00
Matt Larsen
dd3901094d Merge topic 'colorbar_enhancement'
b420a4b3 fixing typo
2bb64e65 fixing opacity for veritical bar
80081f2a adding finer grain control over color bar and scalar field label

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1063
2018-01-23 15:42:22 -05:00
Thomas Otahal
de687b619e Merge branch 'master' into cpu_parallel_radix_sort 2018-01-22 10:03:30 -07:00
Sujin Philip
4cd306ea2c Fix a bug in CellLocator
Cell dimension for structured data is computed by subtracting Point dimensions
by vtkm::Id3(1). This fix prevents a dimension component from being less than
1 for 2D and 1D cases.
2018-01-19 10:48:39 -05:00
Sujin Philip
cf1957ca4e Add make_VecFromPortalPermute 2018-01-19 10:48:39 -05:00
Matt Larsen
b420a4b3d2 fixing typo 2018-01-18 15:01:15 -08:00
Matt Larsen
2bb64e6598 fixing opacity for veritical bar 2018-01-18 14:57:40 -08:00
Matt Larsen
80081f2a1b adding finer grain control over color bar and scalar field label 2018-01-18 13:21:39 -08:00
Robert Maynard
31a9cc5286 Merge topic 'vtkm-vtk-install-cleanup'
2b72110d cmake: support suppressing CPack usage
dd1f0962 cmake: allow overriding of the build-tree CMake location
74bd01b4 cmake: install documentation to a "share" location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1061
2018-01-18 16:04:10 -05:00
Robert Maynard
ef611239f6 Don't allow DeviceTaskTypes to construct tasks from rvalues. 2018-01-18 13:55:37 -05:00
Ben Boeckel
2b72110d14 cmake: support suppressing CPack usage 2018-01-18 08:40:40 -05:00
Ben Boeckel
dd1f096255 cmake: allow overriding of the build-tree CMake location 2018-01-18 08:40:40 -05:00
Ben Boeckel
74bd01b4cc cmake: install documentation to a "share" location 2018-01-18 08:40:40 -05:00
Li-Ta Lo
8622a2423c Merge topic 'connected_component'
bdb9c37e update based on issues pointed out by Robert
a713a0d8 Generalize and documentation for DeviceAdapterAlgorithm::Transform
29232c49 Revert un-intended change to examples
7ef956a9 Merge branch 'master' into connected_component
a9ed1ecf add CMakeLists.txt for header files
ba3cba64 update copyright statements
aa96874e Merge branch 'connected_component' of gitlab.kitware.com:ollielo/vtk-m into connected_component
2f07119e Merge branch 'master' into connected_component
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1044
2018-01-17 15:31:10 -05:00
Li-Ta Lo
bdb9c37ec4 update based on issues pointed out by Robert 2018-01-17 11:12:32 -07:00
Robert Maynard
03b84a47b5 Merge topic 'cmake-skip-cache-values'
c5d630a7 cmake: add a vtkm_option macro
022f12b2 cmake: find Pyexpander quietly
268a88e7 cmake: remove executable permissions from CMake files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1059
2018-01-17 10:20:07 -05:00
Li-Ta Lo
a713a0d889 Generalize and documentation for DeviceAdapterAlgorithm::Transform
Generalize DeviceAdapterAlgorithm::Transform to accept input array of different value and storage type.
Add doxygen documentation in DeviceAdapterAlgorithm.h
2018-01-16 14:43:31 -07:00
Robert Maynard
6aca828a00 Merge topic 'scalars_to_colors'
067dad41 Add ScalarsToColors worklet(s)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1046
2018-01-16 16:08:28 -05:00
Ben Boeckel
c5d630a77e cmake: add a vtkm_option macro
Projects might want to force these without giving users the indication
that their choices actually matter.
2018-01-16 15:21:17 -05:00
Ben Boeckel
022f12b2ec cmake: find Pyexpander quietly
It's an internal detail and if it doesn't exist, it is handled properly.
2018-01-16 15:21:17 -05:00
Ben Boeckel
268a88e748 cmake: remove executable permissions from CMake files 2018-01-16 14:56:02 -05:00
Robert Maynard
067dad41df Add ScalarsToColors worklet(s)
The ScalarsToColors is the first step in reproducing the color
capability that exists in VTK. The next step after this is to
provide a comparable lookup table.
2018-01-16 13:03:41 -05:00
Robert Maynard
6ce722973a Merge topic 'vs2017_rendering_out_of_heap'
5ecf2d11 vtkm::rendering has more compilation units to help out 32bit compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1058
2018-01-16 13:03:10 -05:00
Li-Ta Lo
29232c49c0 Revert un-intended change to examples
Revert un-intended changed to the size of tangle field in isosurface example and the requirements on CMake version for game_of_life.
2018-01-16 10:55:02 -07:00