Commit Graph

4129 Commits

Author SHA1 Message Date
Matt Larsen
2bb64e6598 fixing opacity for veritical bar 2018-01-18 14:57:40 -08:00
Matt Larsen
80081f2a1b adding finer grain control over color bar and scalar field label 2018-01-18 13:21:39 -08:00
Sujin Philip
3de1717ba8 Merge topic 'virtual-coordinates'
70fcd1d1 Update CoordinateSystem to use the Virtual Array
950b12b1 Add ArrayHandleVirtualCoordinates
a4d0b57b Make ForEachValidDevice internal
59dc78fd Add ErrorBadDevice
4810cef7 Field::SetData should accept any ArrayHandle type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1021
2018-01-10 14:32:29 -05:00
Robert Maynard
662caef343 Merge topic 'sync_Math_pyexpander'
d07c696b vtkMath.h now opts out of clang-format to make updates through pyexpander easy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1052
2018-01-10 10:38:28 -05:00
Sujin Philip
70fcd1d1cc Update CoordinateSystem to use the Virtual Array 2018-01-10 10:19:19 -05:00
Robert Maynard
d07c696b3c vtkMath.h now opts out of clang-format to make updates through pyexpander easy 2018-01-10 08:38:14 -05:00
Sujin Philip
950b12b1f2 Add ArrayHandleVirtualCoordinates 2018-01-09 17:23:41 -05:00
Sujin Philip
a4d0b57ba2 Make ForEachValidDevice internal
* Add FindDeviceAdapterTagAndCall
* Add support for multiple arguments to be passed to the functor in
  'ForEachValidDevice' and 'FindDeviceAdapterTagAndCall'.
2018-01-09 17:23:26 -05:00
Sujin Philip
59dc78fd29 Add ErrorBadDevice 2018-01-09 14:25:47 -05:00
Sujin Philip
4810cef78f Field::SetData should accept any ArrayHandle type 2018-01-09 14:25:47 -05:00
Robert Maynard
cda854501d Merge topic 'better_FloatingPointReturnType'
a9e64c4b FloatPointReturnType is float if 'T' is < 32bytes instead of being double.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Thomas Otahal <tjotaha@sandia.gov>
Merge-request: !1048
2018-01-08 15:42:18 -05:00
Kenneth Moreland
747c5c90dd Merge topic 'better-type-error-reporting'
fe9594c1 Add hint to read source code for help
c3889a1a Give better error reporting when an Invoke parameter is wrong

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1022
2018-01-08 15:06:52 -05:00
Kenneth Moreland
fe9594c1d1 Add hint to read source code for help
In trying to give error diagnostics with template definitions of invalid
types, the user encounters some pretty confusing error messages at
first. There is no way to get the compiler to give exactly the
diagnostics we want in a nice readable error message, so we are putting
some verbose instructions as comments in the code. However, a user might
not know to look at the source code since the error happens deep in an
unfamiliar (and complicated) class. Thus, add (yet another) error at the
front that gives a (hopefully) clear indication to look at the source
code for help in understanding the errors.
2018-01-08 10:53:44 -07:00
Kenneth Moreland
c3889a1a67 Give better error reporting when an Invoke parameter is wrong
When one of the parameters to DispatcherBase::Invoke is incorrect, you
get an error in a strange place. It is deep in a call stack using some
heavily templated types rather than where the Invoke is actually called.

