Commit Graph

3302 Commits

Author SHA1 Message Date
David C. Lonie
6a6e55b534 Fix warning on gcc 7.1.1.
Implicit cast from size_t to int was triggering a couple thousand
warnings on the new GCC.
2017-07-12 15:35:12 -04:00
Matt Larsen
c9ce558497 Merge topic 'fix_for_rt_lib'
adced368 Adding private targert link library to fix undefined symbols in ubuntu

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
2017-07-10 10:36:19 -04:00
Matt Larsen
adced36814 Adding private targert link library to fix undefined symbols in ubuntu 2017-07-10 07:34:51 -07:00
Matt Larsen
ab76f8161e Merge topic 'no_opengl_rendering_fix'
013ff1ba On a system that has no opengl or mesa and with rendering enabled (such as docker container), vtkm fails to configure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !832
2017-07-10 10:26:55 -04:00
Matt Larsen
013ff1ba45 On a system that has no opengl or mesa and with rendering enabled (such as docker container), vtkm fails to configure
when adding target_include_directories for the rendering library. I believe this happens because cmake determines that the variable VTKm_OPENGL_INCLUDE_DIRECTORIES is dependent on OPENGL_INCLUDE_DIRS( which is NOTFOUND). This causes cmake to raise an error even when VTKm_OPENGL_INCLUDE_DIRECTORIES is set to "".
2017-07-10 07:24:50 -07:00
Matt Larsen
30d4577a9c Merge topic 'rendering_header_cleanup'
e783487f Adding ArrayHandleCast header
a2b3f803 Cleaning up rendering headers and moving structured volume renderer into cxx file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !831
2017-07-08 18:42:20 -04:00
Matt Larsen
e783487f98 Adding ArrayHandleCast header 2017-07-08 14:03:33 -07:00
Matt Larsen
a2b3f80356 Cleaning up rendering headers and moving structured volume renderer into cxx file 2017-07-08 13:48:38 -07:00
David Lonie
8c4a7f74fb Merge topic '163-VecUniformPointCoordinates-refactor'
fb2d36be Refactor VecRectilinearPointCoordinates.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !824
2017-07-07 15:23:27 -04:00
David C. Lonie
fb2d36be1e Refactor VecRectilinearPointCoordinates.
See #163.
2017-07-07 13:49:35 -04:00
Robert Maynard
1141215d42 Merge topic 'better_doxygen'
9cb98f85 Doxygen disable showing full paths for files
c1f1f3cb Add CONTRIBUTING.md to the doxygen page
feaa1450 Make VTK-m inheritance diagrams look like VTK's
3f42642d Use Markdown readme as mainpage for doxygen.
c09e88d2 Improve the overall doxygen content for vtk-m.
ccc8455e First initial pass at cleaning up the doxygen generation for vtkm
41fbff90 Ignore whitespace in markdown files as they mean something

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !825
2017-07-07 13:21:40 -04:00
Robert Maynard
9cb98f85f0 Doxygen disable showing full paths for files 2017-07-07 11:14:25 -04:00
Robert Maynard
c1f1f3cb68 Add CONTRIBUTING.md to the doxygen page 2017-07-07 11:14:25 -04:00
Robert Maynard
feaa145026 Make VTK-m inheritance diagrams look like VTK's 2017-07-07 11:14:25 -04:00
Robert Maynard
3f42642d24 Use Markdown readme as mainpage for doxygen. 2017-07-07 11:14:25 -04:00
Robert Maynard
c09e88d214 Improve the overall doxygen content for vtk-m. 2017-07-07 11:14:25 -04:00
Robert Maynard
ccc8455e1d First initial pass at cleaning up the doxygen generation for vtkm 2017-07-07 11:14:25 -04:00
Robert Maynard
41fbff9064 Ignore whitespace in markdown files as they mean something 2017-07-07 11:14:25 -04:00
Robert Maynard
09c8305cd4 Merge topic 'efficient_gradient_computations'
2c225e9e Update MarchingCubes to use the new gradient API.
5de35112 Allow Gradient to output in FORTRAN ordering.
8d04796b Allow Vector Gradient computation to output fancy fields and not gradient
85a62423 Gradient now has a Run method, and requires ArrayHandle type to be known

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !812
2017-07-07 09:25:45 -04:00
Robert Maynard
60fa3143f3 Merge topic 'correct_task_tuner_testbuilds'
09a08fea Correct errors in TaskTuner found from the TestBuilds.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !827
2017-07-07 09:21:06 -04:00
Robert Maynard
09a08fea8d Correct errors in TaskTuner found from the TestBuilds. 2017-07-07 08:40:03 -04:00
Robert Maynard
c2d184008e Merge topic 'move_cuda_parameter_sweep_to_seaparate_file'
c11f29c0 Move the parameter sweeping code to a separate header.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !823
2017-07-07 08:13:26 -04:00
Mark Kim
8f6d9eab1d Merge topic 'rays-on-windows'
8c5129fa Saving pnms with VS2015 converts LF into CRLF unless the file is opened as binary.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !826
2017-07-06 21:38:32 -04:00
Mark Kim
8c5129fa68 Saving pnms with VS2015 converts LF into CRLF unless the file is opened as binary. 2017-07-06 18:56:16 -04:00
Robert Maynard
2c225e9e87 Update MarchingCubes to use the new gradient API. 2017-07-05 16:32:31 -04:00
Robert Maynard
5de351124a Allow Gradient to output in FORTRAN ordering.
VTK expects that the tensor fields generated by the gradient of a vector field
to have FORTRAN ordering instead of C ordering.

