Commit Graph

2537 Commits

Author SHA1 Message Date
David C. Lonie
25da216514 Refactor tetrahedralize filter's field processing.
Refs #157.
2017-06-15 14:14:27 -04:00
Sujin Philip
5f78f67939 Fix SurfaceNormals.hxx installation 2017-06-14 14:12:20 -04:00
David Lonie
42a4bb5bb6 Merge topic '157-clip-refactor'
20eed197 Refactor the clip filters/worklet (See #157).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !799
2017-06-13 15:48:58 -04:00
David C. Lonie
20eed197c1 Refactor the clip filters/worklet (See #157). 2017-06-13 10:24:07 -04:00
David C. Lonie
959db03ca0 Add option to print full arrayhandle in summary.
Useful for quickly debugging.
2017-06-13 10:21:41 -04:00
Sujin Philip
75f0957f8c Merge topic 'add-SmoothSurfaceNormals'
18d0f3e1 Add SmoothSurfaceNormals worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !798
2017-06-12 17:21:45 -04:00
Sujin Philip
18d0f3e143 Add SmoothSurfaceNormals worklet
Also updates SurfaceNormals filter to produce smooth normals.
2017-06-12 16:50:22 -04:00
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