Commit Graph

3189 Commits

Author SHA1 Message Date
Robert Maynard
e91401ac0f Enable SetupForDevelopment in VTK-m 2017-06-07 10:02:38 -04:00
Robert Maynard
569655c454 Add autostash command flag to git-gitlab-sync 2017-06-07 10:02:38 -04:00
Robert Maynard
0f171de1c5 Add gitlab-sync command to ease updating local branches after reformats 2017-06-07 10:01:12 -04:00
Robert Maynard
c5d20ef7ba Merge branch 'upstream-GitSetup' into add_setup_for_development
* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
2017-06-07 09:58:36 -04:00
GitSetup Upstream
cc537c7073 GitSetup 2016-12-13 (cd5ada6d)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit cd5ada6d5626da409d3ff108c341b9afd615803f (setup).
2017-06-07 09:58:35 -04:00
Robert Maynard
7736f95050 Add the update scripts needed to import GitSetup 2017-06-07 09:43:50 -04:00
Robert Maynard
793b5cf998 CONTRIBUTING guide now covers reformatting and revising commits 2017-06-07 09:43:50 -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
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
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
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
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
Robert Maynard
881a6b1c9c Correct warnings in ImplicitFunction when using std::copy 2017-05-23 10:49:52 -04:00
Robert Maynard
0e31418fae Improve the quality of normals from MarchingCubes. 2017-05-23 10:49:19 -04:00
Robert Maynard
ea7317281e Refactor MarchingCubes normal pass to use the ReduceWorklet. 2017-05-23 10:49:19 -04:00
Robert Maynard
b241299d0b MarchingCubes now generates normals in a post pass.
This has been done to reduce memory overhead; as we don't need to store
normals for all points before finding the unique subset, and also improving
performance of the algorithm.

Performance numbers on dataset of (863, 863, 863):

Original version(TBB): 13.03974sec
New version(TBB): 11.79939sec
2017-05-23 10:49:19 -04:00
Robert Maynard
6ed4bc786f Permuted structured cellsets produce VecRectilinearPointCoordinates
Previously when you permuted a structured cellset you would get a permuted
point coordinates. This would cause the Cell operations to take non
optimal paths.
2017-05-23 10:49:19 -04:00
Robert Maynard
6da48cf3c1 Remove unneeded methods from the Connectivity classes. 2017-05-23 10:49:19 -04:00
Robert Maynard
b56f160434 Add CastAndCall specializations for the concrete CellSet types. 2017-05-23 10:49:19 -04:00
Robert Maynard
9d75e7b775 Remove unneeded member variables from tbb ScheduleKernelId3 2017-05-23 10:49:19 -04:00
Ben Boeckel
b69bb4f890 Merge topic 'fix-whitespace-issues'
cbd918b4 worklet/wavelet: fix whitespace issues

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !773
2017-05-23 09:16:29 -04:00
Kitware Robot
cbd918b43d worklet/wavelet: fix whitespace issues 2017-05-22 16:47:54 -04:00
Robert Maynard
206556916d Merge topic 'support_3DWavelet_compression'
fecc2e97 code style improvements
7782ff47 Take off a few debug statements; replaced tabs with spaces
3e4095f4 WaveletDWT.h
c4853885 eliminate another warning
d4deced5 get rid of some asserts used for debugging
98cf7f8d got rid of unused variable warnings
33de20da fix print type warnings
7d123455 remove my own note
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !765
2017-05-22 14:01:03 -04:00
Robert Maynard
7ed77a4547 Merge topic 'array_handle_reverse_unused_param'
7afda0d1 Correct unused parameter warnings in ArrayHandleReverse

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !772
2017-05-19 16:59:49 -04:00
Robert Maynard
7afda0d148 Correct unused parameter warnings in ArrayHandleReverse 2017-05-19 15:38:26 -04:00