Commit Graph

1838 Commits

Author SHA1 Message Date
Kenneth Moreland
4b725d0dbf Merge branch 'minor-array-handle-changes' into 'master'
Some minor changes to fancy array handles.

This are just some minor things I ran into while documenting these classes.
One change is just an error in a comment. The other change allows you
to specify the type in make_ArrayHandleCast as a template argument instead
of creating an instance.

See merge request !388
2016-04-10 10:42:50 -04:00
Robert Maynard
bb60abb1af Merge topic 'correct_bug_in_TestAtomicArrayWorklet'
6ac50adc Correct an off by 1 error in UnitTestWorkletMapFieldWholeArray.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !390
2016-04-08 00:07:36 -04:00
Robert Maynard
6ac50adcee Correct an off by 1 error in UnitTestWorkletMapFieldWholeArray.
The sum presumption was presuming 1 to 10 inclusive, when we actually have
0 to 9 inclusive.
2016-04-07 22:59:59 -04:00
Robert Maynard
42836b5123 Merge topic 'correct_rendering_warnings'
27f23480 Correct more warnings and formatting issues with vtkm::rendering.
4269e007 Only build the rendering example if MESA has been found.
daf419fe Correct unused and casting warnings in Scene.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !389
2016-04-07 20:50:20 -04:00
Robert Maynard
27f23480b3 Correct more warnings and formatting issues with vtkm::rendering. 2016-04-07 20:07:22 -04:00
Robert Maynard
4269e0070c Only build the rendering example if MESA has been found. 2016-04-07 20:07:22 -04:00
Robert Maynard
daf419feb7 Correct unused and casting warnings in Scene.h 2016-04-07 20:07:22 -04:00
Robert Maynard
465250f82c Merge topic 'filter_corrections'
779bd587 Bug: CellAverage output storage type can be different than the input.
c0bd0a67 Add missing new lines and #endif comments to vtkm::filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !387
2016-04-07 19:50:40 -04:00
Kenneth Moreland
6543ae4cb8 Some minor changes to fancy array handles.
This are just some minor things I ran into while documenting these classes.
One change is just an error in a comment. The other change allows you
to specify the type in make_ArrayHandleCast as a template argument instead
of creating an instance.
2016-04-07 16:48:49 -06:00
Robert Maynard
779bd58792 Bug: CellAverage output storage type can be different than the input. 2016-04-07 17:09:46 -04:00
Robert Maynard
c0bd0a67d4 Add missing new lines and #endif comments to vtkm::filter 2016-04-07 17:09:11 -04:00
Kenneth Moreland
0bcd172d39 Merge branch 'atomic-improvements' into 'master'
Add AtomicArrayInOut ControlSignature tag

This makes it easier to pass arrays with atomics to a worklet.

