Commit Graph

3201 Commits

Author SHA1 Message Date
Kenneth Moreland
32c7f0a8fd Allow clang-format to pass more empty lines
Previously, if you had more than 1 empty line somewhere, clang-format
would eat that empty line. But it is a bit of a pain sometimes to get
the autogenerated code to have the exact empty lines, and there are
valid reasons to allow more than one empty line somewhere, so relax this
condition a bit.
2017-05-31 09:35:26 -06:00
Li-Ta Lo
74f40e2026 Merge topic 'off_topic'
3b0081b5 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m
06f400fd add .h .hxx into CMakeLists
a7c14c93 fix trailing whitespace
b9405680 Merge remote-tracking branch 'vtkmUpstream/master'
f4494413 resolve the code review issue (2nd)
a9e05698 add new line at the end of UnitTestEntropyFilter.cxx
f295251d resolve the issue from the code review
7391d516 Add UnitTest for EntropyFilter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !774
2017-05-30 16:12:49 -04:00
caseywang777
3b0081b592 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2017-05-30 10:39:46 -06:00
Kenneth Moreland
071c792148 Merge topic 'indent-generated'
b03a61da Make .in files match new formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !784
2017-05-28 10:28:54 -04:00
Kenneth Moreland
b03a61da5d Make .in files match new formatting
The automatic formatter formatted the result of the .in files, but not
the .in files themselves. This caused the .in file check to fail.
2017-05-27 09:46:32 -06:00
Robert Maynard
6ad4e72a20 Merge topic 'clang_format_function_args'
5dd34600 Respect VTK-m convention of parameters all or nothing on a line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !785
2017-05-26 16:31:42 -04:00
Robert Maynard
5dd346007b Respect VTK-m convention of parameters all or nothing on a line
clang-format BinPack settings have been disabled to make sure that the
VTK-m style guideline is obeyed.
2017-05-26 13:53:28 -04:00
Robert Maynard
3297dbab41 Merge topic 'install_vtkm_cont_serial_internal'
4c58867f Properly install all the vtkm serial headers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci <berk.geveci@kitware.com>
Merge-request: !786
2017-05-26 11:20:39 -04:00
Robert Maynard
4c58867f61 Properly install all the vtkm serial headers. 2017-05-26 10:50:15 -04:00
Sujin Philip
3016c2d5f9 Merge topic 'fix-datasetbuilder'
5751ed7a Fix DataSetBuilder for Uniform and Rectilinear

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !781
2017-05-26 10:46:15 -04:00
Robert Maynard
ac4b2a1a3b Merge topic 'array_handle_reverse_write_2'
af61c7e6 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2
869c9789 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2
14592b82 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into array_handle_reverse_write_2
1c50c86a remove commented out code to print values to stdout
80d4ee90 Enable output to ArrayHandleReverse
f64cb5ef Added test for using ArrayHandleReverse as output of ScanInclusiveByKey
87fe6768 thruw ErrorBadType, add PrepareForOutput from Pat
60542804 fixed a typo and added write support for ArrayHandleReverse

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !783
2017-05-25 17:50:29 -04:00
Sujin Philip
5751ed7a13 Fix DataSetBuilder for Uniform and Rectilinear
Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-25 17:07:14 -04:00
Robert Maynard
3b84d47fe4 Merge topic 'introduce_task_concept'
60a405ef Add TaskTiling1D/3D which use faux virtuals to reduce binary size.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !771
2017-05-25 15:48:52 -04:00
Li-Ta Lo
af61c7e623 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2 2017-05-25 11:21:14 -06:00
Li-Ta Lo
869c978976 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2
Merged and resolved conflict after clang-format.
2017-05-25 11:14:39 -06:00
Robert Maynard
6b2083db09 Merge topic 'improve_commit_guidelines'
5843826b Expand the CONTRIBUTING section on writing git commit messages.
7db9ef3b Cleanup up some style issues in code block of README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !782
2017-05-25 12:04:39 -04:00
Robert Maynard
5843826bcb Expand the CONTRIBUTING section on writing git commit messages.
Flesh out the commit message section to inform new git users on what
the proper style of a good message looks like.
2017-05-25 11:53:50 -04:00
Robert Maynard
7db9ef3bd8 Cleanup up some style issues in code block of README 2017-05-25 11:14:01 -04:00
Li-Ta Lo
14592b8279 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m into array_handle_reverse_write_2 2017-05-25 09:05:14 -06:00
Robert Maynard
60a405ef65 Add TaskTiling1D/3D which use faux virtuals to reduce binary size.
Redesigns the TBB and Serial backends and the vtkm::exec::Task concept so that
we can re-use the same launching logic for all Worklets, instead of generating
per worlet code. To keep the performance the same the TilingTask now is past
a range of indices to work on, rather than a single index.

Binary size reduction:
WorkletTests_SERIAL old - 19MB
WorkletTests_SERIAL new - 18MB

WorkletTests_TBB old - 39MB
WorkletTests_TBB new - 18MB

