Commit Graph

2883 Commits

Author SHA1 Message Date
Kenneth Moreland
04be000d23 Merge topic 'vec-variable-output-fix'
81f7ff23 Make offsets for ArrayHandleGroupVecVariable always input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !703
2017-02-23 12:12:09 -05:00
David Lonie
ccf73f3e6e Merge topic 'map_fields_ignore_filter_traits'
ab9e1f6e Ignore filter traits when mapping fields to output.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !701
2017-02-23 11:18:13 -05:00
Matt Larsen
57ad3c8cb5 Merge topic 'remove_unused_code_ray_tracer'
a6bd88d2 Removing unused timing code and headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !702
2017-02-22 19:27:18 -05:00
Matt Larsen
a6bd88d2fe Removing unused timing code and headers 2017-02-22 14:45:33 -08:00
Kenneth Moreland
81f7ff2391 Make offsets for ArrayHandleGroupVecVariable always input
The offsets for an ArrayHandleGroupVecVariable are always inputs
and cannot be changed, even when the array handle is used as an output.
There was a mistake where the PrepareFor* methods tried to make
the offsets mutable. In the case of an output, the offsets were not
pushed to the execution environment, and the arrays could not be looked
up.
2017-02-22 15:44:06 -07:00
Matt Larsen
6d9766943e Merge topic 'volume_rendering_fix'
7d4334b5 Had conditional backwards
50ccedf8 Fixing the default behavior of the volume renderer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !700
2017-02-22 17:17:54 -05:00
David C. Lonie
ab9e1f6e9d Ignore filter traits when mapping fields to output.
The input type restrictions in FilterTraits should not be used to
restrict the arrays that can be mapped to the output dataset.
2017-02-22 14:30:56 -05:00
Matt Larsen
7d4334b5e3 Had conditional backwards 2017-02-22 11:21:48 -08:00
Matt Larsen
50ccedf828 Fixing the default behavior of the volume renderer 2017-02-22 11:17:22 -08:00
Kenneth Moreland
d3eafe4b26 Merge topic 'range-comp-specialization'
6089e739 Match the two overload of ArrayRangeCompute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !699
2017-02-22 12:02:35 -05:00
Kenneth Moreland
6089e7396e Match the two overload of ArrayRangeCompute
There are two versions of ArrayRangeCompute. The first version is a
general version that computes the min and max by running a reduction on
a device. The second version was a specialization for uniform grid
coordinate arrays, which is easily computed without looking at the
values.

The problem was that the generic version of ArrayRangeCompute took two
arguments and the specialization only took one argument (because it does
not need a device). This means that templated code uses the general
version will never use the specialized version. This fix adds a device
argument to the specialized version. The extra argument is not used, but
will properly overload the general version.
2017-02-21 16:22:53 -07:00
David Lonie
d86cbbac43 Merge topic 'generalize_clip_cellset'
d1181160 Allow any DynamicCellSetBase to be used with the Clip worklet.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !698
2017-02-20 09:34:30 -05:00
David C. Lonie
d118116055 Allow any DynamicCellSetBase to be used with the Clip worklet. 2017-02-17 16:31:50 -05:00
David Lonie
a0016456cc Merge topic 'default_device_to_public_header'
7a41621d Move default device selection out of private headers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !693
2017-02-17 08:26:01 -05:00
David C. Lonie
7a41621d82 Move default device selection out of private headers.
This will make the librarification of vtk-m easier as we tread that
path.

