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

2559 Commits

Author SHA1 Message Date
Matt Larsen
0498f48269 Fixing incorrect logic when sampling the upper edge of a cell that is on the data set boundry 2017-07-02 17:00:10 -07:00
David Lonie
86e597b309 Merge topic 'simplify_transfers' 
b2c3e416 Refactor array transfer logic for basic storage.
bc1b9207 Add macro to help pass commas into other macros.
d4d7683f Initialize member variables of ArrayPortalFromIterators.
8ffaa83b Silence pointless warnings on TestBuilds.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !752
 2017-06-30 14:53:24 -04:00
David C. Lonie
b2c3e41645 Refactor array transfer logic for basic storage. 
The old templated array transfer mechanism generated a lot of code
that ended up doing a simple, type-agnostic memcpy for most devices.
This patch specialized array handles for basic storage and uses a
fast-path array transfer implementation. This reduces the size of the
vtkm_cont library by 27% on gcc (from 6.2MB to 4.5MB).
 2017-06-29 13:18:44 -04:00
Sujin Philip
10dc106fa8 Add option to skip facted normals normalization 
This will allow us to generate faster but approximate point normals.
 2017-06-29 12:26:35 -04:00
David C. Lonie
bc1b920741 Add macro to help pass commas into other macros. 
VTKM_PASS_COMMAS(...) will pass it's arguments verbatim into another
macro, even if they contain commas. This is helpful when using templated
classes, e.g.

#define SOME_MACRO(arg) ...

SOME_MACRO(vtkm::cont::ArrayHandle<float, StorageTag>)

won't compile, because the comma in the template parameters is assumed
to be separating macro arguments. Adding extra parenthesis,

SOME_MACRO((vtkm::cont::ArrayHandle<float, StorageTag>))

helps in some cases, but not others (e.g. the macro declares a variable).

SOME_MACRO(VTKM_PASS_COMMAS(vtkm::cont::ArrayHandle<float, StorageTag>))

will always* work.
 2017-06-29 09:51:07 -04:00
David C. Lonie
d4d7683f17 Initialize member variables of ArrayPortalFromIterators. 2017-06-29 09:51:06 -04:00
Sujin Philip
67a95ee19a Merge topic 'fix-marchingcubes-normals' 
08fb95d5 Options to compute fast normals in MarchingCubes
74f1a0bf Fix Marching Cubes normals
42ce2dcb Add ScatterPermutation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !811
 2017-06-21 09:39:08 -04:00
David Lonie
462033699f Merge topic '157-threshold_field_refactor' 
1cc855ab Refactor the Threshold worklet field mapping.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !808
 2017-06-21 09:12:10 -04:00
David C. Lonie
1cc855abec Refactor the Threshold worklet field mapping. 
Refs #157.
 2017-06-21 09:09:46 -04:00
Sujin Philip
08fb95d5ee Options to compute fast normals in MarchingCubes 
Adds ComputeFastNormalsForStructured and ComputeFastNormalsForUnstructured
flags to the marching cubes filter.
 2017-06-20 16:56:24 -04:00
Sujin Philip
74f1a0bf8b Fix Marching Cubes normals 2017-06-20 16:25:49 -04:00
David Lonie
8c0d1d12d0 Merge topic '157-extract_geometry_refactor' 
769c3c40 Extract geometry celldata refactor.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !803
 2017-06-20 16:18:06 -04:00
David Lonie
572411c3dd Merge topic '157-triangulate_refactor' 
5fb60c04 Refactor Triangulate worklet/filter for field mapping.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !810
 2017-06-20 15:45:25 -04:00
David Lonie
1a4cdfb55a Merge topic '157-mask_filter_refactor' 
63aecfa5 Refactor field processing for Mask worklet/filter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !805
 2017-06-20 15:44:27 -04:00
Sujin Philip
42ce2dcb39 Add ScatterPermutation 2017-06-20 13:41:02 -04:00
David C. Lonie
5fb60c04ed Refactor Triangulate worklet/filter for field mapping. 
Refs #157.
 2017-06-19 14:50:06 -04:00
Matt Larsen
6c8b0e3e9d Merge topic 'refactor_ray_tracing' 
630e871e refactoring ray tracing and adding new renderer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !802
 2017-06-19 11:02:49 -04:00
Robert Maynard
9716344d88 Merge topic 'correct_ArrayManagerExecutionThrustDevice_warnings' 
cfda0593 ArrayManagerExecutionThrustDevice stops generating casting warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: David Lonie <david.lonie@kitware.com>
Merge-request: !807
 2017-06-19 10:33:33 -04:00
Matt Larsen
630e871ea7 refactoring ray tracing and adding new renderer 2017-06-17 14:28:45 -07:00
David C. Lonie
769c3c405e Extract geometry celldata refactor. 
References #157.
 2017-06-16 14:34:26 -04:00
Robert Maynard
cfda0593be ArrayManagerExecutionThrustDevice stops generating casting warnings. 2017-06-16 08:50:32 -04:00
David C. Lonie
25da216514 Refactor tetrahedralize filter's field processing. 
Refs #157.
 2017-06-15 14:14:27 -04:00
David C. Lonie
63aecfa501 Refactor field processing for Mask worklet/filter. 2017-06-15 13:17:52 -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