Commit Graph

6223 Commits

Author SHA1 Message Date
Dave Pugmire
401b12bd6f Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_polyLine 2019-05-29 12:59:14 -04:00
Dave Pugmire
fea18190f4 Specialized cases for cell-edge functions on polylines. 2019-05-29 09:53:09 -04:00
Robert Maynard
2a7ef30116 CMake: Don't presume the cuda compilers is always NVCC. 2019-05-29 09:24:01 -04:00
Dave Pugmire
d310ec3aa6 return type is void. Call vertex/line methods, then just return. 2019-05-29 08:18:31 -04:00
Steven Walton
927effb1d2 Merge branch 'ExtractStructured' of gitlab.kitware.com:stevenwalton/vtk-m into ExtractStructured 2019-05-28 11:21:35 -07:00
Steven Walton
c268f36e03 Clearing out unused variables 2019-05-28 11:21:17 -07:00
Dave Pugmire
d6898b8052 Fix cell deriv for polylines and remove print statements. 2019-05-28 13:25:23 -04:00
Steven Walton
66c011f01f Merged conflicts 2019-05-25 17:40:15 -07:00
Steven Walton
21726038c5 IncludeOffset was defaulting to true when it should default to false 2019-05-25 17:32:50 -07:00
Steven Walton
62edf4e85f Extract Structured with Offset
Added code for giving ExtractStructured an offset value. Unit tests
three different 3D cases and a 3D case.
2019-05-24 17:15:28 -07:00
Robert Maynard
095e288383 Merge topic 'better_scoped_rt_dt'
bcaf7d9be ScopedRuntimeDeviceTracker have better controls of setting devices.
4212d0c04 RuntimeDeviceInformation now says the AnyTag exists.
fa03dc664 ScopedRuntimeDeviceTracker requires a device to execute on when constructed.
4020f5198 RuntimeDeviceTracker can't be copied and is only accessible via reference.
e9482018e ScopedRuntimeDeviceTracker has the same API as RuntimeDeviceTracker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1676
2019-05-24 16:45:22 -04:00
Dave Pugmire
9157004ac4 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_polyLine 2019-05-24 15:06:30 -04:00
Robert Maynard
425fcd89bf Merge topic 'use_the_magic_inline_keyword_to_fix_cuda_issues'
3a4bffe53 Make sure methods that are used by multiple TU's are inline.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1680
2019-05-23 16:41:28 -04:00
Robert Maynard
3a4bffe538 Make sure methods that are used by multiple TU's are inline.
These methods need to be marked inline as they are used by multiple
TU's. When they aren't marked as inline we see random failures in
downstream VTK-m users generally when CUDA is enabled due to ODR
violations.
2019-05-22 15:24:57 -04:00
Dave Pugmire
d6e2e9588e Remove debugging print statements. 2019-05-22 14:37:06 -04:00
Dave Pugmire
b9d109ab3d Fix for CellEdgeFace test. Case is identical to polygon. 2019-05-22 13:08:12 -04:00
Dave Pugmire
d7e793861b Fix compiler warnings. Comment out std::cout usage for testing with cuda. 2019-05-22 12:40:45 -04:00
Dave Pugmire
83cf50d549 Fixes for polyline parameterization. 2019-05-22 11:42:49 -04:00
Robert Maynard
46e0129bc1 Merge topic 'vec_operators_in_vtkm_namespace'
2041091e7 Move vtkm:: operators from global namespace to vtkm namespace

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1679
2019-05-21 15:34:18 -04:00
Robert Maynard
bcaf7d9beb ScopedRuntimeDeviceTracker have better controls of setting devices.
The ScopedRuntimeDeviceTracker now can force, enable, or disable
devices. Additionally the ScopedRuntimeDeviceTracker and the
RuntimeDeviceTracker handle the DeviceAdapterTagAny robustly
across all methods.
2019-05-21 15:32:10 -04:00
Robert Maynard
4212d0c04f RuntimeDeviceInformation now says the AnyTag exists. 2019-05-21 15:15:06 -04:00
Robert Maynard
fa03dc664a ScopedRuntimeDeviceTracker requires a device to execute on when constructed.
To simplify using the ScopedRuntimeDeviceTracker it now takes the
device id you want to run on during construction.
2019-05-21 11:17:37 -04:00
Robert Maynard
2041091e72 Move vtkm:: operators from global namespace to vtkm namespace
Fixes #361
The Vec, Range, and Pair free function operators are all now in
the vtk-m namespace to help with ADL lookup.
2019-05-20 14:16:32 -04:00
Robert Maynard
4020f51988 RuntimeDeviceTracker can't be copied and is only accessible via reference.
As the RuntimeDeviceTracker is a per thread construct we now make
it explicit that you can only get a reference to the per-thread
version and can't copy it.
2019-05-20 11:43:05 -04:00
Dave Pugmire
489995782f Support for polylines. 2019-05-17 13:35:35 -04:00
Robert Maynard
7f487b1e25 Merge topic 'dispatcher_reduce-by-key_use_scheduling_range'
63fe0f096 DispatcherReduceByKey uses the scheduling_range like all other dispatchers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1674
2019-05-16 15:28:46 -04:00
Robert Maynard
2771497728 Merge topic 'handle_dynamic_cellset_gracefully'
1b62901e9 Empty DynamicCellSet doesn't segfault on certain queries.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1675
2019-05-16 09:11:13 -04:00
Robert Maynard
4674af7442 Merge topic 'support_clang-cl'
7184648c4 Add support for clang-cl compilation on windows
b8f5d582d Merge branch 'upstream-diy' into support_clang-cl
58ad3ca36 diy 2019-05-14 (41fd7af6)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1671
2019-05-16 08:31:58 -04:00
Robert Maynard
1b62901e96 Empty DynamicCellSet doesn't segfault on certain queries.
Fixes #370
2019-05-16 08:29:17 -04:00
Robert Maynard
e9482018ee ScopedRuntimeDeviceTracker has the same API as RuntimeDeviceTracker 2019-05-15 17:26:31 -04:00
Robert Maynard
63fe0f0965 DispatcherReduceByKey uses the scheduling_range like all other dispatchers 2019-05-15 14:27:51 -04:00
Robert Maynard
be5b51fb01 Merge topic 'invoker_support_scatter'
18a0cd35b vtkm::worklet::Invoker now supports scatter types
afc3f5304 Remove unneeded ScatterType as it was the default
a1ea509f8 All scatter types now inherit from a common base
77378993f DispatcherBase: Simplify remove_cvref and remove_pointer_and_decay.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1673
2019-05-15 14:17:20 -04:00
Robert Maynard
18a0cd35b0 vtkm::worklet::Invoker now supports scatter types
Fixes #297
2019-05-15 11:04:14 -04:00
Robert Maynard
afc3f5304e Remove unneeded ScatterType as it was the default 2019-05-15 10:46:47 -04:00
Robert Maynard
a1ea509f87 All scatter types now inherit from a common base
This is required for vtkm::worklet::Invoker to launch worklets
with a non default scatter type.
2019-05-15 10:17:45 -04:00
Robert Maynard
77378993f8 DispatcherBase: Simplify remove_cvref and remove_pointer_and_decay.
designed easier to use remove_cvref and remove_pointer_and_decay
functions for the DispatcherBase.
2019-05-15 09:37:56 -04:00
Robert Maynard
7184648c44 Add support for clang-cl compilation on windows 2019-05-14 11:47:21 -04:00
Robert Maynard
b8f5d582d6 Merge branch 'upstream-diy' into support_clang-cl
* upstream-diy:
  diy 2019-05-14 (41fd7af6)