Refs #120.
2017-02-16 13:40:35 -05:00
Kenneth Moreland
c3a9a55307 Merge topic 'group-vec-variable-cont-portal'
17ed7a36 Remove typedef that is no longer used
364f4175 Only print cell arrays that are valid
5b8389f9 Use printSummary_ArrayHandle when testing fancy arrays
873ceefc Implement ArrayHandleGroupVecVariable::GetPortalConst

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !695
2017-02-16 12:43:32 -05:00
Kenneth Moreland
d339025a1b Merge topic 'external-face-more-generic'
dcbbb727 Merge branch 'master' into external-face-more-generic
0703139a Make Keys class do in-place sort
059c7f6d Fix issue with ExternalFaces on CellSetSingleType
876514ba Add better test for external faces
53679dfc Update ExternalFaces to support mixed face types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brent Lessley <blessley@cs.uoregon.edu>
Merge-request: !662
2017-02-16 10:28:56 -05:00
Robert Maynard
d10081272e Merge topic 'release-resources'
55be1fcb examples: ensure cleanup occurs before main ends.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !697
2017-02-16 09:29:58 -05:00
Kenneth Moreland
17ed7a3629 Remove typedef that is no longer used
It was a typedef for a Portal. Instead of setting the portal directly,
the portal is just sent to a function, so we don't directly use this
type anymore.

Not a big deal, but it could cause compiler warnings.
2017-02-15 16:59:54 -07:00
Kenneth Moreland
364f417529 Only print cell arrays that are valid
ConnectivityExplicitInternals::PrintSummary blindly attempted to print
all of its arrays regardless of whether they are valid. Trying to print
uninitialized arrays can be invalid in some circumstances. Instead,
check to see of the arrays are valid before printing them out. (This can
give you useful information anyway. There is a difference between an
uninitialized array and one of zero length.)
2017-02-15 15:07:50 -07:00
Kenneth Moreland
5b8389f955 Use printSummary_ArrayHandle when testing fancy arrays
This makes it easier to see what is going on in the fancy arrays and do
diagnostics.

This change required some changes to printSummary_ArrayHandle to support
more array types.
2017-02-15 14:34:17 -07:00
Robert Maynard
ca302128a9 Merge topic 'benchmarks'
fc68362d Build benchmarks even when testing is not enabled.
31e20859 Fix typo.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !696
2017-02-15 15:10:38 -05:00
Tom Fogal
55be1fcbb2 examples: ensure cleanup occurs before main ends.
Else the implicit context in the CUDA driver may destroy itself
before the destructors for globals/statics run, and we could try
to e.g. cudaFree without a valid context.
2017-02-15 10:32:20 -08:00
Kenneth Moreland
873ceefc17 Implement ArrayHandleGroupVecVariable::GetPortalConst
Previously it was impossible to get an ArrayPortal from an
ArrayHandleGroupVecVariable on the control side (by calling GetPortal or
GetPortalConst). This makes it possible.
2017-02-15 08:26:53 -07:00
Kenneth Moreland
3834afdd43 Merge topic 'empty-array'
58bbeb18 Support using empty array handles as input
6d5de0c3 Change make_ArrayHandle work with empty std::vector

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !694
2017-02-15 10:23:26 -05:00
Robert Maynard
2600b3d890 Merge topic 'leverage_move_constructors'
94bd79b0 Leverage std::move to help FunctionInterface make less copies.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !691
2017-02-15 08:23:14 -05:00
Kenneth Moreland
58bbeb183a Support using empty array handles as input
Previously if you constructed an array handle without allocating it, you
would get an error if you tried to use the array as input. This
conflicted with some recent changes to accept empty vectors.

