Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-06 02:18:58 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
2,423 Commits 9 Branches 24 Tags 39 MiB
278db37c08
Commit Graph

1860 Commits

Author SHA1 Message Date
Christopher Sewell
278db37c08 Attempt 2 to resolve Windows compiler warning with streaming storage 2016-10-19 14:44:48 -06:00
Christopher Sewell
c5bd2a3e80 Attempt 1 to resolve Windows compiler warning with streaming storage 2016-10-19 12:17:01 -06:00
Christopher Sewell
72d9783c38 Merge remote-tracking branch 'upstream/master' into StreamingArray 2016-10-17 17:51:23 -06:00
Dave Pugmire
b9b2774e1a Merge branch 'master' into 'master' 
Rendering using VBOs.

2D and 3D rendering is now done using VBOs.


@kmorel @robertmaynard 
I think this is redy. You guys ok with this merge req?

See merge request !566
 2016-10-13 15:46:03 -04:00
Kenneth Moreland
4205b94f72 Fix warnings about unused method parameters 
This probably sneaked by the dashboards because not many of them compile
the benchmarking code.
 2016-10-13 11:51:17 -06:00
Mark Kim
464da87d5a Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2016-10-12 14:40:32 -04:00
Robert Maynard
3e09b2cebc VecFromPortal::CopyTo can now handle const value Portals. 2016-10-12 13:28:36 -04:00
Dave Pugmire
b5007de0ab compile warnings. 2016-10-12 08:35:45 -04:00
Kenneth Moreland
6159190669 Fix function signature for UnitTestTransferGLUT 
The function UnitTestTransferGLUT's second argument was declared as type
char **. However, the automatic code generated by CMake's testing
framework calls the function with the type char *[]. Some compilers
distinguish between these two types and were causing linking errors.
Fixed the type so the signatures match.
 2016-10-11 08:03:36 -06:00
Robert Maynard
c0273cef0d Merge topic 'tbb_disable_implict_library_linking' 
154a4ab6 Make sure tbb doesn't enable autolinking on windows.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !576
 2016-10-10 11:31:58 -04:00
Christopher Sewell
c6e15c1240 Merge remote-tracking branch 'upstream/master' into StreamingArray 2016-10-07 18:10:29 -06:00
Christopher Sewell
1aa092e027 Removing unnecessary allocation in streaming scan 2016-10-07 18:09:50 -06:00
Robert Maynard
f30ebeffa4 Merge topic 'update_interop_tests_to_handle_osmesa' 
59a24105 Refactor the Interop tests to work with OSMesa and GLUT.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !575
 2016-10-07 17:42:51 -04:00
Robert Maynard
154a4ab6e5 Make sure tbb doesn't enable autolinking on windows. 
Since vtk-m is header only, we don't want everybody that is including
the tbb headers to auto-link to libtbb. So disable this behavior.
 2016-10-07 16:08:16 -04:00
Robert Maynard
59a24105c3 Refactor the Interop tests to work with OSMesa and GLUT. 2016-10-06 12:57:29 -04:00
Robert Maynard
e6bbfbe5ce Update the Worklet based benchmarks to also test dynamic arrays. 
This is useful so that we know the performance impact on different
ways to implement virtual arrays in vtk-m.
 2016-10-06 11:54:06 -04:00
Dave Pugmire
60b67fef71 code cleanup. 2016-10-05 09:33:47 -04:00
Dave Pugmire
c7da86f04c compiler warning. 2016-10-05 08:55:19 -04:00
Dave Pugmire
ebef07299e Remove some -Wreorder warnings. 2016-10-04 17:00:05 -04:00
Dave Pugmire
c25a028dcc compile warnings. 2016-10-04 15:29:42 -04:00
Dave Pugmire
a8feb67ad3 warnings.... 2016-10-04 15:10:20 -04:00
Dave Pugmire
31654c2545 fix compiler warning. 2016-10-04 14:38:35 -04:00
Dave Pugmire
fed8c7228c fix compiler warnings. 2016-10-04 13:31:52 -04:00
Dave Pugmire
827bf10795 compiler warnings. 2016-10-04 12:43:04 -04:00
Dave Pugmire
668e8115af Fix compiler warnings. 2016-10-04 11:59:00 -04:00
Kenneth Moreland
039efd6b7e Fix some issues with OpenGL configuration 
Change the OpenGL configuration to require GLEW as most of the OpenGL
code actually requires GLEW (or will as soon as the VBO branch gets
merged in).

