Commit Graph

3222 Commits

Author SHA1 Message Date
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
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
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
Robert Maynard
3b84d47fe4 Merge topic 'introduce_task_concept'
60a405ef Add TaskTiling1D/3D which use faux virtuals to reduce binary size.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !771
2017-05-25 15:48:52 -04:00
Li-Ta Lo
af61c7e623 Merge branch 'array_handle_reverse_write_2' of gitlab.kitware.com:ollielo/vtk-m into array_handle_reverse_write_2 2017-05-25 11:21:14 -06: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
Robert Maynard
6b2083db09 Merge topic 'improve_commit_guidelines'
5843826b Expand the CONTRIBUTING section on writing git commit messages.
7db9ef3b Cleanup up some style issues in code block of README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !782
2017-05-25 12:04:39 -04:00
Robert Maynard
5843826bcb Expand the CONTRIBUTING section on writing git commit messages.
Flesh out the commit message section to inform new git users on what
the proper style of a good message looks like.
2017-05-25 11:53:50 -04:00
Robert Maynard
7db9ef3bd8 Cleanup up some style issues in code block of README 2017-05-25 11:14:01 -04: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
Li-Ta Lo
80d4ee90a5 Enable output to ArrayHandleReverse
Added test for using ArrayHandleReverse as output of ScanInclusiveByKey,
relexed the constrain for ArrayHandleReverse to allocate storage for the
underlying ArryaHandle
2017-05-25 08:48:13 -06:00
Ben Boeckel
4655f5af4d Merge topic 'reformatting'
4ade5f57 clang-format: apply to the entire tree
9e56a5d8 clang-format: add configuration and attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !769
2017-05-25 09:59:31 -04:00
Kitware Robot
4ade5f5770 clang-format: apply to the entire tree 2017-05-25 07:51:37 -04:00
Ben Boeckel
9e56a5d881 clang-format: add configuration and attributes 2017-05-25 07:46:44 -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
Robert Maynard
57feb06e74 Merge topic 'update_readme'
f7e28107 Rewrite the VTK-m README document.
49b11461 Rewrite the VTK-m CONTRIBUTING document.
6b4054c3 Consistently use VTKm_ENABLE instead of having VTKm_BUILD and VTKm_ENABLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !777
2017-05-24 17:39:07 -04:00
Robert Maynard
f7e28107a7 Rewrite the VTK-m README document. 2017-05-24 16:52:26 -04: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