Commit Graph

4018 Commits

Author SHA1 Message Date
Matt Larsen
eaebaea7cb adding a wrapper for device adapter algorithm 2017-11-29 07:44:37 -08:00
Robert Maynard
8be1a71ada Merge topic 'per_thread_runtime_tracker'
9ae3098a Give each thread using vtk a separate runtime device tracker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1008
2017-11-24 08:54:06 -05:00
Robert Maynard
9ae3098af8 Give each thread using vtk a separate runtime device tracker 2017-11-21 16:43:40 -05:00
Robert Maynard
2467411ecc Merge topic 'variadic_CastAndCall_and_TryExecute'
203205a1 TryExecute RuntimeDeviceTracker can't be a const ref anymore.
dfb9cc62 Allow users to pass multiple arguments to TryExecute
5384305d Update tests and a single worklet to verify new CastAndCall works
2ff14a81 Allow users to pass multiple arguments to CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1005
2017-11-13 17:56:20 -05:00
Matt Larsen
7563a1d6dd Merge topic 'fix_tick'
56f302d0 fixing axis ticks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1007
2017-11-13 13:18:18 -05:00
Matt Larsen
56f302d0a9 fixing axis ticks 2017-11-13 08:34:05 -08:00
Robert Maynard
203205a171 TryExecute RuntimeDeviceTracker can't be a const ref anymore.
Previously we allowed a const ref as we would make a copy, this only works
as it relies on  RuntimeDeviceTracker implementing state through a shared_ptr.
Instead if we require modifiable types only we can make TryExecute more
efficient and clearer on what it does.
2017-11-10 10:02:45 -05:00
Robert Maynard
dfb9cc6236 Allow users to pass multiple arguments to TryExecute 2017-11-09 12:45:00 -05:00
Allison Vacanti
9f51f4b7e2 Merge topic 'symbol_vis_option'
5f1db422 Add option to use default symbol visiblity for VTK-m libraries.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1004
2017-11-09 10:26:55 -05:00
Robert Maynard
713e428abf Merge topic 'internally_improve_CastAndCall_TryExecute'
dd25c5c2 DynamicCellSet CastAndCall refactored to use the new vtkm::ForEach
c9f1d192 DynamicArrayHandle CastAndCall refactored to use the new vtkm::ForEach
68381d9f Rework TryExecute to leverage perfect forwarding.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1003
2017-11-08 17:44:14 -05:00
Allison Vacanti
5f1db422cd Add option to use default symbol visiblity for VTK-m libraries.
VTK doesn't hide symbols for static builds, which results in linker
errors for VTK targets that link with VTK-m. This option allows VTK-m
to match VTK's behavior.
2017-11-08 16:29:47 -05:00
Robert Maynard
5384305d25 Update tests and a single worklet to verify new CastAndCall works 2017-11-08 13:19:05 -05:00
Robert Maynard
2ff14a811f Allow users to pass multiple arguments to CastAndCall 2017-11-08 13:19:05 -05:00
Robert Maynard
0b8ee3ca1a Merge topic 'variadic_ListForEach_support'
cc71e8ec vtkm::ListForEach can handle passing any number of extra arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1002
2017-11-08 12:48:57 -05:00
Robert Maynard
dd25c5c2eb DynamicCellSet CastAndCall refactored to use the new vtkm::ForEach 2017-11-08 12:48:09 -05:00
Robert Maynard
c9f1d19233 DynamicArrayHandle CastAndCall refactored to use the new vtkm::ForEach 2017-11-08 12:48:09 -05:00
Robert Maynard
68381d9fe5 Rework TryExecute to leverage perfect forwarding.
By using perfect forwarding we can reduce not only the amount of TryExecute
signatures, but we can enable the ability to pass temporary functors to
TryExecute.

At the same time we have optimized TryExecute by moving the string generation
code into a single function that is compiled into the vtkm_cont library.

The end result is that the vtkm_rendering library size has been reduced from
12MB to 11MB, and we shave off about 5% of our build time.
2017-11-08 12:48:09 -05:00
Robert Maynard
cc71e8ec6e vtkm::ListForEach can handle passing any number of extra arguments
Rather than requiring all the arguments to be placed as member variables to
the functor you can now pass extra arguments that will be added to the functor
call signature.

So for example:

  vtkm::ForEach(functor, vtkm::TypeListTagCommon(), double{42.0}, int{42});

will be converted into:

  functor(vtkm::Int32, double, int)
  functor(vtkm::Int64, double, int)
  functor(vtkm::Float32, double, int)
  functor(vtkm::Float64, double, int)
  ...