libvtkAcceleratorsVTKm old - 48MB
libvtkAcceleratorsVTKm new - 19MB
2017-05-25 11:00:01 -04:00
Li-Ta Lo
1c50c86a2b remove commented out code to print values to stdout 2017-05-25 08:49:10 -06:00
Li-Ta Lo
80d4ee90a5 Enable output to ArrayHandleReverse
Added test for using ArrayHandleReverse as output of ScanInclusiveByKey,
relexed the constrain for ArrayHandleReverse to allocate storage for the
underlying ArryaHandle
2017-05-25 08:48:13 -06:00
Ben Boeckel
4655f5af4d Merge topic 'reformatting'
4ade5f57 clang-format: apply to the entire tree
9e56a5d8 clang-format: add configuration and attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !769
2017-05-25 09:59:31 -04:00
Kitware Robot
4ade5f5770 clang-format: apply to the entire tree 2017-05-25 07:51:37 -04:00
Ben Boeckel
9e56a5d881 clang-format: add configuration and attributes 2017-05-25 07:46:44 -04:00
Li-Ta Lo
f64cb5efb4 Added test for using ArrayHandleReverse as output of ScanInclusiveByKey
Relexed the constrain for ArrayHandleReverse to allocate storage for the
underlying ArryaHandle
2017-05-24 16:02:46 -06:00
Robert Maynard
57feb06e74 Merge topic 'update_readme'
f7e28107 Rewrite the VTK-m README document.
49b11461 Rewrite the VTK-m CONTRIBUTING document.
6b4054c3 Consistently use VTKm_ENABLE instead of having VTKm_BUILD and VTKm_ENABLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !777
2017-05-24 17:39:07 -04:00
Robert Maynard
f7e28107a7 Rewrite the VTK-m README document. 2017-05-24 16:52:26 -04:00
Sujin Philip
ed3ec631f6 Merge topic 'fix-rectilinear-reader'
3a7a6267 Fix VTKRectilinearGridReader

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !779
2017-05-24 16:39:12 -04:00
caseywang777
06f400fd95 add .h .hxx into CMakeLists 2017-05-24 12:44:15 -06:00
caseywang777
a7c14c930f fix trailing whitespace 2017-05-24 12:39:28 -06:00
caseywang777
b9405680d7 Merge remote-tracking branch 'vtkmUpstream/master' 2017-05-24 12:32:31 -06:00
Robert Maynard
7e91ea248a Merge topic 'glfw_header_order'
5c12bf12 Fix OpenGL header order when testing GLFW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !778
2017-05-24 14:18:24 -04:00
Li-Ta Lo
87fe676886 thruw ErrorBadType, add PrepareForOutput from Pat 2017-05-24 12:17:20 -06:00
Li-Ta Lo
6054280431 fixed a typo and added write support for ArrayHandleReverse 2017-05-24 09:58:44 -06:00
Sujin Philip
3a7a62673c Fix VTKRectilinearGridReader
Fix for cases when the coordinate types in the file do not match
vtkm::FloatDefault. This resulted in bad dynamic cast exceptions.
2017-05-24 11:47:46 -04:00
Robert Maynard
5c12bf127e Fix OpenGL header order when testing GLFW 2017-05-24 11:04:59 -04:00
Robert Maynard
49b1146169 Rewrite the VTK-m CONTRIBUTING document. 2017-05-24 09:26:15 -04:00
Robert Maynard
6b4054c37a Consistently use VTKm_ENABLE instead of having VTKm_BUILD and VTKm_ENABLE 2017-05-24 09:26:15 -04:00
Robert Maynard
b6993a7650 Merge topic 'suppress-macro-location'
db36ee22 cont: move VTKM_SUPPRESS_EXEC_WARNINGS to above declarations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !775
2017-05-24 08:10:37 -04:00
Robert Maynard
0922a8a7d3 Merge topic 'remove_improper_device_adapter_defines'
705dac67 Remove improper defines of the default device adapter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !776
2017-05-24 08:10:11 -04:00
Robert Maynard
705dac67b3 Remove improper defines of the default device adapter.
Worklets should never set or define the default device adapter
2017-05-23 15:13:27 -04:00
caseywang777
f449441371 resolve the code review issue (2nd) 2017-05-23 12:35:37 -06:00
Ben Boeckel
db36ee22b0 cont: move VTKM_SUPPRESS_EXEC_WARNINGS to above declarations
Most uses of this macro appeared before any associated `template` lines.
Make them consistent. This also makes clang-format happier.
2017-05-23 14:34:20 -04:00
caseywang777
a9e05698c6 add new line at the end of UnitTestEntropyFilter.cxx 2017-05-23 12:04:54 -06:00
caseywang777
f295251d7e resolve the issue from the code review 2017-05-23 11:59:19 -06:00
caseywang777
7391d516b4 Add UnitTest for EntropyFilter 2017-05-23 10:44:02 -06:00
Robert Maynard
40a0b5dcce Merge topic 'marching_cubes_normal_gen_in_post_pass'
881a6b1c Correct warnings in ImplicitFunction when using std::copy
0e31418f Improve the quality of normals from MarchingCubes.
ea731728 Refactor MarchingCubes normal pass to use the ReduceWorklet.
b241299d MarchingCubes now generates normals in a post pass.
6ed4bc78 Permuted structured cellsets produce VecRectilinearPointCoordinates
6da48cf3 Remove unneeded methods from the Connectivity classes.
b56f1604 Add CastAndCall specializations for the concrete CellSet types.
9d75e7b7 Remove unneeded member variables from tbb ScheduleKernelId3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !741
2017-05-23 12:24:00 -04:00
caseywang777
cfed989116 Add Entropy filter and worklet 2017-05-23 10:06:31 -06:00
Robert Maynard
881a6b1c9c Correct warnings in ImplicitFunction when using std::copy 2017-05-23 10:49:52 -04:00