Commit Graph

3393 Commits

Author SHA1 Message Date
David C. Lonie
769c3c405e Extract geometry celldata refactor.
References #157.
2017-06-16 14:34:26 -04:00
caseywang777
bf11195da8 Resolve the code review issues 2017-06-16 09:18:14 -06:00
David Lonie
955a638fa4 Merge topic '157-tetrahedralize-refactor'
25da2165 Refactor tetrahedralize filter's field processing.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !806
2017-06-16 10:12:42 -04:00
Robert Maynard
cfda0593be ArrayManagerExecutionThrustDevice stops generating casting warnings. 2017-06-16 08:50:32 -04:00
caseywang777
75c794f6c0 Add 3D kd tree reconstruction and nearest neighbor searh 2017-06-15 17:55:30 -06: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
2ea5f6972f Merge topic 'fix-surfacenormals-install'
5f78f679 Fix SurfaceNormals.hxx installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !804
2017-06-14 14:33:00 -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 Lonie
f69ead4bb0 Merge topic 'full_arrayhandle_summary'
959db03c Add option to print full arrayhandle in summary.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !800
2017-06-13 12:49:25 -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
Sujin Philip
d607c7f858 Merge topic 'simplify-arrayhandle-templates'
c4e31020 Simplify ArrayHandleImplicit template
6ce2a43d Simplify ArrayHandleTransform template

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !795
2017-06-09 09:14:50 -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
Robert Maynard
ca44123992 Merge topic 'add_setup_for_development'
e91401ac Enable SetupForDevelopment in VTK-m
569655c4 Add autostash command flag to git-gitlab-sync
0f171de1 Add gitlab-sync command to ease updating local branches after reformats
c5d20ef7 Merge branch 'upstream-GitSetup' into add_setup_for_development
cc537c70 GitSetup 2016-12-13 (cd5ada6d)
7736f950 Add the update scripts needed to import GitSetup
793b5cf9 CONTRIBUTING guide now covers reformatting and revising commits

Acked-by: Brad King <brad.king@kitware.com>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !792
2017-06-08 15:13:53 -04:00
Sujin Philip
06d67580a7 Merge topic 'add-FacetedSurfaceNormals'
749c0c89 Add Worklet and Filter for faceted surface normals

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !794
2017-06-08 12:18:49 -04:00
Sujin Philip
749c0c8920 Add Worklet and Filter for faceted surface normals 2017-06-08 09:37:12 -04:00
Robert Maynard
e91401ac0f Enable SetupForDevelopment in VTK-m 2017-06-07 10:02:38 -04:00
Robert Maynard
569655c454 Add autostash command flag to git-gitlab-sync 2017-06-07 10:02:38 -04:00
Robert Maynard
0f171de1c5 Add gitlab-sync command to ease updating local branches after reformats 2017-06-07 10:01:12 -04:00
Robert Maynard
c5d20ef7ba Merge branch 'upstream-GitSetup' into add_setup_for_development
* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
2017-06-07 09:58:36 -04:00
GitSetup Upstream
cc537c7073 GitSetup 2016-12-13 (cd5ada6d)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit cd5ada6d5626da409d3ff108c341b9afd615803f (setup).
2017-06-07 09:58:35 -04:00
Robert Maynard
7736f95050 Add the update scripts needed to import GitSetup 2017-06-07 09:43:50 -04:00
Robert Maynard
793b5cf998 CONTRIBUTING guide now covers reformatting and revising commits 2017-06-07 09:43:50 -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
Robert Maynard
2bc9d65634 Merge topic 'properly_handle_multiple_cuda_flags'
05ddc1ad Always treat CUDA_NVCC_FLAGS as a CMake list.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !789
2017-06-02 09:44:40 -04:00
Kenneth Moreland
1293589b85 Merge topic 'fix-auto-generated-clang-format'
731bb64a Make .in files match new formatting
32c7f0a8 Allow clang-format to pass more empty lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !790
2017-06-01 15:14:39 -04:00
Robert Maynard
05ddc1ad95 Always treat CUDA_NVCC_FLAGS as a CMake list.
CUDA_NVCC_FLAGS is not like other compiler flag variables and needs to
be treated as a list and not as a single string
2017-05-31 13:05:51 -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
Kenneth Moreland
32c7f0a8fd Allow clang-format to pass more empty lines
Previously, if you had more than 1 empty line somewhere, clang-format
would eat that empty line. But it is a bit of a pain sometimes to get
the autogenerated code to have the exact empty lines, and there are
valid reasons to allow more than one empty line somewhere, so relax this
condition a bit.
2017-05-31 09:35:26 -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
Li-Ta Lo
74f40e2026 Merge topic 'off_topic'
3b0081b5 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m
06f400fd add .h .hxx into CMakeLists
a7c14c93 fix trailing whitespace
b9405680 Merge remote-tracking branch 'vtkmUpstream/master'
f4494413 resolve the code review issue (2nd)
a9e05698 add new line at the end of UnitTestEntropyFilter.cxx
f295251d resolve the issue from the code review
7391d516 Add UnitTest for EntropyFilter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !774
2017-05-30 16:12:49 -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
6ad4e72a20 Merge topic 'clang_format_function_args'
5dd34600 Respect VTK-m convention of parameters all or nothing on a line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !785
2017-05-26 16:31:42 -04: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