Commit Graph

2423 Commits

Author SHA1 Message Date
Robert Maynard
c75feb74bb Don't build vtkm_rendering if we can't find opengl. 2016-10-31 15:16:36 -04:00
Kenneth Moreland
bbb41c1a43 Merge topic 'cell-average-warning'
4f81f04f Fix warning about type conversion

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !594
2016-10-24 21:39:26 -04:00
Kenneth Moreland
4f81f04ff3 Fix warning about type conversion 2016-10-24 16:47:36 -04:00
Kenneth Moreland
35608c082e Merge topic 'coord-system-policy'
622a4433 Add VTK_EXEC_EXPORT to new CellAverage methods
adfb0bba Fix ApplyPolicy for CoordinateSystem objects
f820f0c7 Support arbitrary field types in CellAverage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !592
2016-10-23 13:42:12 -04:00
Kenneth Moreland
622a44339d Add VTK_EXEC_EXPORT to new CellAverage methods
Frankly, I am surprised that the CellAverage worklet compiled on CUDA
when the parenthesis operator relied on methods that were not delcared
as __device__.
2016-10-23 11:51:09 -04:00
Kenneth Moreland
adfb0bba55 Fix ApplyPolicy for CoordinateSystem objects
There was a mismatch in the ApplyPolicy function for CoordinateSystem
objects. The return type declared for the function was not the same as
the type of object actually returned.

Also added a test that actually uses a filter with a CoordinateSystem as
a field to actually test this functionality.
2016-10-23 11:51:09 -04:00
Kenneth Moreland
f820f0c76d Support arbitrary field types in CellAverage
Previously, the CellAverage worklet only operated on scalar fields.
However, there is no reason why you cannot average vectors. This change
allows passing input fields with arbitrary value types in the field
array.

We will use this functionality in the commit to test running filters on
coordinate systems (which, of course, are Vec 3 objects).
2016-10-23 11:51:09 -04:00
Kenneth Moreland
fe277ca895 Merge topic 'remove-unneeded-glfw'
797d30d7 Remove unnecessary link from vtkm_rendering to glfw

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !593
2016-10-23 09:48:06 -04:00
Kenneth Moreland
797d30d7bb Remove unnecessary link from vtkm_rendering to glfw
There is no code in the rendering library that uses GLFW. (GLFW is
currently only used directly by tests and examples.) This adds
unnecessary link dependencies that can only hurt us later.
2016-10-22 16:03:16 -06:00
Robert Maynard
72c44dc993 Merge topic 'remove_boost_cmake_logic'
49cf198b Update the documentation to reflect we don't require boost.
e506afee Remove warning suppressions that are specifically for boost.
ab98ae89 Remove boost CMake logic as VTK-m doesn't require boost now.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !591
2016-10-22 09:15:20 -04:00
Matt Larsen
e15c858f8c Merge topic 'fix/dataset_reader'
4f482474 Fixing error in data set reader that zeroed out cell asscociated fields in unstructured data sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !587
2016-10-21 12:35:18 -04:00
Robert Maynard
49cf198b80 Update the documentation to reflect we don't require boost. 2016-10-21 08:41:22 -04:00
Robert Maynard
e506afee3d Remove warning suppressions that are specifically for boost. 2016-10-21 08:41:22 -04:00
Robert Maynard
ab98ae8992 Remove boost CMake logic as VTK-m doesn't require boost now. 2016-10-21 08:41:22 -04:00
Robert Maynard
b57067c6ab Merge topic 'remove_boost_lexical_cast'
5ec273aa Remove all occurrences of boost::lexical_cast from vtk-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !590
2016-10-21 08:32:33 -04:00
Robert Maynard
5ec273aade Remove all occurrences of boost::lexical_cast from vtk-m.
Replaced with the new std::stof/stoi functions.
2016-10-20 16:55:15 -04:00
Robert Maynard
285e594e7a Merge topic 'cxx11_relax_for_intel'
a8e06d8e Expand how we check that we have a c++11 compiler.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !589
2016-10-20 15:45:32 -04:00
Robert Maynard
a8e06d8ec6 Expand how we check that we have a c++11 compiler.
certain versions of the intel compiler set __cplusplus to 1, so instead
we need to check for __INTEL_CXX11_MODE__.
2016-10-20 15:05:05 -04:00
Robert Maynard
5e6169f720 Merge topic 'cellset_single_type_correct_num_points'
37efba15 CellSetSingleType now can be constructed with proper number of points

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !586
2016-10-20 10:53:19 -04:00
Robert Maynard
37efba159c CellSetSingleType now can be constructed with proper number of points
This is important so that when we execute a Cell->Point worklet we
don't have to compute the number of points from the connectivity array.
2016-10-20 08:33:16 -04:00
Robert Maynard
ca9233226e Merge topic 'refactor_vtkm_rendering_export_markup'
7d295de8 Refactor vtk-m symbol visibility macros to be on the classes.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !585
2016-10-19 20:02:04 -04:00
Matt Larsen
4f482474e9 Fixing error in data set reader that zeroed out cell asscociated fields in unstructured data sets 2016-10-19 15:00:39 -07:00
Robert Maynard
23a17333c6 Merge topic 'remove_boost_iterators'
788458b0 Correct failures finding ptrdiff_t now that boost is gone.
5c564b06 Replace usage of boost::iterator_facade with hand rolled iterator.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !584
2016-10-19 15:24:37 -04:00
Robert Maynard
7d295de8c9 Refactor vtk-m symbol visibility macros to be on the classes.
Instead of labeling each method that needs to have visibility
we can label entire classes, this reduces the amount of noise and
potential for mistakes when writing classes.
2016-10-19 15:01:32 -04:00
Robert Maynard
788458b0c7 Correct failures finding ptrdiff_t now that boost is gone. 2016-10-19 08:35:45 -04:00
Robert Maynard
5c564b0657 Replace usage of boost::iterator_facade with hand rolled iterator. 2016-10-19 08:35:42 -04:00
Mark Kim
723570fd6e Merge topic 'fix_cam'
4f835fb3 Need to continuously upload the camera for examples/Rendering.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !582
2016-10-17 14:30:54 -04:00
Mark Kim
4f835fb31d Need to continuously upload the camera for examples/Rendering. 2016-10-17 10:34:20 -04: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
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