Christopher Sewell
4af0cd4bfb
Attempt 4 to resolve Windows compiler warning with streaming storage
2016-10-20 13:00:43 -06:00
Christopher Sewell
05975a2325
Attempt 3 to resolve Windows compiler warning with streaming storage
2016-10-20 10:32:30 -06:00
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
07609fbcc6
Merge topic 'unused-param-warnings'
...
4205b94f Fix warnings about unused method parameters
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !580
2016-10-13 15:26:35 -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
Dave Pugmire
df3f388c2f
Merge branch 'master' into 'master'
...
Merge.
Merge.
See merge request !7
2016-10-13 11:23:11 -04:00
Robert Maynard
ce1362ad82
Merge topic 'vec_from_portal_const'
...
3e09b2ce VecFromPortal::CopyTo can now handle const value Portals.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !579
2016-10-12 15:53:45 -04: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
ba6af4e008
Merge topic 'test-function-signature'
...
61591906 Fix function signature for UnitTestTransferGLUT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !578
2016-10-11 12:19:40 -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
Kenneth Moreland
2d7d03b1fd
Merge topic 'fix-installed-files'
...
6c511c86 Install supporting Find*.cmake files
fffefe22 Change VTKmDetectCUDAVersion install extension
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !572
2016-10-10 11:31:38 -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
c885b34c80
Merge topic 'benchmark_dynamic_arrays'
...
e6bbfbe5 Update the Worklet based benchmarks to also test dynamic arrays.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !574
2016-10-06 13:42:19 -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
Kenneth Moreland
750b261f71
Merge topic 'glut-component'
...
fbb061d6 Fix some minor issues with move to glut CMake component
039efd6b Fix some issues with OpenGL configuration
d1d7ac54 Add GLUT component to find_package(VTKm)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !573
2016-10-04 15:35:52 -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
Kenneth Moreland
fbb061d661
Fix some minor issues with move to glut CMake component
...
I was using GLUT_LIBRARY instead of GLUT_LIBRARIES, and there was an
extra use of GLUT_INCLUDE_DIR that should not have been there.
2016-10-04 10:48:19 -06: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
d1d7ac54a0
Add GLUT component to find_package(VTKm)
...
This makes it easier to use VTK-m with GLUT. It also makes it more
consistent with GLFW, GLEW, and other support libraries.
2016-10-03 17:34:13 -06:00
Kenneth Moreland
6c511c862c
Install supporting Find*.cmake files
...
The vtkm/CMake directory has several Find*.cmake configuration files
that were used both by the base VTK-m configuration as well as
configuration of projects that use VTK-m. However, several of these
files (particularly the newer ones) were not installed. This change
fixes that.
2016-10-03 15:31:05 -06:00
Kenneth Moreland
fffefe22a3
Change VTKmDetectCUDAVersion install extension
...
The VTKmDetectCUDAVersion.cxx source file used during configuration to
detect the native version of CUDA hardware was renamed to
VTKmDetectCUDAVersion.cu. However, the old filename was still trying to
be installed, which caused the install target to fail.
2016-10-03 15:25:22 -06:00
Kenneth Moreland
9acccf44f6
Merge topic 'cxx-flags-in-package-config'
...
13534a06 Drop cxx_constexpr from target compile features
9f0bd788 Add C++11 flags to sub-projects
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !568
2016-10-03 13:43:59 -04:00
Kenneth Moreland
13534a06b9
Drop cxx_constexpr from target compile features
...
It turns out, this is not supported on MSVC 2013. Presumably
cxx_auto_type is sufficient to force C++11 on all supported compilers.
2016-10-03 10:28:44 -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
03eca7a414
Merge topic 'enable_serial_tests'
...
43fe1a92 Enable the serial backend tests.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !571
2016-09-30 15:46:22 -04: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
Kenneth Moreland
9f0bd78860
Add C++11 flags to sub-projects
...
Recently VTK-m was changed to require C++11. The internal builds set
properties to require C++11, but these never make it to the
configuration for projects that use the VTK-m package (i.e. not declared
in VTKmConfig.cmake).
This change adds a new CMake target, vtkm, which is an interface. It
does not point to an actual library, but it allows code that links it in
to have the appropriate compile flags.
2016-09-29 14:06:07 -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