Discovering this actually uncovered bugs in the Vorticity and QCriterion
implementation where they presumed FORTRAN ordering, and would generate
incorrect results.
2017-07-05 16:32:31 -04:00
Robert Maynard
c11f29c093 Move the parameter sweeping code to a separate header.
The parameter sweeping code is only enabled when tuning for new GPU's
so we should move it to a separate header to make DeviceAdapterAlgorithmThrust
easier to read.
2017-07-05 14:58:19 -04:00
Matt Larsen
d1c86f45cf Merge topic 'ray_tracer_fix'
33ebf0aa simpler method of scaling epsilon based on primitive AABB
c2ffa665 Adding scaled epsilon to bounding boxes to handle floating point edge cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !821
2017-07-05 10:06:26 -04:00
Matt Larsen
33ebf0aaa1 simpler method of scaling epsilon based on primitive AABB 2017-07-04 16:43:31 -07:00
Matt Larsen
c2ffa665d2 Adding scaled epsilon to bounding boxes to handle floating point edge cases 2017-07-04 15:10:17 -07:00
Matt Larsen
838cb9adb0 Merge topic 'bvh_fix'
ce3814c2 bvh checking for a single triangle

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !820
2017-07-04 11:16:58 -04:00
Matt Larsen
ce3814c266 bvh checking for a single triangle 2017-07-03 19:50:45 -07:00
Matt Larsen
0165bdc377 Merge topic 'volume_set_composite_background'
95749ee2 connecting composite background from volume mapper to renderer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !819
2017-07-03 20:58:22 -04:00
Robert Maynard
8d04796b1f Allow Vector Gradient computation to output fancy fields and not gradient
Basically we can run the gradient worklet and compute the Divergence, Vorticity,
and QCriterion without ever having to store the gradient tensor in global memory
2017-07-03 16:11:01 -04:00
Robert Maynard
85a62423bd Gradient now has a Run method, and requires ArrayHandle type to be known
The gradient worklet is now templated on the input value type. This simplifies
the logic of the gradient. Secondly we have added a Run method for the
first step of making gradient a 'fatter' worklet that can handle generation
of vorticity, Divergence, and QCriterion.
2017-07-03 16:11:01 -04:00
Robert Maynard
295402a3a5 Merge topic 'allow_reverse_connectivity_building_on_empty_cellset'
f9906bbe CellSetExplicit can now build reverse connectivity even when empty.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !818
2017-07-03 16:03:53 -04:00
Matt Larsen
95749ee223 connecting composite background from volume mapper to renderer 2017-07-03 11:00:54 -07:00
Robert Maynard
f9906bbe05 CellSetExplicit can now build reverse connectivity even when empty.
Before we would try to access the -1 index of the connectivity array
2017-07-03 13:45:08 -04:00
Matt Larsen
62abec2153 Merge topic 'volume_fix'
ce2c2910 removing debug variable
0498f482 Fixing incorrect logic when sampling the upper edge of a cell that is on the data set boundry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !817
2017-07-03 10:20:56 -04:00
Matt Larsen
ce2c29105f removing debug variable 2017-07-02 17:02:39 -07:00
Matt Larsen
0498f48269 Fixing incorrect logic when sampling the upper edge of a cell that is on the data set boundry 2017-07-02 17:00:10 -07:00
David Lonie
86e597b309 Merge topic 'simplify_transfers'
b2c3e416 Refactor array transfer logic for basic storage.
bc1b9207 Add macro to help pass commas into other macros.
d4d7683f Initialize member variables of ArrayPortalFromIterators.
8ffaa83b Silence pointless warnings on TestBuilds.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !752
2017-06-30 14:53:24 -04:00
Sujin Philip
73bc26662c Merge topic 'improve-surface-normals'
10dc106f Add option to skip facted normals normalization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !815
2017-06-30 10:09:58 -04:00
David C. Lonie
b2c3e41645 Refactor array transfer logic for basic storage.
The old templated array transfer mechanism generated a lot of code
that ended up doing a simple, type-agnostic memcpy for most devices.
This patch specialized array handles for basic storage and uses a
fast-path array transfer implementation. This reduces the size of the
vtkm_cont library by 27% on gcc (from 6.2MB to 4.5MB).
2017-06-29 13:18:44 -04:00
Sujin Philip
10dc106fa8 Add option to skip facted normals normalization
This will allow us to generate faster but approximate point normals.
2017-06-29 12:26:35 -04:00
David C. Lonie
bc1b920741 Add macro to help pass commas into other macros.
VTKM_PASS_COMMAS(...) will pass it's arguments verbatim into another
macro, even if they contain commas. This is helpful when using templated
classes, e.g.

