Commit Graph

2593 Commits

Author SHA1 Message Date
Kenneth Moreland
63c748f049 Implement ArrayHandleGroupVecVariable
This is a fancy array handle that can group entries in another array by
arbitrary amounts. This allows us to implement input and output arrays
with a different sized Vec for each instance. This is necessary for
generating new topologies with cells of different types.
2016-11-22 17:10:09 -07:00
Kenneth Moreland
b3d0e1f99b Move VecFromPortal classes to vtkm package
These Vec-like objects can be generally usable in both the control and
execution environments.
2016-11-22 17:04:55 -07:00
Robert Maynard
719a8bd35d Merge topic 'nvcc_version_check'
4de37559 fix a pragma location bug
9048e0ba detect cuda versions and decide if to put a diagnostic inside or outside of a class.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !611
2016-11-16 19:21:31 -05:00
Samuel Li
4de37559fd fix a pragma location bug 2016-11-16 09:55:22 -08:00
Kenneth Moreland
a43538b017 Merge topic 'no-inline-export'
fdaccc22 Remove exports for header-only functions/methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !588
2016-11-16 11:42:58 -05:00
Samuel Li
9048e0bac1 detect cuda versions and decide if to put a diagnostic inside or outside of a class. 2016-11-15 22:43:40 -08:00
Kenneth Moreland
fdaccc22db Remove exports for header-only functions/methods
Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and
EXEC_CONT.) Remove the inline from these macros so that they can be
applied to everything, including implementations in a library.

Because inline is not declared in these modifies, you have to add the
keyword to functions and methods where the implementation is not inlined
in the class.
2016-11-15 22:22:13 -07:00
Robert Maynard
8861beda4b Merge topic 'add_vector_cell_gradient'
8dadf560 Add in support for vector fields to Gradient worklet.
d53f43fb CellDerivaties now support computing the derivatives of vtkm::Vec fields.
b4378c85 Allow vtkm::Matrix to support T values which are vtkm::Vec.
9caabf97 vtkm::Vec now supports +=, -=, *=, and /=.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !608
2016-11-15 23:39:10 -05:00
Robert Maynard
8dadf560cd Add in support for vector fields to Gradient worklet. 2016-11-15 18:54:53 -05:00
Robert Maynard
d53f43fb48 CellDerivaties now support computing the derivatives of vtkm::Vec fields. 2016-11-15 18:54:53 -05:00
Robert Maynard
b4378c8546 Allow vtkm::Matrix to support T values which are vtkm::Vec. 2016-11-15 18:54:53 -05:00
Robert Maynard
b936de0976 Merge topic 'fix_thrust_183_proxy_assignment_regression'
632d2a52 Thrust 1.8.3 uses raw_reference_cast instead of a direct assignment operator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !610
2016-11-15 18:52:51 -05:00
Robert Maynard
632d2a5211 Thrust 1.8.3 uses raw_reference_cast instead of a direct assignment operator
This usage of raw_referenc_cast returns a const PortalValue which is than
assigned too. So to work around the problem we need to mark operator= on
the class as const.
2016-11-15 17:03:59 -05:00
Robert Maynard
523ac98754 Merge topic 'add_scalar_cell_gradient'
7a52fa39 Add in Cell Gradient for scalar fields.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !607
2016-11-14 14:05:47 -05:00
Robert Maynard
9caabf97ce vtkm::Vec now supports +=, -=, *=, and /=.
It is common to write template code that needs to operate across both
scalar and vector values. To facilitate code like this we are required
to provide these common operators.
2016-11-14 13:07:33 -05:00
Robert Maynard
7a52fa3940 Add in Cell Gradient for scalar fields. 2016-11-14 12:52:00 -05:00
Robert Maynard
6251d8bf2c Merge topic 'reduce_gradient_library_size'
7c07afff Reduce the compilation size of the gradient computations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !603
2016-11-13 09:31:16 -05:00
Robert Maynard
7c07afffba Reduce the compilation size of the gradient computations. 2016-11-11 14:36:51 -05:00
Robert Maynard
c27dc02c84 Merge topic 'TransportCellSetIn_warning'
c867b9bc Remove unused variable 'coordinates'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !606
2016-11-11 10:56:11 -05:00
Robert Maynard
c867b9bcca Remove unused variable 'coordinates' 2016-11-11 08:34:05 -05:00
Robert Maynard
b879ce84bc Merge topic 'remove_unused_class'
d52fc1f7 Remove PointCoordinatesBase which is not used.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !605
2016-11-10 15:34:51 -05:00
Robert Maynard
d52fc1f76c Remove PointCoordinatesBase which is not used. 2016-11-10 15:07:34 -05:00
Robert Maynard
3a9bcca016 Merge topic 'add_whole_topology_tag'
c4183cfa Refactor WholeCellSetIn to handle Point->Cell and Cell->Point
f65f5ea6 WorkletBase can now transport CellSets as a whole execution object.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !601
2016-11-10 14:50:04 -05:00
Robert Maynard
a21c02ce76 Merge topic 'correct_failing_math_tests'
97b3b4ce Increase tolerance on ACos tests when using ICC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !604
2016-11-10 14:49:30 -05:00
Robert Maynard
97b3b4ceff Increase tolerance on ACos tests when using ICC.
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 default tolerance of test_equal. So to resolve the problem
we increase the tolerance for acos when using icc.
2016-11-10 13:48:19 -05:00
Robert Maynard
c4183cfacc Refactor WholeCellSetIn to handle Point->Cell and Cell->Point 2016-11-10 13:21:19 -05:00
Christopher Sewell
735be208e7 Merge topic 'StreamingArray'
f779e8a1 Removing streaming scan inclusive for now
faa69e53 vtkm::internal::Add to vtkm::Add
8a8b409d Merge remote-tracking branch 'upstream/master' into StreamingArray
d7ff8097 Attempt to resolve warnings for streaming device adapter algorithms
9afbdffb Attempt fix warning in streaming
a5a487b3 Attempt 15 to resolve Windows compiler warning with streaming storage
b9d81726 Attempt 14 to resolve Windows compiler warning with streaming storage
93d7956d Attempt 13 to resolve Windows compiler warning with streaming storage
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !496
2016-11-09 18:53:45 -05:00
Christopher Sewell
f779e8a1bd Removing streaming scan inclusive for now 2016-11-09 15:43:57 -07:00
Christopher Sewell
faa69e539d vtkm::internal::Add to vtkm::Add 2016-11-09 14:21:50 -07:00
Christopher Sewell
8a8b409d4c Merge remote-tracking branch 'upstream/master' into StreamingArray 2016-11-09 12:15:58 -07:00
Robert Maynard
ad0593e845 Merge topic 'wavelet2'
35a81df0 change variable names to avoid confusion
b2719157 simplify functions to get the approximation and detail coefficients length
d7e94e3a update 2D idwt to not assign zero to the last element of cDTemp
568bd63f fix a few warnings
514dcf4b see if unused warning shows up
30660bf4 fix comments by Rob
97118931 improved error message when test failing
9b45dba3 fix 2 warnings
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !577
2016-11-08 16:10:15 -05:00
Dave Pugmire
c2b28a4437 Merge branch 'render_warnings' into 'master'
fix compiler warnings.

