Commit Graph

5543 Commits

Author SHA1 Message Date
Robert Maynard
f1e1a524e9 Require CMake 3.8 to build VTK-m. 2019-01-09 16:01:22 -05:00
Robert Maynard
9bfe670e1c Merge topic 'correct_more_diy2_warnings'
f4a96cf1f Correct warning in StorageBasic logging when using 32bit ids.
281284298 Merge branch 'upstream-diy' into correct_more_diy2_warnings
3c130d166 diy 2019-01-09 (149953b0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1513
2019-01-09 14:21:40 -05:00
Robert Maynard
f4a96cf1fb Correct warning in StorageBasic logging when using 32bit ids. 2019-01-09 12:56:34 -05:00
Robert Maynard
0241201db7 Merge topic 'optimize_casting_operations'
d29bdb2e3 VariantArrayHandleContainer casting operations have minimal overhead.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1509
2019-01-09 11:16:59 -05:00
Robert Maynard
2812842984 Merge branch 'upstream-diy' into correct_more_diy2_warnings
* upstream-diy:
  diy 2019-01-09 (149953b0)
2019-01-09 11:04:01 -05:00
Diy Upstream
3c130d1667 diy 2019-01-09 (149953b0)
Code extracted from:

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

at commit 149953b098d5d19c9276b0aca989e7144f16a69d (for/vtk-m).
2019-01-09 11:04:01 -05:00
Robert Maynard
d29bdb2e39 VariantArrayHandleContainer casting operations have minimal overhead.
We want to make sure that VariantArrayHandleContainer has as little
overhead when launch worklets as possible. To do so we cache
type information to make deducing the `T` type of ArrayHandles
as fast as possible.
2019-01-09 08:27:14 -05:00
Robert Maynard
831a0bf844 Merge topic 'reduce_array_handle_virtual_binary_size'
a9d092efa Optimize TransferInfo / VirtualObjectTransfer for shared memory systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1498
2019-01-09 08:25:18 -05:00
Robert Maynard
c89f633d11 Merge topic 'fix_diy2_unused_call_result_warning'
5fa086f7d Merge branch 'upstream-diy' into fix_diy2_unused_call_result_warning
c445f9693 diy 2019-01-08 (839fd11e)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !1511
2019-01-08 15:06:40 -05:00
Robert Maynard
ca737437bb Merge topic 'unsigned_to_signed_warning_in_logging'
2e93443b1 All bit shifting in vtkm::cont::Logging happens in unsigned space

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1510
2019-01-08 13:41:36 -05:00
Diy Upstream
c445f9693c diy 2019-01-08 (839fd11e)
Code extracted from:

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

at commit 839fd11e76020c77befbaf05df87d53a45353d36 (for/vtk-m).
2019-01-08 12:35:31 -05:00
Robert Maynard
5fa086f7d4 Merge branch 'upstream-diy' into fix_diy2_unused_call_result_warning
* upstream-diy:
  diy 2019-01-08 (839fd11e)
2019-01-08 12:35:31 -05:00
Robert Maynard
2e93443b10 All bit shifting in vtkm::cont::Logging happens in unsigned space 2019-01-08 09:49:15 -05:00
Robert Maynard
1ba38c59f7 Merge topic 'move_human_size_to_logging'
543255c37 Move the HumanSize function to Logging.cxx as it is only used by the logger

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1508
2019-01-07 17:42:50 -05:00
Robert Maynard
543255c374 Move the HumanSize function to Logging.cxx as it is only used by the logger 2019-01-07 16:24:49 -05:00
Robert Maynard
5cb52bc8a2 Merge topic 'string_to_device_adapter_case_insensitive'
ce95b8f78 VTK-m now supports case-insensitive construction of devices from strings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1502
2019-01-07 12:07:08 -05:00
Robert Maynard
ce95b8f788 VTK-m now supports case-insensitive construction of devices from strings.
Previously you had to exactly match the case of a device adapter's name to
construct it, which was a source of lots of problems ( OpenMP versus OPENMP, CUDA or Cuda ).

Now `vtkm::cont::make_DeviceAdapterId` and `vtkm::cont::RuntimeDeviceTracker` support
case-insensitive device construction.
2019-01-07 08:12:25 -05:00
Robert Maynard
0ae31eb637 Merge topic 'probe_syntactic_disambiguation_warning'
a5cd7b2e3 Remove un-needed `.template` that caused warning in probe filter test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1507
2019-01-04 15:06:35 -05:00
Robert Maynard
a5cd7b2e3c Remove un-needed .template that caused warning in probe filter test 2019-01-04 12:49:05 -05:00
Robert Maynard
eaf235ab9d Merge topic 'decrease_cost_of_runtime_tracker_deep_copy'
10895f0ea RuntimeDeviceTracker DeepyCopy is better optimized.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1504
2019-01-04 11:55:15 -05:00
Robert Maynard
10895f0ea5 RuntimeDeviceTracker DeepyCopy is better optimized.
The DeepCopy method is used when a ScopedGlobalRuntimeDeviceTracker
is constructed. This in turn causes the rebuilding of the device
names and states which isn't a free operation. Now we copy the already
computed information.

This was noticeable when using ArrayHandleTransform since it uses
ScopedGlobalRuntimeDeviceTracker when construction host side
portals.
2019-01-03 15:03:35 -05:00
Haocheng LIU
9cb099a83d Merge topic 'remove-compile-time-device-check-unittestBIH'
5251091e5 Remove compile time adapter checks in UnitTestBoundingIntervalHierarchy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1503
2019-01-03 10:48:39 -05:00
Haocheng LIU
5251091e54 Remove compile time adapter checks in UnitTestBoundingIntervalHierarchy 2019-01-03 09:22:35 -05:00
Robert Maynard
f955103cad Merge topic 'add_more_types_to_move_constructor_test'
4e9b4c37e Verify more core vtkm types have proper move semantics.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1499
2019-01-02 16:50:31 -05:00
Robert Maynard
4e9b4c37e1 Verify more core vtkm types have proper move semantics. 2019-01-02 12:46:30 -05:00
Robert Maynard
b47ed21631 Merge topic 'runtime_device_tracker_log_each_device_changes'
0ee575372 VTK-m now logs whenever at runtime a device is enabled/disabled.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1501
2019-01-02 11:14:19 -05:00
Robert Maynard
0ee5753724 VTK-m now logs whenever at runtime a device is enabled/disabled.
Previously we only logged when a user requested a device on the
command line, but that doesn't capture when code forces a device
2019-01-02 09:34:50 -05:00
Robert Maynard
169f55161f Merge topic 'run_filter_tests_with_per_device'
fda911377 vtkm::filter now run each test with an explicit device adapter set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1497
2019-01-01 16:05:26 -05:00
Robert Maynard
a9d092efac Optimize TransferInfo / VirtualObjectTransfer for shared memory systems 2019-01-01 15:58:57 -05:00
Robert Maynard
fda9113779 vtkm::filter now run each test with an explicit device adapter set
This allows the filters to be tested with each device
2019-01-01 14:13:08 -05:00
Robert Maynard
ee6917a5c5 Merge topic 'array_handle_virtual_is_type_no_static_asserts'
61b1b5157 Make IsType and Cast not error at compile time when given bad types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1496
2019-01-01 08:58:06 -05:00
Abhishek Yenpure
92e083ccf1 Merge topic 'clip_segfault_fix'
7ee51f65d Adding clipping test for volumetric data
f0a342e4d Adding fix for Clip failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1495
2018-12-31 14:50:11 -05:00
Robert Maynard
61b1b51577 Make IsType and Cast not error at compile time when given bad types
Previously these two functions would give compile errors when asked to
compare against an Array with a different value type. This makes it easier
to write generic code that compares virtual handles.
2018-12-31 13:03:42 -05:00
ayenpure
7ee51f65de Adding clipping test for volumetric data
- Added to detect cases like bug #329
  https://gitlab.kitware.com/vtk/vtk-m/issues/329
- This is just to execute the clipping filter with a larger
  dataset, and to ensure it can pass without failures and crashes.
2018-12-30 12:36:01 -08:00
ayenpure
f0a342e4d1 Adding fix for Clip failure
- Failure reported by Matt Larsen
  Bug : https://gitlab.kitware.com/vtk/vtk-m/issues/329
2018-12-29 13:50:43 -08:00
Robert Maynard
c4bf46ecf0 Merge topic 'simplify_unified_memory_example'
8ca24baec Update the UnifiedMemory example to properly disable managed memory
718caaaea CudaAllocator allows managed memory to be explicitly disabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !1492
2018-12-28 13:41:01 -05:00
Robert Maynard
8ca24baecd Update the UnifiedMemory example to properly disable managed memory 2018-12-28 11:30:29 -05:00
Robert Maynard
718caaaeac CudaAllocator allows managed memory to be explicitly disabled 2018-12-28 11:30:29 -05:00
Robert Maynard
448ec29265 Merge topic 'virtual_fancy_handles'
19c623bfa Add changelogs for ArrayHandleVirtual and VariantArrayHandle
3445047f9 Refactor vtkm::cont::ArrayHandleAny into vtkm::cont::ArrayHandleVirtual
7a5e32be7 Update VTKmCompilerFlags to suppress stack-size-warnings on CUDA 9+
bef70820c Update new worklets to work with ArrayHandleVariant
1f2abbc9c vtkm::cont::IsType and vtkm::cont::Cast support VariantArrayHandle
acf825b27 Correct IsType and Cast on ArrayHandleVirtual to work on OSX.
7b9fa975f Rename: IsVirtualType to IsValueType.
deb4946a4 Make sure vtk-m libraries under CUDA 8 are always built statically
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1454
2018-12-27 16:31:11 -05:00
Robert Maynard
19c623bfa3 Add changelogs for ArrayHandleVirtual and VariantArrayHandle 2018-12-27 15:42:03 -05:00
Robert Maynard
3445047f9e Refactor vtkm::cont::ArrayHandleAny into vtkm::cont::ArrayHandleVirtual
ArrayHandleVirtual can automatically be constructed from any ArrayHandle.
In the cases where the input ArrayHandle doesn't derived from ArrayHandleVirtual,
it will automatically construct StorageAny to hold the array.
2018-12-27 15:42:03 -05:00
Robert Maynard
7a5e32be73 Update VTKmCompilerFlags to suppress stack-size-warnings on CUDA 9+
This will allow better suppression of cuda stack size warnings
for developers and build machines.
2018-12-27 15:42:03 -05:00
Robert Maynard
bef70820c9 Update new worklets to work with ArrayHandleVariant 2018-12-27 14:35:56 -05:00
Robert Maynard
1f2abbc9c4 vtkm::cont::IsType and vtkm::cont::Cast support VariantArrayHandle 2018-12-27 14:35:56 -05:00
Robert Maynard
acf825b279 Correct IsType and Cast on ArrayHandleVirtual to work on OSX. 2018-12-27 14:35:56 -05:00
Robert Maynard
7b9fa975f2 Rename: IsVirtualType to IsValueType. 2018-12-27 14:35:56 -05:00
Robert Maynard
deb4946a41 Make sure vtk-m libraries under CUDA 8 are always built statically 2018-12-27 14:35:56 -05:00
Robert Maynard
9c496e5da0 Correct warning found in ArrayHandleVirtualCoordinates with cuda 8.0 2018-12-27 14:35:56 -05:00
Robert Maynard
78e9cf0929 ArrayRangeCompute now supports ArrayHandleVirtual<vec3f> 2018-12-27 14:35:56 -05:00
Robert Maynard
7eb1e31b11 Remove vtkm::cont::DynamicArrayHandle. 2018-12-27 14:35:56 -05:00