2019-05-14 11:47:02 -04:00
Diy Upstream
58ad3ca368 diy 2019-05-14 (41fd7af6)
Code extracted from:

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

at commit 41fd7af6208a5539b7675bfc488df8739f9a8f97 (for/vtk-m).
2019-05-14 11:47:02 -04:00
Sujin Philip
bd626dac79 Merge topic 'improve-reader'
b74ab327d Improve VTK DataSet Reader

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1670
2019-05-14 07:02:16 -04:00
Sujin Philip
b74ab327dc Improve VTK DataSet Reader
1. Support reading Tensors (Vec<T, 9>)
2. Support reading files having `METADATA`.
2019-05-13 15:26:15 -04:00
Robert Maynard
7200a62928 Merge topic 'update_common_latest_version'
80e5f274a Update update-common.sh to the SHA1: b094fcba

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1669
2019-05-13 15:21:37 -04:00
Robert Maynard
80e5f274a3 Update update-common.sh to the SHA1: b094fcba
This update allows for the update-common script to be run from
any directory
2019-05-13 15:17:23 -04:00
Steven Walton
4c0e55ffe9 Maybe closer 2019-05-08 20:50:55 -07:00
Robert Maynard
1ce9c30954 Merge topic 'correct_intel_findfirstsetbit'
fa3722bfa FindFirstSetBit now correctly compiles with the Intel compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1668
2019-05-08 16:53:57 -04:00
Robert Maynard
fa3722bfa3 FindFirstSetBit now correctly compiles with the Intel compiler
Fixes https://gitlab.kitware.com/paraview/paraview/issues/18993
2019-05-08 15:48:58 -04:00
Steven Walton
166255acfa Pushing for Abhishek (Don't merge) 2019-05-07 16:19:52 -07:00
Robert Maynard
850aa44be4 Merge topic 'cuda_hpc_defaults'
d1ce4a0bc Fix the default launch sizes for Tesla hardware.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1667
2019-05-07 14:40:48 -04:00
Steven Walton
7d77059339 Getting there with ES 2019-05-06 17:48:07 -07:00
Robert Maynard
1e1cf21024 Merge topic 'better_stealarray_api'
674fe1fbf StealArray now returns the array and free function as a Pair.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1664
2019-05-06 17:46:24 -04:00