Fix a bunch of compiler warnings that were in the rendering code and dataset builder classes.

@kmorel 
@robertmaynard 

See merge request !597
2016-11-08 15:24:15 -05:00
Kenneth Moreland
01901e2c97 Merge topic 'dll-export-warnings'
08d857fe Suppress warnings about exporting classes in dll

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !600
2016-11-08 11:59:30 -05:00
Robert Maynard
f65f5ea6bb WorkletBase can now transport CellSets as a whole execution object. 2016-11-08 08:54:52 -05:00
Kenneth Moreland
89e7d2bc09 Merge topic 'win-sign-warning'
f17a6b37 Fix warning about comparing signed/unsigned integers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !599
2016-11-07 18:34:24 -05:00
Dave Pugmire
80eb8621e2 more uninitialized compiler warnings... 2016-11-07 15:24:38 -05:00
Kenneth Moreland
08d857fe92 Suppress warnings about exporting classes in dll
In VTK-m libraries, we are typically exporting (with declspec) classes rather
than the independent methods within the class. When you are exporting to a
dll in MSVC and the class contains a field that is not similarly exported,
then you get a warning. This is generally not an issue for our use since we
are really only using classes from the standard library and distributed with
VTK-m itself. The only sane way to fix the issue is to just disable the
warning.
2016-11-07 13:16:23 -07:00
Dave Pugmire
2975b03a53 Remove 'uninitialized variable' warning. 2016-11-07 15:07:03 -05:00
Dave Pugmire
80df759238 Force uniform datasets to always produce FloatDefault point coordiantes. 2016-11-07 14:12:32 -05:00
Kenneth Moreland
f17a6b3774 Fix warning about comparing signed/unsigned integers 2016-11-07 10:56:11 -07:00
Dave Pugmire
6b16948d0f Force uniform datasets to always produce FloatDefault point coordiantes. 2016-11-07 11:27:00 -05:00
Dave Pugmire
4edb91ad96 Get rid of warnings in examples. 2016-11-04 16:29:07 -04:00
Dave Pugmire
cd842c696e fix warnings. 2016-11-04 15:28:48 -04:00
Dave Pugmire
f413bac78c Fix compiler warnings. 2016-11-04 11:43:30 -04:00
Dave Pugmire
dc547ec671 compiler warnings. 2016-11-04 08:32:46 -04:00
Robert Maynard
176598149f Merge topic 'install_brigand'
653a9a1c Make sure we install the brigand header.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !596
2016-11-03 17:40:34 -04:00
Dave Pugmire
5bd9b0ff5f minor fixes. 2016-11-03 16:57:30 -04:00
Dave Pugmire
3e306a9d7b compiler warnings... 2016-11-03 16:09:24 -04:00
Dave Pugmire
e1c659a4fb fix compiler warnings. 2016-11-03 15:15:40 -04:00
Robert Maynard
653a9a1c42 Make sure we install the brigand header. 2016-11-03 08:03:51 -04:00