Formerly, the code was structured to give a very obfuscated error
message. Try to make this easier on users by first adding helpful hints
in the code around where the error is to explain why the error occured
and helpful advice on how to track down the problem. Second, reconfigure
the static_assert so that the compiler gives a readable error message.
Third, add some auxiliary error messages that provide additional
information about the types and classes involved in the error.
2018-01-08 10:53:43 -07:00
Robert Maynard
6b5cbe31fa Merge topic 'increase-worklet-arguments'
f1d351f2 Updated FunctionInterfaceDetailPre.h based on pyexpander output
e90dfd93 Merge branch 'increase-worklet-arguments' of https://gitlab.kitware.com/mletter1/vtk-m into increase-worklet-arguments
172a1ba0 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into increase-worklet-arguments
104f5418 Revert "updated based on pyexpander output"
6908952f updated based on pyexpander output
c3737c72 Merge branch 'master' into increase-worklet-arguments
d9c51d65 increased the number of arguments to worklets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1049
2018-01-06 13:32:07 -05:00
Matthew Letter
f1d351f249 Updated FunctionInterfaceDetailPre.h based on pyexpander output
Updated FunctionInterfaceDetailPre.h based on pyexpander output after reverting the changes that were made to math.h
2018-01-04 16:00:46 -07:00
Matthew Letter
e90dfd932f Merge branch 'increase-worklet-arguments' of https://gitlab.kitware.com/mletter1/vtk-m into increase-worklet-arguments 2018-01-04 15:37:07 -07:00
Matthew Letter
172a1ba028 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into increase-worklet-arguments 2018-01-04 15:35:26 -07:00
Kenneth Moreland
77cb93829c Merge topic 'pyexpander-math'
2b5e74c7 Update Math.h.in to recent changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1050
2018-01-04 17:33:35 -05:00
Matthew Letter
104f5418e8 Revert "updated based on pyexpander output"
This reverts commit 6908952f597cba945245349734790bad81823022
2018-01-04 17:28:33 -05:00
Kenneth Moreland
2b5e74c7d1 Update Math.h.in to recent changes
There were some recent changes to supress some CUDA errors in (among
many other places) some Math.h functions. These changes were done to
Math.h, but they also need to be reflected in Math.h.in so we can
continue to mainting the automatically generated functions.
2018-01-04 15:14:40 -07:00
Matthew Letter
6908952f59 updated based on pyexpander output 2018-01-04 13:22:14 -07:00
Matthew Letter
c3737c728e Merge branch 'master' into increase-worklet-arguments 2018-01-04 12:07:38 -07:00
Matthew Letter
d9c51d650d increased the number of arguments to worklets
increase the number of arguments to worklets that we support to 10 from 20.
2018-01-04 12:06:16 -07:00
Robert Maynard
a9e64c4ba8 FloatPointReturnType is float if 'T' is < 32bytes instead of being double.
Previously FloatPointReturnType would always be double for types that
are not float, which caused Int8/Int16 types to promote to double instead
of float.
2018-01-04 13:22:31 -05:00
Utkarsh Ayachit
842019023a Merge branch 'diy-as-3rd-party' into 'master'
DIY as 3rd party import

See merge request vtk/vtk-m!1047
2018-01-04 10:58:51 -05:00
Robert Maynard
91178ffc3f Merge topic 'vtk-m-dot-integer-promotion'
a8415d8e VTK-m now widens result type for UInt8/Int8/UInt16/Int16 input.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1045
2018-01-04 10:25:35 -05:00
Robert Maynard
a8415d8e37 VTK-m now widens result type for UInt8/Int8/UInt16/Int16 input.
When using vtkm::dot on narrow types you easily rollover the values.
Instead the result type of vtkm::dot should be wide enough to store the results
(32bits) when this occurs.

Fixes #193
2018-01-03 16:32:41 -05:00
Utkarsh Ayachit
4a05277296 Exclude thirdparty/diy from VTKmCheckSourceInBuild check. 2018-01-03 15:09:14 -05:00
Utkarsh Ayachit
4b4e43ae83 update VTKmCheckCopyright for new diy header locations. 2018-01-03 14:53:37 -05:00
Utkarsh Ayachit
37969e9602 Use VTKM_DIY() to include diy headers.
This makes it easier to mangle diy and support using external diy.
2018-01-03 14:53:37 -05:00
Utkarsh Ayachit
92cf8bf6d4 cmake: update cmake rules to use vtkm/thirdparty/diy. 2018-01-03 14:37:23 -05:00
Utkarsh Ayachit
ce193592c5 diy: update cmake rules.
DIY Thirdparty module now builds and also generates a
`vtkm/thirdparty/diy/Configure.h` which can in future support external
DIY.
2018-01-03 14:35:00 -05:00
Utkarsh Ayachit
a610329bb2 Merge branch 'upstream-diy' into diy-as-3rd-party
* upstream-diy:
  diy 2018-01-02 (aa778e24)