#define SOME_MACRO(arg) ...

SOME_MACRO(vtkm::cont::ArrayHandle<float, StorageTag>)

won't compile, because the comma in the template parameters is assumed
to be separating macro arguments. Adding extra parenthesis,

SOME_MACRO((vtkm::cont::ArrayHandle<float, StorageTag>))

helps in some cases, but not others (e.g. the macro declares a variable).

SOME_MACRO(VTKM_PASS_COMMAS(vtkm::cont::ArrayHandle<float, StorageTag>))

will always* work.
2017-06-29 09:51:07 -04:00
David C. Lonie
d4d7683f17 Initialize member variables of ArrayPortalFromIterators. 2017-06-29 09:51:06 -04:00
David C. Lonie
8ffaa83be1 Silence pointless warnings on TestBuilds.
The TestBuild_* targets were not getting the _SCL_SECURE_NO_WARNINGS
define set on MSVC.
2017-06-29 09:51:06 -04:00
David Lonie
4cad9b11df Merge topic 'examples_fix'
0564af0a Fix Clipping example compilation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brent Lessley <blessley@cs.uoregon.edu>
Merge-request: !814
2017-06-28 15:19:45 -04:00
David C. Lonie
0564af0a5f Fix Clipping example compilation.
Some functions were refactored and broke this example code.
2017-06-28 12:20:09 -04:00