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

2580 Commits

Author SHA1 Message Date
David Lonie
8c64247707 Merge topic 'marching_cubes_celldata' 
c9f38480 Release CellIdMap if no cell fields exist in MC filter.
44c1d4f6 Remove unused variable.
82ebdd5b Add MarchingCubes::ProcessCellField.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !793
 2017-06-09 09:50:47 -04:00
David C. Lonie
c9f38480d9 Release CellIdMap if no cell fields exist in MC filter. 2017-06-09 09:13:01 -04:00
David C. Lonie
44c1d4f641 Remove unused variable. 2017-06-08 16:50:27 -04:00
David C. Lonie
82ebdd5be7 Add MarchingCubes::ProcessCellField. 
Allow cell data to be mapped through the MarchingCubes filter.
 2017-06-08 16:50:27 -04:00
Sujin Philip
c4e3102084 Simplify ArrayHandleImplicit template 2017-06-08 16:46:45 -04:00
Sujin Philip
6ce2a43d41 Simplify ArrayHandleTransform template 2017-06-08 16:46:45 -04:00
Sujin Philip
749c0c8920 Add Worklet and Filter for faceted surface normals 2017-06-08 09:37:12 -04:00
Sujin Philip
3ecac66cf7 Merge topic 'update-extract-structured' 
fbabd582 Simplify ExtractStructured implementation
d6187283 Add vtkm::RangeId and vtkm::RangeId3
7ee57a82 Mark CellSetStructured functions as const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !787
 2017-06-02 10:07:45 -04:00
Kenneth Moreland
731bb64a0b Make .in files match new formatting 
More corrections for the autoformatter and .in files.
 2017-05-31 09:37:29 -06:00
Sujin Philip
fbabd58222 Simplify ExtractStructured implementation 2017-05-30 17:07:14 -04:00
Sujin Philip
d618728356 Add vtkm::RangeId and vtkm::RangeId3 2017-05-30 16:32:52 -04:00
caseywang777
3b0081b592 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2017-05-30 10:39:46 -06:00
Sujin Philip
7ee57a822e Mark CellSetStructured functions as const 
1) GetPointDimensions
2) GetCellDimensions
 2017-05-30 11:36:48 -04: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
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
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
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
Kitware Robot
4ade5f5770 clang-format: apply to the entire tree 2017-05-25 07:51:37 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Robert Maynard
93a5662a7b Merge topic 'correct_missing_cuda_exec_include' 
cc08589d Make sure ExecutionPolicy.h includes all headers it uses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !756
 2017-04-27 13:00:44 -04:00
Li-Ta Lo
244697c93e Merge topic 'scanbykey' 
987b51f6 add comments on ScanInclusiveByKey and ScanExclusiveByKey

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !754
 2017-04-27 11:33:17 -04:00
Li-Ta Lo
987b51f604 add comments on ScanInclusiveByKey and ScanExclusiveByKey 2017-04-26 16:31:20 -06:00
Robert Maynard
80b9d74a23 Merge topic 'embed_more_into_vtkm_cont' 
ec6589d3 Only enable -fPIC on component static libraries when necessary.
cbfe5fdd Fix up various issues with ArrayHandles in vtkm_cont.
355eea88 Get the vtkm cont cuda object to compile properly.
6ecc22bb First pass at compiling ArrayHandle into vtkm_cont.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !715
 2017-04-26 13:47:10 -04:00