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

2544 Commits

Author SHA1 Message Date
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
Li-Ta Lo
0ba9784082 Merge topic 'scanbykey' 
5c735a38 this should resovle all the type conversion warnings
d8b02329 Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey
58ef7c8d one more attemp to get the data type right
22d0e355 attempt to fix warning on type conversion
ded4583a attempt to fix warning on type conversion
897b2f0f add tests for 1, 2 and ARRAY_SIZE elements for both ScanInclusiveByKey and ScanExclusiveByKey
c05a2c32 Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey
0e97fcb9 handle the case of 0 or 1 element in the input for ScanExclusiveByKey
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !746
 2017-04-25 15:54:25 -04:00
Li-Ta Lo
5c735a385c this should resovle all the type conversion warnings 2017-04-25 10:12:11 -06:00
Robert Maynard
cc08589df6 Make sure ExecutionPolicy.h includes all headers it uses 2017-04-24 13:34:39 -04:00
Li-Ta Lo
d8b02329c5 Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey 2017-04-20 15:13:05 -06:00
Li-Ta Lo
58ef7c8de0 one more attemp to get the data type right 2017-04-20 15:09:38 -06:00
Samuel Li
6c1be79779 pass test on all 1 level DWT/IDWT cases 2017-04-20 11:13:25 -06:00
Li-Ta Lo
22d0e35521 attempt to fix warning on type conversion 2017-04-20 10:22:43 -06:00
David C. Lonie
ec6589d391 Only enable -fPIC on component static libraries when necessary. 2017-04-20 12:15:31 -04:00
Li-Ta Lo
ded4583aca attempt to fix warning on type conversion 2017-04-20 08:54:09 -06:00
Samuel Li
a9bf6d9402 better naming 2017-04-19 18:32:51 -06:00
Samuel Li
0f69a0b45e fix an indexing bug 2017-04-19 18:32:10 -06:00
Li-Ta Lo
897b2f0f63 add tests for 1, 2 and ARRAY_SIZE elements for both ScanInclusiveByKey and ScanExclusiveByKey 2017-04-19 13:38:28 -06:00
Li-Ta Lo
c05a2c323e Merge branch 'scanbykey' of gitlab.kitware.com:ollielo/vtk-m into scanbykey 2017-04-18 16:13:51 -06:00
Li-Ta Lo
0e97fcb94f handle the case of 0 or 1 element in the input for ScanExclusiveByKey 2017-04-18 16:12:36 -06:00
Kenneth Moreland
4758d3d978 Gracefully handle array range requests on empty arrays 
Previously, The ArrayRangeCompute code would throw an exception if you
tried to compute the array range on an empty array. This change instead
returns empty ranges.
 2017-04-18 14:43:05 -06:00
Li-Ta Lo
bea8e85c47 handle the case of 0 or 1 element in the input for ScanExclusiveByKey 2017-04-18 13:26:15 -06:00
Li-Ta Lo
a2085abaf6 add DerivedAlgorithm when calling other methods 2017-04-18 09:39:15 -06:00
Li-Ta Lo
0e107f5c3f remove unused InclusiveToExclusiveByKeyKernel functor 2017-04-18 09:34:52 -06:00
Patricia Kroll Fasel - 090207
14066d8692 Add filter for ExtractStructured 2017-04-18 08:32:13 -06:00
Li-Ta Lo
a205f21043 make ScanExclusiveByKey return void, rearrange parameter ordering 2017-04-17 16:11:02 -06:00
Li-Ta Lo
7023266585 add both generic and Thrust ScanExclusiveByKey 2017-04-17 15:03:49 -06:00
Robert Maynard
f1493cde0d Tetrahedralize and Triangulate don't generate warnings under CUDA. 2017-04-17 16:21:29 -04:00
Samuel Li
b619967d69 sync to debug 2017-04-14 17:15:17 -06:00
Patricia Kroll Fasel - 090207
e4283344fb Clean up 2017-04-14 14:59:42 -06:00
Samuel Li
f11c1bf928 change new error handling 2017-04-14 14:14:09 -06:00
Patricia Kroll Fasel - 090207
78148b0295 Rectilinear with subset and sample and tests 2017-04-14 14:06:28 -06:00
Samuel Li
fad49bdf80 Merge branch 'master' of gitlab.kitware.com:samuelli/vtk-m 2017-04-14 14:05:40 -06:00
Samuel Li
1179007f05 fix typo 2017-04-14 14:05:36 -06:00
Samuel Li
eaee6c3e4b merge from the latest 2017-04-14 14:00:16 -06:00
Patricia Kroll Fasel - 090207
49f8662572 Uniform subset and sample worklet and unit tests working 2017-04-14 13:34:51 -06:00
Li-Ta Lo
e77f9fac6a add CUDA implementation of ScanInclusiveByKey using Thrust library 2017-04-14 11:25:25 -06:00
Samuel Li
0175ee7a65 sync to debug 2017-04-14 10:42:55 -06:00
David Lonie
2a4e55770f Merge topic 'weak_vtable_warnings' 
77baa8a2 Add test for exceptions thrown across library boundaries.
fd0e3e0e Remove vtable from WaveletFilter.
96bf0dac Give AxisAnnotation a virtual destructor.
4807b3c4 Silence warnings about unavoidable weak vtables.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !742
 2017-04-14 08:56:03 -04:00
Samuel Li
10be50059c sync to debug on another machine 2017-04-13 18:25:14 -06:00
Patricia Kroll Fasel - 090207
d7a5379293 Use vtkm:Bounds for all bounding boxes 2017-04-13 14:45:53 -06:00
David C. Lonie
77baa8a295 Add test for exceptions thrown across library boundaries. 2017-04-13 15:16:35 -04:00