2017-11-08 08:24:47 -05:00
Robert Maynard
55d4b9bb12 Merge topic 'better_cast_and_call'
5d194f8b Document other specialization of vtkm::cont::CastAndCall
3701776e Refactor DynamicArrayHandle CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !999
2017-11-07 16:42:16 -05:00
Robert Maynard
5d194f8ba9 Document other specialization of vtkm::cont::CastAndCall 2017-11-07 13:20:47 -05:00
Robert Maynard
3701776e8d Refactor DynamicArrayHandle CastAndCall
This is the first step in making a more efficient CastAndCall for
DynamicArrayHandle.
2017-11-07 13:20:46 -05:00
Sujin Philip
3f608450cd Merge topic 'new-virtual-objects'
8c242cef Switch from faux to true virtuals

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !991
2017-11-07 09:12:17 -05:00
Robert Maynard
a2dd575f86 Merge topic 'remove_vtkm_override'
eafd5cc0 Stop providing the VTKM_OVERRIDE define.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1000
2017-11-06 16:22:47 -05:00
Robert Maynard
891cfe4aec Merge topic 'bump_to_v1.1.0'
5c5b3c74 Release 1.1.0: Update the version.txt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1001
2017-11-06 16:02:41 -05:00
Sujin Philip
8c242cef91 Switch from faux to true virtuals 2017-11-06 15:25:29 -05:00
Robert Maynard
5c5b3c74fa Release 1.1.0: Update the version.txt v1.1.0 2017-11-06 15:04:06 -05:00
Robert Maynard
eafd5cc075 Stop providing the VTKM_OVERRIDE define.
This define should not be used as VTK-m requires C++11 and prefers the
override keyword.
2017-11-06 14:46:32 -05:00
Robert Maynard
280ea84990 Merge topic 'correct_mc_regression'
b3a7c697 MarchingCubes: Now is able to run on Uint8/Int8 types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !995
2017-11-03 10:39:09 -04:00
Robert Maynard
6b6ee99860 Merge topic 'allow_allocation_hints_for_better_uvm_perf'
a6eecbe9 ExecutionArrayInterface now can hint at how allocated memory will be used.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !994
2017-11-03 09:26:54 -04:00
Robert Maynard
b3a7c69786 MarchingCubes: Now is able to run on Uint8/Int8 types
The speed improvement fix regressed support for non scalar types, this
correct that issue.

The issue was found while trying to bump the VTK-m version inside VTK.
2017-11-02 14:28:44 -04:00
Matt Larsen
a704e39989 Merge topic 'visit_changes'
f6ead29c Removing a debug variable that was causing cuda to crash
565e69c5 Merge branch 'master' into visit_changes
81afcb62 further removing debug statements
a3bf1b26 Merge branch 'master' of https://gitlab.kitware.com/mclarsen/vtk-m into visit_changes
fdd5d1c8 removing debug statements
e60e330c Merge branch 'connectivity_tracer_additions' into visit_changes
2cb26b2d something
0bea9ce9 tracking path lengths if present
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !992
2017-11-02 14:17:01 -04:00
Robert Maynard
59f3e8f598 Merge topic 'remove_occurrences_of_VTKM_OVERRIDE'
e49f27a3 Remove all uses of VTKM_OVERRIDE at instead just use override.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !993
2017-11-02 13:04:09 -04:00
mclarsen
f6ead29cea Removing a debug variable that was causing cuda to crash 2017-11-02 08:13:54 -07:00
Robert Maynard
a6eecbe9ac ExecutionArrayInterface now can hint at how allocated memory will be used.
Certain backends desire the ability to mark allocations as being used for
reading versus writing to improve performance.
2017-11-02 10:12:57 -04:00
Robert Maynard
e49f27a3ac Remove all uses of VTKM_OVERRIDE at instead just use override.
Since VTK-m now requires C++11 it is safe to remove our custom defines
and move to using the keyword directly.
2017-11-02 09:18:15 -04:00
Matt Larsen
565e69c578 Merge branch 'master' into visit_changes 2017-11-01 15:20:47 -07:00
Matt Larsen
81afcb62ba further removing debug statements 2017-11-01 14:41:51 -07:00
Matt Larsen
a3bf1b261e Merge branch 'master' of https://gitlab.kitware.com/mclarsen/vtk-m into visit_changes 2017-11-01 14:02:15 -07:00
Matt Larsen
fdd5d1c8e5 removing debug statements 2017-11-01 14:00:38 -07:00
Robert Maynard
49297252c0 Merge topic 'windows_timeout_fixes'
27d12752 Correct issues on windows with debug tests timing out.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !990
2017-11-01 10:35:12 -04:00
Robert Maynard
27d1275249 Correct issues on windows with debug tests timing out.
The tests actually raised a std assert which was causing a timeout as it
required user intervention to click through.
2017-10-31 13:35:13 -04:00
Robert Maynard
4f03ca319d Merge topic 'better_mc_compile_times'
32148cdb A first pass at improving the compile time of MarchingCubes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !989
2017-10-31 13:18:34 -04:00
Robert Maynard
32148cdb56 A first pass at improving the compile time of MarchingCubes 2017-10-30 08:25:19 -04:00
Sujin Philip
72f47f72c4 Merge topic 'remove-arrayhandle-copyinto'
5842da49 Remove ArrayHandle CopyInto

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !988
2017-10-27 17:41:17 -04:00
Sujin Philip
5842da4921 Remove ArrayHandle CopyInto
Fixes #170
2017-10-27 17:28:59 -04:00
Robert Maynard
f366c6fb4b Merge topic 'correct_64bitdoulbe_particle_advection_failures'
fb894f56 ParticleAdvection GridEvaluators now work when vtkm::FloatDefault is double

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !984
2017-10-27 10:05:27 -04:00
Matt Larsen
069ec23f21 Merge topic 'support_2D_and_1D_plots'
f4739743 Fixing error with uninitialized variable
aeeb954f correcting typo
46f58dff fixing various warnings
14b7789f fixing ambiguous min max call
45003311 Merge remote-tracking branch 'upstream/master' into support_2D_and_1D_plots
73255080 removing debug statements
035814a4 adding 2d ortho support to ray tracing and updating WireFramer to support 2d lines and 1D line plots

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !985
2017-10-26 19:23:23 -04:00
mclarsen
f473974310 Fixing error with uninitialized variable 2017-10-26 14:17:49 -07:00
Kenneth Moreland
506e1695ee Merge topic 'update-readme-contributing'
c81bab43 Change organization of OpenGL dependency documentation
28d597d1 Re add example to bottom of README
d2caf445 Update README and CONTRIBUTING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !987
2017-10-26 15:59:26 -04:00
Kenneth Moreland
c81bab4314 Change organization of OpenGL dependency documentation
Per Rob Maynards suggestions.
2017-10-26 13:51:48 -06:00