Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,166 Commits 8 Branches 22 Tags 30 MiB
9e56a5d881
Commit Graph

3166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Boeckel
9e56a5d881 clang-format: add configuration and attributes 2017-05-25 07:46:44 -04: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
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
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