Ben Boeckel
5d593f8d4c
Merge topic 'sort-includes'
...
0a6a2ad8 Benchmarker: include required headers
efbde1d5 clang-format: sort include directives
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !770
2017-05-19 10:02:50 -04:00
Samuel Li
fecc2e976d
code style improvements
2017-05-18 11:51:35 -06:00
Ben Boeckel
0a6a2ad83a
Benchmarker: include required headers
2017-05-18 12:59:33 -04:00
Kitware Robot
efbde1d54b
clang-format: sort include directives
2017-05-18 12:59:33 -04:00
Samuel Li
7782ff471b
Take off a few debug statements; replaced tabs with spaces
2017-05-16 15:28:10 -06:00
Samuel Li
3e4095f43e
WaveletDWT.h
2017-05-16 15:11:42 -06:00
Sujin Philip
95da0c9c01
Merge topic 'more-implicit-functions'
...
67febc27 Add ImplicitFunction for Cylinder and Frustum
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !767
2017-05-16 11:14:30 -04:00
Sujin Philip
67febc27ad
Add ImplicitFunction for Cylinder and Frustum
2017-05-16 09:38:28 -04:00
Robert Maynard
f448801c64
Merge topic 'generate_code_dont_use_spaces'
...
685dd0f3 Avoid spaces with CUDA generate-code flag.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !768
2017-05-16 08:15:26 -04:00
Robert Maynard
685dd0f3c6
Avoid spaces with CUDA generate-code flag.
...
This resolves issues with CMake's separable compilation logic.
2017-05-15 14:31:52 -04:00
Patricia Fasel
be6356b3ba
Merge topic 'extract-geometry'
...
a604c23a Merge branch 'master' into extract-geometry
3f71e533 ResetDevices() in ImplicitFunction.
2c88aa2e Merge branch 'master' into extract-geometry
8a840d76 Fix warnings
6faaa92a Correct CMakefile.txt
d80e6438 Add ExtractGeometry filter and unit test
9106f6b4 Add ExtractPoints filter which only does ImplicitFunction extraction
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !759
2017-05-15 12:54:35 -04:00
Patricia Kroll Fasel - 090207
a604c23aca
Merge branch 'master' into extract-geometry
2017-05-15 08:44:50 -06:00
Samuel Li
c4853885fc
eliminate another warning
2017-05-11 12:02:49 -06:00
Samuel Li
d4deced5bf
get rid of some asserts used for debugging
2017-05-11 11:56:20 -06:00
Samuel Li
98cf7f8d2d
got rid of unused variable warnings
2017-05-11 11:47:51 -06:00
Samuel Li
33de20da09
fix print type warnings
2017-05-10 23:18:03 -06:00
Samuel Li
7d12345517
remove my own note
2017-05-10 23:07:55 -06:00
Samuel Li
d5d67bc5a9
Merge remote-tracking branch 'vtkm/master'
2017-05-10 23:06:32 -06:00
Samuel Li
e21795b269
restore original CMakeLists
2017-05-10 22:53:55 -06:00
Samuel Li
5510fe61cf
no warnings on macs either. fixed a few formalities
2017-05-10 22:51:52 -06:00
Samuel Li
b58e76b675
eliminate a few warnings
2017-05-10 17:58:42 -06:00
Samuel Li
d9c3c7b393
all cases pass tests on all platforms. Need to tackle warnings
2017-05-10 15:51:06 -07: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
Samuel Li
a73bc25939
finish all tests in serial mode
2017-05-09 23:02:51 -06:00
Li-Ta Lo
0ef22acce0
removed kdtree subdirectory
2017-05-08 12:06:25 -06:00
Li-Ta Lo
970b568510
add ArrayHandleReverse.h in CMakeLists.txt
2017-05-08 11:49:18 -06:00
Patricia Kroll Fasel - 090207
3f71e533b8
ResetDevices() in ImplicitFunction.
2017-05-08 09:42:32 -06:00
Li-Ta Lo
d5c5b12dee
update comment about ArrayHandleReverse
2017-05-08 09:24:09 -06:00
Patricia Kroll Fasel - 090207
2c88aa2eb7
Merge branch 'master' into extract-geometry
2017-05-08 09:19:52 -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
Sujin Philip
a181373382
Merge topic 'fix-clip-typos'
...
5eb6d3f1 Fix some errors in the clipping code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !762
2017-05-08 09:26:03 -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
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
Patricia Kroll Fasel - 090207
8a840d7698
Fix warnings
2017-05-04 15:04:54 -06:00
Patricia Kroll Fasel - 090207
6faaa92ae0
Correct CMakefile.txt
2017-05-04 13:43:05 -06:00
Patricia Kroll Fasel - 090207
d80e64385a
Add ExtractGeometry filter and unit test
2017-05-04 13:13:53 -06: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 Kroll Fasel - 090207
9106f6b4b7
Add ExtractPoints filter which only does ImplicitFunction extraction
2017-05-03 15:07:06 -06: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
