Commit Graph

2792 Commits

Author SHA1 Message Date
Robert Maynard
6d9dd7d233 Correct conversion warning in VolumeRendererStructured 2016-10-31 15:27:45 -04:00
Robert Maynard
cc8121d997 Fix uninitialized warnings from DecodePNG. 2016-10-31 15:26:05 -04:00
Robert Maynard
c75feb74bb Don't build vtkm_rendering if we can't find opengl. 2016-10-31 15:16:36 -04:00
Robert Maynard
13941a7b94 Merge topic 'simplify_types'
c23c91de Exclude a specific ACos test on ICC in release mode.
5cd9acad Fixup for 1 back.
f31d6c22 Refactor vtkm::Types to be concise and move math helpers out of internal.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !583
2016-10-31 14:39:48 -04:00
Robert Maynard
c23c91de14 Exclude a specific ACos test on ICC in release mode.
When the intel compiler has vectorization enabled ( -O2/-O3 ) it converts the
`adjacent/hypotenuse` divide operation into reciprocal (rcpps) and
multiply (mulps) operations. This causes a change in the expected result that
is larger than the tolerance of test_equal.
2016-10-28 14:57:16 -04:00
Robert Maynard
5cd9acadf6 Fixup for 1 back. 2016-10-28 14:57:16 -04:00
Robert Maynard
f31d6c2258 Refactor vtkm::Types to be concise and move math helpers out of internal.
I have verified that the optimized assembly for Vec<3> and Vec<4> are consistent
with what we generated before.
2016-10-28 14:57:16 -04:00
Christopher Sewell
d7ff809716 Attempt to resolve warnings for streaming device adapter algorithms 2016-10-27 11:09:27 -06:00
Samuel Li
35a81df04f change variable names to avoid confusion 2016-10-25 19:19:55 -07:00
Samuel Li
b2719157c5 simplify functions to get the approximation and detail coefficients length 2016-10-25 19:08:11 -07:00
Christopher Sewell
9afbdffbf5 Attempt fix warning in streaming 2016-10-25 08:36:24 -06:00
Samuel Li
d7e94e3ad5 update 2D idwt to not assign zero to the last element of cDTemp 2016-10-24 19:11:05 -07: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
Christopher Sewell
a5a487b365 Attempt 15 to resolve Windows compiler warning with streaming storage 2016-10-23 07:24:28 -06: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
Christopher Sewell
b9d8172635 Attempt 14 to resolve Windows compiler warning with streaming storage 2016-10-21 17:31:45 -06:00
Christopher Sewell
93d7956daf Attempt 13 to resolve Windows compiler warning with streaming storage 2016-10-21 16:08:13 -06:00
Christopher Sewell
92d686fccd Attempt 12 to resolve Windows compiler warning with streaming storage 2016-10-21 15:12:22 -06:00
Christopher Sewell
8e7caab8dc Attempt 11 to resolve Windows compiler warning with streaming storage 2016-10-21 13:42:21 -06:00
Christopher Sewell
1ebf0c17b6 Attempt 10 to resolve Windows compiler warning with streaming storage 2016-10-21 13:10:49 -06:00
Christopher Sewell
45208e83cc Attempt 9 to resolve Windows compiler warning with streaming storage 2016-10-21 12:41:23 -06:00
Christopher Sewell
f1af30804e Attempt 8 to resolve Windows compiler warning with streaming storage 2016-10-21 10:58:14 -06: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
Christopher Sewell
c540a699f2 Attempt 7 to resolve Windows compiler warning with streaming storage 2016-10-21 10:12:15 -06: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
Christopher Sewell
6096b6f12a Attempt 6 to resolve Windows compiler warning with streaming storage 2016-10-20 15:35:54 -06: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
Christopher Sewell
2c8d2d3006 Attempt 5 to resolve Windows compiler warning with streaming storage 2016-10-20 14:27:07 -06: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
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
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
Christopher Sewell
278db37c08 Attempt 2 to resolve Windows compiler warning with streaming storage 2016-10-19 14:44:48 -06: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
Christopher Sewell
c5bd2a3e80 Attempt 1 to resolve Windows compiler warning with streaming storage 2016-10-19 12:17:01 -06:00