2018-01-03 14:06:35 -05:00
Diy Upstream
6fc0794c40 diy 2018-01-02 (aa778e24)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit aa778e24a40ec6d39c4f8b43eb4bdb4f2708219a (for/vtk-m).
2018-01-03 14:06:35 -05:00
Utkarsh Ayachit
4339b4e2d2 Add update script for diy. 2018-01-03 14:06:14 -05:00
Utkarsh Ayachit
aa936095da update diy location in gitattributes. 2018-01-03 14:06:14 -05:00
Utkarsh Ayachit
2aab6ba47e Add 3rd-party harness.
Add docs and scripts for 3rd party modules in VTK-m.

This is an import of scripts from VTK.
2018-01-03 13:58:59 -05:00
Utkarsh Ayachit
fc2f9f3391 Remove DIY.
We will add DIY back a 3rd-party import.
2018-01-03 11:07:16 -05:00
Utkarsh Ayachit
4275b9fee9 Merge topic 'diy-improvements'
954111f6 exclude -Wunused-result from diy/storage.
1737bbe9 exclude shadow warnings from DIY.
ffc833fd Update diy to revision `ca5e7cf23`.
3408e8e5 Revert "diy: pass operator instance to mpi_op<>::get()"
cac71555 Use `diy::reduce` in MultiBlock reductions.
e349dd0d Use default copy constructor.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1037
2018-01-03 11:06:22 -05:00
Utkarsh Ayachit
954111f60e exclude -Wunused-result from diy/storage.
These parts are marked as TODO in DIY and hence we'll ignore these
warnings till DIY fixes those.
2018-01-03 10:23:26 -05:00
Utkarsh Ayachit
1737bbe9ca exclude shadow warnings from DIY.
DIY code is rife with shadow warnings. Ignore those.
2018-01-03 10:23:26 -05:00
Utkarsh Ayachit
ffc833fd8c Update diy to revision ca5e7cf23. 2018-01-03 10:23:26 -05:00
Utkarsh Ayachit
3408e8e5e3 Revert "diy: pass operator instance to mpi_op<>::get()"
This reverts commit c63f3635d53259894c780e131f489d10f5c2b48e.
2018-01-03 10:23:26 -05:00
Utkarsh Ayachit
cac71555e2 Use diy::reduce in MultiBlock reductions.
MultiBlock now uses `diy::reduce` for reductions rather than using proxy
collectives. To support using `diy::reduce` operations on a
vtkm::cont::MultiBlock, added AssignerMultiBlock and
DecomposerMultiBlock classes. This are helper classes that provide DIY
concepts on top of a existing MultiBlock.
2018-01-03 10:23:26 -05:00
Utkarsh Ayachit
e349dd0d1c Use default copy constructor.
vtkm::Bounds and vtkm::Range now uses default copy-constructor and
assignment operator. That way `std::is_trivially_copyable` succeeds for
these basic types.
2018-01-03 10:23:26 -05:00
Robert Maynard
a81919999a Merge topic 'vtkm_host_device_warnings'
93bc0198 Suppress false positive warnings about calling host device functions.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1042
2018-01-02 14:10:54 -05:00
Robert Maynard
93bc0198fe Suppress false positive warnings about calling host device functions. 2018-01-02 10:40:49 -05:00
Sujin Philip
39dd8feeac Merge topic 'fix-ExecutionWholeArray-usage'
6b190312 Cleanup includes of ExecutionWholeArray.h
3e10b504 Replace ExecutionWholeArray with WholeArray

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1039
2018-01-02 10:32:43 -05:00
Sujin Philip
6b19031200 Cleanup includes of ExecutionWholeArray.h 2018-01-02 10:30:16 -05:00