Now when you try to use an unallocated ArrayHandle as input (calling
PrepareForInput or PrepareForInPlace), it internally calls Allocate(0)
(to establish internal state) and sets up a valid execution ArrayPortal
of size 0.
2017-02-14 15:27:34 -07:00
Robert Maynard
94bd79b09c Leverage std::move to help FunctionInterface make less copies. 2017-02-14 17:02:32 -05:00
Kenneth Moreland
6d5de0c34b Change make_ArrayHandle work with empty std::vector
When make_ArrayHandle gets an std::vector, it converts it to an
ArrayHandle by getting a pointer to the vector's internal array.
However, when the vector is of size 0, there is no array and it is
invalid to get a pointer. Instead, make a special case for empty
vectors.
2017-02-14 14:49:41 -07:00
Tom Fogal
fc68362d4b Build benchmarks even when testing is not enabled. 2017-02-14 13:48:56 -08:00
Robert Maynard
28f03b1958 Merge topic 'errorExecution_eliminate_string_copy'
df437afb Remove an unnecessary copy of a string in ErrorExecution constructor

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Reviewed-by: David Lonie <david.lonie@kitware.com>
Merge-request: !692
2017-02-14 15:13:24 -05:00
Tom Fogal
31e20859d4 Fix typo. 2017-02-14 10:29:00 -08:00
Robert Maynard
df437afbbf Remove an unnecessary copy of a string in ErrorExecution constructor 2017-02-14 13:11:27 -05:00
Robert Maynard
b6f8cf5a7a Merge topic 'whitespace_issues'
6fa2784d Clanup some whitespace / newline issues in vtkm::worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !690
2017-02-13 11:36:22 -05:00
Robert Maynard
6fa2784db9 Clanup some whitespace / newline issues in vtkm::worklet 2017-02-13 09:55:32 -05:00
Matt Larsen
cb7bb7b044 Merge topic 'volume_cell_assoc_fix'
87e53d6c Fixing error in volume renderer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !689
2017-02-10 19:33:27 -05:00
Matt Larsen
87e53d6c00 Fixing error in volume renderer 2017-02-10 14:00:02 -08:00
Thomas Otahal
9d9c39e197 Merge topic 'vector_magnitude_field_filter'
ba2be2fe Added FilterTraits and code cleanup.
f6d5d24c Removed integer vector field from vector magnitude filter unit test
70e145fd Attempt to fix Visual Studio 2013/2015 warning message
f1300c61 Changed vtkm::Abs() to return input type
71b2348d Adjusted Math.h.in for const vtkm::Float32 function inputs
7d6601d7 Modified Math.h.in and VectorAnalysis.h to support integral types.
cd95cbe9 Modified Math.h.in instead of Math.h
5777c4ca Merge branch 'master' into vector_magnitude_field_filter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !666
2017-02-10 11:34:28 -05:00
Matt Larsen
30c5c3be4a Merge topic 'volume_mapper_fix'
1f6ef23b adding the ability to turn off background compositing for volume renderer
3fe918ce adding sample distance to the volume mapper

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !688
2017-02-10 00:08:26 -05:00
Matt Larsen
a608124d1b Merge topic 'set_scalar_range'
6b534a43 Fixing a typo in Actor
c2f0dd5a Adding the ablitiy to set the scalar range of an Actor to get a consistent mapping of scalar values when running with MPI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !687
2017-02-10 00:08:13 -05:00
Matt Larsen
1f6ef23b98 adding the ability to turn off background compositing for volume renderer 2017-02-09 16:26:23 -08:00
Matt Larsen
3fe918ce4d adding sample distance to the volume mapper 2017-02-09 16:12:23 -08:00
Matt Larsen
6b534a438f Fixing a typo in Actor 2017-02-09 15:59:37 -08:00
Matt Larsen
c2f0dd5a64 Adding the ablitiy to set the scalar range of an Actor to get a consistent mapping of scalar values when running with MPI 2017-02-09 15:38:40 -08:00
Matt Larsen
c487931f1f Merge topic 'color_fix'
bd845f01 Adding coordinate system include to the volume renderer
59020fe9 Adding several more includes to the volume renderer
9f074e4a Removing typename from typdef declaration in the volume renderer
d14791a7 Merge branch 'color_fix' of https://gitlab.kitware.com/mclarsen/vtk-m into color_fix
bee68682 Fixing the include in the rendering library
f611b0b4 Fixing the include in the rendering library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !686
2017-02-09 18:00:29 -05:00
Matt Larsen
bd845f01d6 Adding coordinate system include to the volume renderer 2017-02-09 13:00:08 -08:00
Matt Larsen
59020fe98f Adding several more includes to the volume renderer 2017-02-09 12:51:46 -08:00
Matt Larsen
9f074e4ad8 Removing typename from typdef declaration in the volume renderer 2017-02-09 12:47:02 -08:00
Matt Larsen
d14791a7d7 Merge branch 'color_fix' of https://gitlab.kitware.com/mclarsen/vtk-m into color_fix 2017-02-09 12:37:15 -08:00
Matt Larsen
bee6868254 Fixing the include in the rendering library 2017-02-09 12:36:59 -08:00