Also removed some stray find_package commands and rearranged the
configuration to use the vtkm_configure_component_* commands instead.
 2016-10-03 17:34:15 -06:00
Kenneth Moreland
30e9651658 Merge topic 'restore-function-interface-api' 
452af3a0 Restore the AppendType and ReplaceType templates of FunctionInterface

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !570
 2016-10-03 12:20:36 -04:00
Christopher Sewell
3ee96d9fbd Fixing warning about typedef in ArrayHandleStreaming 2016-09-30 14:47:50 -06:00
Robert Maynard
43fe1a92cb Enable the serial backend tests. 2016-09-30 15:12:34 -04:00
Christopher Sewell
58952e1465 Adding streaming reduce 2016-09-29 15:06:34 -06:00
Christopher Sewell
bf9e1366f5 Fixing warning about char* 2016-09-29 14:33:21 -06:00
Kenneth Moreland
452af3a0eb Restore the AppendType and ReplaceType templates of FunctionInterface 
These are documented and an expected part of the interface. (The
examples in the user's guide started to fail because they were removed.
 2016-09-29 16:22:26 -04:00
Christopher Sewell
9e2210927e Adding streaming exclusive scan and fixing bugs with streaming inclusive scan, but still need to make it treat input as const 2016-09-28 18:29:04 -06:00
Dave Pugmire
c4bd8913c2 Use a new worklet to map vertex colors through a colormap. 2016-09-28 14:23:18 -04:00
Robert Maynard
0f58d6fc54 Add vtkm/cont/serial directory for the serial backend. 2016-09-28 14:22:53 -04:00
Robert Maynard
f7a9bbe0e7 All cuda / tbb unit tests follow the same naming pattern. 2016-09-28 14:22:53 -04:00
Mark Kim
0ace430746 Merge branch 'master' of gitlab.kitware.com:dpugmire/vtk-m 2016-09-28 10:59:27 -04:00
Mark Kim
f2a6d8d5e3 Change the for loop that converts color to Worklet. 2016-09-28 10:57:05 -04:00
Robert Maynard
80b220ff0d Remove boost::random usage from DataSetBuilder tests. 2016-09-28 10:54:04 -04:00
Robert Maynard
70abe603c5 Merge topic 'use_brigand_over_boost_mpl' 
ba8c8586 Get IntegerSequence to work correctly with MSVC.
377532c7 Update brigand to get a chunk of msvc2013 fixes.
a7f7cfe4 Update brigand.hpp to get corrections for MSVC2013.
a931b8e2 FunctionInterface and DispatcherBase don't require boost now.
ac0929a1 Add fast tracks for ListTag operations on size <= 4.
7ad88b6e Use c++11 variadic templates as storage of ListTags.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !559
 2016-09-28 08:41:25 -04:00
Dave Pugmire
c99fe8b65e Remove rendering tests that have been moved to subdirectories. 
Fix a compile error in canvas constructor in the GLFW test.
 2016-09-27 14:04:28 -04:00
Robert Maynard
ba8c85866a Get IntegerSequence to work correctly with MSVC. 2016-09-27 09:02:53 -04:00
Robert Maynard
377532c7a6 Update brigand to get a chunk of msvc2013 fixes. 2016-09-27 09:02:39 -04:00
Mark Kim
a41e0f28df Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2016-09-26 16:12:19 -04:00
Mark Kim
2db35b0041 Removed extraneous debug output. 2016-09-26 15:09:41 -04:00
Robert Maynard
a7f7cfe4f9 Update brigand.hpp to get corrections for MSVC2013. 2016-09-26 10:11:29 -04:00
Robert Maynard
a931b8e295 FunctionInterface and DispatcherBase don't require boost now. 2016-09-23 16:39:20 -04:00
Robert Maynard
ac0929a1cc Add fast tracks for ListTag operations on size <= 4. 
As the significant majority of Lists contain for or less items,
this is a significant improvement to performance.
 2016-09-23 16:39:20 -04:00
Robert Maynard
7ad88b6e5c Use c++11 variadic templates as storage of ListTags. 2016-09-23 16:39:20 -04:00
Robert Maynard
248ec04db7 Correct double trailing semicolons with VTKM_IS_TOPOLOGY_ELEMENT_TAG 2016-09-23 16:38:52 -04:00