Kenneth Moreland
fb6be2819d
Merge topic 'doxygen-fixes'
...
52060f52 Fix many warnings from doxygen
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !951
2017-09-22 14:05:24 -04:00
Robert Maynard
400c7ca61a
Merge topic 'windows_w4_warnings'
...
311618a1 Enable highest level of warnings(W4) under MSVC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !932
2017-09-22 13:28:20 -04:00
Robert Maynard
311618a15f
Enable highest level of warnings(W4) under MSVC
...
This will make VTK-m warning level match the one used by VTK. This commit
also resolves the first round of warnings that W4 exposes.
2017-09-22 13:04:28 -04:00
Kenneth Moreland
52060f52c7
Fix many warnings from doxygen
...
There are still some warnings left:
* Some text in markdown files are incorrectly picked up as
doxygen commands
* ArrayPortalTransform weirdly inherits from a specialized
version of itself. It's technically correct C++ code, but
gives doxygen fits.
2017-09-22 10:29:08 -06:00
Kenneth Moreland
26e0546d0e
Merge topic 'doxygen-win32-fix'
...
54e6948e Make redirect of doxygen work on windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !950
2017-09-22 12:19:41 -04:00
Robert Maynard
768f994e96
Merge topic 'vtkm_io_uses_using'
...
abf038b1 vtkm/io now prefers 'using' over typedef.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !948
2017-09-21 17:41:56 -04:00
Robert Maynard
427ff728ad
Merge topic 'restore_tbb_schedule_explicit_grain_size'
...
9607f71c TBB 1D scheduling restored to using the explicit grain size.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !946
2017-09-21 16:45:42 -04:00
Kenneth Moreland
54e6948e47
Make redirect of doxygen work on windows
2017-09-21 14:41:25 -06:00
Robert Maynard
abf038b181
vtkm/io now prefers 'using' over typedef.
2017-09-21 13:54:36 -04:00
Kenneth Moreland
3ad8994693
Merge topic 'update-git-setup-files'
...
7d6c99b8 Update git-gitlab-push to recent changes in GitSetup repo
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !947
2017-09-21 12:23:06 -04:00
Kenneth Moreland
7d6c99b8ce
Update git-gitlab-push to recent changes in GitSetup repo
...
The changes silence git rev-parse and support
Windows lease detection.
2017-09-21 09:19:12 -06:00
Kenneth Moreland
1e48012fab
Merge topic 'update-license'
...
c3a3184d Update copyright for Sandia
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci <berk.geveci@kitware.com>
Merge-request: !945
2017-09-21 11:03:33 -04:00
Robert Maynard
9607f71cd3
TBB 1D scheduling restored to using the explicit grain size.
2017-09-21 09:17:44 -04:00
Robert Maynard
b758357721
Merge topic 'remove_interop_cmake_option'
...
8e2751e1 Refactor VTK-m to make the interop code non-conditional.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !939
2017-09-21 09:01:29 -04:00
Kenneth Moreland
dd06ab8e1e
Merge topic 'git-setup-script-name-errors'
...
a0ba2765 Fix errors with variable names with hyphen in git setup scripts
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !942
2017-09-20 17:38:38 -04:00
Kenneth Moreland
1c505020d7
Merge topic 'remove-dead-link'
...
6a532843 Remove dead link from CONTRIBUTING
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !944
2017-09-20 17:37:54 -04:00
Kenneth Moreland
c3a3184d51
Update copyright for Sandia
...
Sandia National Laboratories recently changed management from the
Sandia Corporation to the National Technology & Engineering Solutions
of Sandia, LLC (NTESS). The copyright statements need to be updated
accordingly.
2017-09-20 15:33:44 -06:00
Allison Vacanti
0b36596fd5
Merge topic '173_tbb_unique'
...
3b03177c Add TBB specialization of Unique.
94d668dd Add serial version of Unique.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !933
2017-09-20 14:35:08 -04:00
Robert Maynard
8e2751e1a4
Refactor VTK-m to make the interop code non-conditional.
2017-09-20 13:43:23 -04:00
Li-Ta Lo
2eaeb0e9b1
Merge topic 'kdtree_docs'
...
00008f11 fixed correctness bug introduced previously
1eaaf342 Merge branch 'master' into kdtree_docs
1d4b43b5 Add documentation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !936
2017-09-20 10:11:56 -04:00
Allison Vacanti
3b03177c3f
Add TBB specialization of Unique.
...
This performs roughly an order of magnitude better than the old
implementation on a quad core processor.
2017-09-20 09:47:22 -04:00
Allison Vacanti
de5c23ebb2
Merge topic 'fix_reduce_benchmark'
...
de44c58b Prevent compiler from optimizing out benchmark body.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !943
2017-09-20 09:39:31 -04:00
Kenneth Moreland
6a532843e5
Remove dead link from CONTRIBUTING
...
The contributing document referred to a download page that does not
exist. Since all necessary information is right there in the
document, simply delete the dead link.
2017-09-19 15:24:57 -06:00
Allison Vacanti
1c68106c00
Merge topic '173_tbb_copyif'
...
3638b340 Specialize CopyIf for TBB backend.
81979ae0 Specialize CopyIf for serial backend.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !940
2017-09-19 15:44:05 -04:00
Li-Ta Lo
00008f1106
fixed correctness bug introduced previously
2017-09-19 13:30:07 -06:00
Allison Vacanti
de44c58bb2
Prevent compiler from optimizing out benchmark body.
...
Since the result of the Reduce call was not used, several compilers
were omitting the call completely on release builds.
2017-09-19 14:22:42 -04:00
Kenneth Moreland
984e096081
Merge topic 'patch-contributing'
...
1ea16957 Minor fixes and changes to CONTRIBUTING
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !941
2017-09-19 12:57:46 -04:00
Kenneth Moreland
a0ba2765f7
Fix errors with variable names with hyphen in git setup scripts
...
Specifically, several of the git setup scripts defined a function
named "egrep-q". This almost always works, but I happened to have
an install of git on windows/cygwin that gave the error:
`egrep-q': not a valid identifier
I always thought hyphens were allowed in script identifiers (and
usually they are), but apparently sometimes they are not. (See
for example
https://stackoverflow.com/questions/2821043/allowed-characters-in-linux-environment-variable-names ).
This provides an easy fix by replacing egrep-q with egrep_q.
2017-09-19 10:40:51 -06:00
Kenneth Moreland
1ea16957e2
Minor fixes and changes to CONTRIBUTING
...
Fixed bad directory name for clone command.
Added suggestion to sign up for mailing list.
Corrected statement about the location of data files.
2017-09-19 10:22:57 -06:00
Allison Vacanti
c799f262e9
Merge topic '171-allocation_type'
...
00320e5d Use vtkm::UInt64 for byte sizes.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !935
2017-09-19 12:22:42 -04:00
Allison Vacanti
3638b340ef
Specialize CopyIf for TBB backend.
2017-09-19 11:09:27 -04:00
Allison Vacanti
81979ae08f
Specialize CopyIf for serial backend.
2017-09-19 11:08:22 -04:00
Kenneth Moreland
2fa3a868bd
Merge topic 'dynamic-threshold-call-to-worklet'
...
bd742fc6 Allow Threshold::Run to work on dynamic cell sets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !925
2017-09-19 10:53:53 -04:00
Allison Vacanti
00320e5dc0
Use vtkm::UInt64 for byte sizes.
...
vtkm::Id could be just 32bits, which limits the number of values we
would be able to store for large arrays.
2017-09-19 09:21:14 -04:00
Allison Vacanti
c4c05d8b72
Merge topic 'remove_bad_assert'
...
c07c37ae Remove assert for incorrect assumption new TBB::RBK impl.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !938
2017-09-19 09:16:05 -04:00
Robert Maynard
70f294aeec
Merge topic 'renar_warnings'
...
28ab480a Fix warnings on renar.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !937
2017-09-18 17:28:23 -04:00
Allison Vacanti
c07c37aea2
Remove assert for incorrect assumption new TBB::RBK impl.
...
The assertion assumes that the RHS of the join operation has not been
yet reduced, which is not correct.
2017-09-18 16:12:07 -04:00
Allison Vacanti
28ab480a40
Fix warnings on renar.
2017-09-18 15:33:02 -04:00
Li-Ta Lo
1eaaf342ef
Merge branch 'master' into kdtree_docs
2017-09-18 13:19:55 -06:00
Li-Ta Lo
1d4b43b540
Add documentation
...
Add doxygen documentations for public interface of KD-Tree construction and search.
Also fixed several const-correctness issues.
2017-09-18 13:16:37 -06:00
Allison Vacanti
6c7c4ddec0
Merge topic '173_tbb_reducebykey'
...
d174c0fe Add TBB specialization for ReduceByKey.
c9c7149c Fix typo in ReduceByKey docstring.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !928
2017-09-18 13:48:56 -04:00
Allison Vacanti
94d668dddf
Add serial version of Unique.
...
Rather than falling back to the parallel-oriented algorithm in
DeviceAdapterGeneral, use std::unique.
2017-09-18 12:16:12 -04:00
Robert Maynard
0d7b199cf1
Merge topic 'brigand_conversion_warnings'
...
2b4ef3f5 correct conversion warnings in brigand
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !929
2017-09-17 17:43:07 -04:00
Allison Vacanti
d174c0fe3b
Add TBB specialization for ReduceByKey.
...
TBB's ReduceByKey was using the generic DeviceAdapterGeneral
implementation and was about 50x slower than the serial implementation,
which is very efficient.
This patch improves TBB's RBK implementation significantly, though it still
does not scale well. On a quad core processor, this implementation performs
comparably or slightly worse than the highly efficient serial algorithm.
More than 4 cores may be needed to see sufficient parallel speedup that
would overcome the TBB overhead, and grain size does not seem to affect the
performance significantly.
2017-09-15 14:25:16 -04:00
Abhishek Yenpure
994a1744ce
Merge topic 'fix_particle_advection_example'
...
d30c795c Fix particle advection error
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !930
2017-09-15 14:18:26 -04:00
Abhishek Yenpure
d30c795c08
Fix particle advection error
2017-09-15 13:07:39 -04:00
Robert Maynard
2b4ef3f5c7
correct conversion warnings in brigand
2017-09-15 11:11:58 -04:00
Abhishek Yenpure
8db5c1988c
Merge topic 'fix_advection_error'
...
7ce3d72d Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into fix_advection_error
44254f07 Allocating arrays for worklet execution
1f3f10c0 Moving memory allocations/initializations to a single location
cfb7e7b4 Particle advection changing method inputs
51ae5a0c Additional changes for proper particle advection
fca79d21 Error fixes for particle advection filter
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !922
2017-09-14 22:52:12 -04:00
Patricia Fasel
4f9b66c880
Merge topic 'cosmo-fix'
...
57165916 Cosmology fix
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !927
2017-09-14 15:18:35 -04:00
Abhishek Yenpure
7ce3d72dd1
Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into fix_advection_error
2017-09-14 14:50:27 -04:00