Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 11:05:44 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
3,843 Commits 9 Branches 24 Tags 38 MiB
e7fac3d873
Commit Graph

3843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Pugmire
e7fac3d873 Wrap the streamline functionality with a filter. 2017-09-27 21:38:37 -04:00
Dave Pugmire
0468775c4e Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2017-09-27 21:36:41 -04:00
Kenneth Moreland
8e94e2ae52 Merge topic 'array-copy' 
aa0a7bdc Fix ambiguous make_ArrayHandleCast template
091881d2 Use default storage in ArrayHandleCompositeVector test
2625ae78 Update VTK-m source to use new ArrayCopy functionality
f4ff589a Add version of ArrayCopy that takes a device adapter
65c7324f Create ArrayCopy method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !953
 2017-09-27 15:27:29 -04:00
Kenneth Moreland
aa0a7bdceb Fix ambiguous make_ArrayHandleCast template 
In a previous commit I made a version of make_ArrayHandleCast that
returned the same array if no cast was needed. That should shorten
template type names and make them easier to read. However, some
compilers were having trouble distinguishing between the two versions I
had created. This change uses an internal structure to make the
resolution easier.
 2017-09-27 10:56:22 -06:00
Kenneth Moreland
091881d2a4 Use default storage in ArrayHandleCompositeVector test 
The idea of the test was to turn off the "default" storage to ensure
that the fancy array was not making assumptions about the storage of its
delegate array. But there is lots of code elsewhere that uses the
default storage (rightly so) to create intermediate arrays, which will
fail if you disable the default storage. This was causing a test to
fail, so turn default storage back on for this case.
 2017-09-27 10:05:24 -06:00
Allison Vacanti
bb759dd5eb Merge topic 'devAlgo_diff_tool' 
e22a4108 Add python script that diffs VTKM benchmarks.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !955
 2017-09-26 17:13:13 -04:00
Allison Vacanti
e22a410885 Add python script that diffs VTKM benchmarks. 2017-09-26 16:49:25 -04:00
Kenneth Moreland
2625ae7866 Update VTK-m source to use new ArrayCopy functionality 2017-09-25 16:54:46 -06:00
Kenneth Moreland
f4ff589a9d Add version of ArrayCopy that takes a device adapter 
This is still more convenient than declaring DeviceAdapterAlgorithm just
to copy two arrays. Now the function works whether or not you know what
the device should be.
 2017-09-25 16:54:24 -06:00
Kenneth Moreland
65c7324ffe Create ArrayCopy method 
This is a convenience method to do a deep copy of an array. This comes
up a lot, but can be a pain if you don't have a specific device adapter
on which to do the copy.
 2017-09-25 16:28:44 -06:00
Robert Maynard
d4416031c4 Merge topic 'convert_vtkm_to_nullptr' 
fe8b75f7 Consistenly use nullptr in vtk-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !952
 2017-09-25 10:52:21 -04:00
Robert Maynard
fe8b75f7bf Consistenly use nullptr in vtk-m. 2017-09-25 09:57:23 -04:00
Matt Larsen
83165f0cde Merge topic 'concrete-canvas' 
b5bfa1ed More copyright header fixes
e6c204ac Fix copyright header merge issues
495adacc Merge branch 'master' into concrete-canvas
dc0e3d51 Enhances colorbar with translucent indicator for alpha values
28c1bc65 Draws world annotations before scene render
53fb679e Adds explicit inline for `Texture2DSampler`
a32e46df Removes storage tag template parameter
30925774 Remove `typename` keyword from explicit specializations
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !934
 2017-09-23 11:48:12 -04:00
Manish Mathai
b5bfa1edff More copyright header fixes 2017-09-22 16:10:33 -07:00
Manish Mathai
e6c204ac67 Fix copyright header merge issues 2017-09-22 15:31:27 -07:00
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
Manish Mathai
495adacc38 Merge branch 'master' into concrete-canvas 2017-09-22 09:32:21 -07: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
Manish Mathai
dc0e3d51f6 Enhances colorbar with translucent indicator for alpha values 2017-09-21 16:20:54 -07:00
Manish Mathai
28c1bc65d7 Draws world annotations before scene render 
This reordering of draw calls is to ensure that volume renderer does not
clobber the annotations.
 2017-09-21 16:08:56 -07: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
Manish Mathai
53fb679e91 Adds explicit inline for Texture2DSampler 2017-09-20 13:55:18 -07:00
Manish Mathai
a32e46df7c Removes storage tag template parameter 2017-09-20 13:50:46 -07: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
Dave Pugmire
7c9d6fb158 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2017-09-20 07:22:09 -04:00
Manish Mathai
3092577440 Remove typename keyword from explicit specializations 2017-09-19 14:31:35 -07: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
Manish Mathai
2f7988adc2 Merge branch 'master' into concrete-canvas 2017-09-19 10:01:38 -07: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