See merge request !382
2016-04-05 15:23:37 -04:00
Robert Maynard
6989f15159 Merge topic 'demo_example'
d8175015 Fixed issues with NVCC and anonymous namespace compilation issues.
12ffd536 Suppress false positive warnings from nvcc about host/device.
1edc4650 Add a demo for GTC2016 that covers io/filters/rendering.
7543bfe1 Fixed warning about unused variables in RenderSurface.
e0f496ce Fix warnings about unreachable break statement in ParametricCoordinates.
0c36aef5 Fix warnings about unreachable break statement in CellInterpolate.
ec1e1a3a Fix warnings about unreachable break statement in CellDerivative.
265b778a Fix unused warning in VTKDataSetReaderBase.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !386
2016-04-01 16:25:32 -04:00
Robert Maynard
d817501565 Fixed issues with NVCC and anonymous namespace compilation issues. 2016-04-01 15:50:52 -04:00
Robert Maynard
12ffd536fd Suppress false positive warnings from nvcc about host/device. 2016-04-01 15:50:52 -04:00
Robert Maynard
1edc465055 Add a demo for GTC2016 that covers io/filters/rendering. 2016-04-01 15:50:52 -04:00
Robert Maynard
7543bfe159 Fixed warning about unused variables in RenderSurface. 2016-04-01 15:50:52 -04:00
Robert Maynard
e0f496ceec Fix warnings about unreachable break statement in ParametricCoordinates. 2016-04-01 15:50:52 -04:00
Robert Maynard
0c36aef539 Fix warnings about unreachable break statement in CellInterpolate. 2016-04-01 15:50:51 -04:00
Robert Maynard
ec1e1a3adf Fix warnings about unreachable break statement in CellDerivative. 2016-04-01 13:47:41 -04:00
Robert Maynard
265b778ab9 Fix unused warning in VTKDataSetReaderBase. 2016-03-31 14:37:50 -04:00
Robert Maynard
af2ae8e6e2 Correct issue in matrix mult in View. 2016-03-30 11:35:01 -04:00
Robert Maynard
660ee99752 vtkm::rendering::Triangluator now support CellSetSingleType of triangles. 2016-03-30 10:14:21 -04:00
Robert Maynard
43bb6acdb8 Merge topic 'mclarsen/vtk-m-rendering'
76b6179a Add missing copyright headers.
6a2a47d3 Remove order from new entries in MakeTestDataSet
d7c295f4 added rectilinear to test.
a8c7f92d Move mesa package to right place. Also, add in code for rectlinear mesh.
294b73e0 Make the rendering part of the build optional. Add the mesa libs to the link line.
719b715b Support for explicit cell sets.
98837735 Corrected error in projection matrix that was causing mismatches with ray tracing image and depth buffers.
f9c6f9cd cleanup of code.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !383
2016-03-29 13:15:00 -04:00
Robert Maynard
220b0f7959 Merge topic 'filter_coordinate_casting'
2d3d157e Properly use the policy to determine the coordiante policy conversions.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona <tj.corona@kitware.com>
Merge-request: !385
2016-03-29 12:50:06 -04:00
Robert Maynard
2d3d157ecd Properly use the policy to determine the coordiante policy conversions. 2016-03-29 10:12:49 -04:00
Chuck Atkins
19def117b5 Merge topic 'fix-missing-switch-default'
8d5833ef Add a missing switch default to cleanup more warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !384
2016-03-28 11:34:08 -04:00
Robert Maynard
76b6179abf Add missing copyright headers. 2016-03-28 11:16:35 -04:00
Chuck Atkins
8d5833ef41 Add a missing switch default to cleanup more warnings. 2016-03-28 09:51:04 -04:00
Robert Maynard
6a2a47d3e6 Remove order from new entries in MakeTestDataSet 2016-03-28 08:51:36 -04:00
Dave Pugmire
d7c295f46e added rectilinear to test. 2016-03-28 08:51:36 -04:00
Dave Pugmire
a8c7f92d58 Move mesa package to right place.
Also, add in code for rectlinear mesh.
2016-03-28 08:51:36 -04:00
Dave Pugmire
294b73e00e Make the rendering part of the build optional.
Add the mesa libs to the link line.
2016-03-28 08:51:36 -04:00
Dave Pugmire
719b715b59 Support for explicit cell sets. 2016-03-28 08:51:36 -04:00
Matt Larsen
9883773557 Corrected error in projection matrix that was causing mismatches with ray tracing image and depth buffers. 2016-03-28 08:51:36 -04:00
Dave Pugmire
f9c6f9cde7 cleanup of code. 2016-03-28 08:51:36 -04:00
mclarsen
693b98b92a Merging 2016-03-28 08:51:36 -04:00
mclarsen
39cffd7baa Triangulator fix 2016-03-28 08:51:36 -04:00
Dave Pugmire
aa90c06c09 Allow the renderSurface to get passed to the Plot::Render() 2016-03-28 08:51:36 -04:00
Dave Pugmire
b36091f7f4 Clean up the rendersurface code. 2016-03-28 08:51:35 -04:00
Dave Pugmire
f84401243a Initial checkin for rendering infrastructure.
This largely follows things from EAVL. This is going to change going forward.
Most of the stuff is inside Window.h right now for convenience.
2016-03-28 08:51:35 -04:00
mclarsen
03a95c44b1 adding rendering from other branch 2016-03-28 08:50:04 -04:00
Kenneth Moreland
43ed18b0e1 Add AtomicArrayInOut ControlSignature tag.
This makes it easier to pass arrays with atomics to a worklet.
2016-03-24 17:12:17 -06:00
Robert Maynard
1adb5d287c Merge topic 'simplify_marching_cubes_filter_implementation'
643af035 Simplify MarchingCubes implementation to reuse code where possible.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !381
2016-03-24 09:35:51 -04:00
Robert Maynard
643af0353f Simplify MarchingCubes implementation to reuse code where possible. 2016-03-24 09:09:08 -04:00
Robert Maynard
c12955b758 Merge topic 'less_aggressive_optimization_setting'
3eec5e86 ICC: disable vectorization as both ivdep and simd generate bad code.
f021e4a5 Make the default for vectorization be none.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !368
2016-03-23 16:57:51 -04:00
Jeremy Meredith
b53a466f48 Merge branch 'removeorder' into 'master'
removing all references to field order.

This removes all references to Field::order, since it is currently unused.  If we decide to re-add it, it will be done in a more flexible and robust way.

See merge request !380
2016-03-23 16:08:26 -04:00
Kenneth Moreland
807b818abd Add AtomicArray.h to CMakeLists.txt
Turns on test builds and adds the file to file lists in IDEs.
2016-03-23 12:19:13 -06:00
Robert Maynard
3eec5e86df ICC: disable vectorization as both ivdep and simd generate bad code.
We are disabling the entire vectorization hints for ICC as it generates
both bad code, and dramatically decreases compile time.

The compiler does not check for aliasing or dependencies that might cause
incorrect results after vectorization, and it does not protect against illegal
memory references. #pragma ivdep overrides potential dependencies, but the
compiler still performs a dependency analysis, and will not vectorize if it
finds a proven dependency that would affect results. With #pragma simd, the
compiler does no such analysis, and tries to vectorize regardless.
2016-03-23 14:10:18 -04:00
Robert Maynard
f021e4a575 Make the default for vectorization be none.
A default of 'native' has the concern that people using vtk-m might by
default generate non portable binaries or libraries and will become
very hard to track down why this happens. So do enable vectorization we
default to 'none'.
2016-03-23 14:09:59 -04:00