Commit Graph

5588 Commits

Author SHA1 Message Date
Kenneth Moreland
887f79c6f4 Make a vtkm_worklet library
This is a library that contains parts of worklets that can be
precompiled into a library.

Currently, this library contains the implementation of ScatterCounting.
2019-01-23 17:09:15 -07:00
Robert Maynard
ef0054eeb7 Merge topic 'RunOnDevice_require_argc_argv'
ed34b632f vtkm::cont::Testing RunOnDevice requires argc,argv parameters.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1521
2019-01-23 16:26:30 -05:00
Robert Maynard
ed34b632f3 vtkm::cont::Testing RunOnDevice requires argc,argv parameters. 2019-01-23 16:01:58 -05:00
Robert Maynard
0365af01fd Merge topic 'testing_run_requires_argc_argv'
c36b45435 Add UnitTestWorkletMapFieldWholeArrayAtomic
d6f66d17a Testing run methods now take argc/argv to init logging/runtime device

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1500
2019-01-22 08:07:18 -05:00
Robert Maynard
c36b45435b Add UnitTestWorkletMapFieldWholeArrayAtomic
This covers the atomic tests that was previously part of WorkletMapFieldWholeArray
2019-01-18 13:30:37 -06:00
Robert Maynard
d6f66d17a3 Testing run methods now take argc/argv to init logging/runtime device
`vtkm::cont::testing` now initializes with logging enabled and support
for device being passed on the command line, `vtkm::testing` only
enables logging.
2019-01-17 13:16:27 -06:00
Kenneth Moreland
cbf913ad7c Merge topic 'cast-variant-to-storage'
d59ce11c0 Allow VariantArrayHandle CastAndCall to cast to concrete types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1519
2019-01-17 11:34:22 -05:00
Robert Maynard
4003b5fc63 Merge topic 'remove_test_builds'
4ec5bae02 Remove VTK-m TestBuild infrastructure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1518
2019-01-16 23:40:42 -05:00
Kenneth Moreland
d59ce11c00 Allow VariantArrayHandle CastAndCall to cast to concrete types
When you call VariantArrayHandle::CastAndCall, it now tries both basic
storage and virtual storage. You can modify the types of storages tried
by giving a type list of storage tags as the first argument.
2019-01-16 22:31:55 -06:00
Robert Maynard
4ec5bae02d Remove VTK-m TestBuild infrastructure
The purpose of the TestBuild infrastructure was to confirm that
VTK-m didn't have any lexical issues when it was a pure header
only project. As we now move to have more compiled components
the need for this form of testing is mitigated. Combined
with the issue of TestBuilds causing MSVC issues, we should
just remove this infrastructure.
2019-01-16 10:04:33 -06:00
Haocheng LIU
5cf2a21d3c Merge topic 'merge-rendering-executables'
2f20549b4 Merge rendering testing executables to a shared library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1506
2019-01-14 15:17:46 -05:00
Haocheng LIU
2f20549b4b Merge rendering testing executables to a shared library
This commit allows rendering testing executables to select the device at runtime.
2019-01-14 14:20:00 -05:00
Kenneth Moreland
deb9a3c488 Merge topic 'field-tags-no-template'
871d3360f Add status update to update script
a52211e56 Fix conversion errors in benchmarking code
821925fbf Update changedoc
b2e20bf90 Fix issues from removing field type templates
2e426ad54 Run the update-control-signature-tags.sh script
16c2dfd8b Add script to update control signature tags
42f810f70 Remove type lists from ControlSignature arguments for arrays

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1450
2019-01-11 15:19:35 -05:00
Kenneth Moreland
871d3360f1 Add status update to update script
The script can take a while, so it is good to give some output so
that users know that it is still running.
2019-01-11 12:23:19 -07:00
Kenneth Moreland
a52211e565 Fix conversion errors in benchmarking code
The recent removal of type selectors in ControlSignature field tags
means that the BenchmarkFieldAlgorithms code was creating code paths
that were never followed and lead to impossible type conversions (e.g.
Vec to float). Fixed the problem by specifing the types for the
VariantArrayHandles better.
2019-01-11 12:23:19 -07:00
Kenneth Moreland
821925fbf3 Update changedoc 2019-01-11 12:23:19 -07:00
Kenneth Moreland
b2e20bf90e Fix issues from removing field type templates
The script fixed up most of the issues. However, there were some
instances that the script was not able to pick up on. There were
also some instances that still needed a means to select types.
2019-01-11 12:23:19 -07:00
Kenneth Moreland
2e426ad547 Run the update-control-signature-tags.sh script 2019-01-11 12:23:10 -07:00
Kenneth Moreland
16c2dfd8be Add script to update control signature tags
Removes template parameters from tags that no longer use them.
2019-01-11 12:15:16 -07:00
Kenneth Moreland
42f810f70e Remove type lists from ControlSignature arguments for arrays
The typelist arguments for ControlSignature tags are antiquated. Remove
them.
2019-01-11 12:15:16 -07:00
Robert Maynard
ac61044422 Merge topic 'dejagore_warnings'
f848bc354 Correct warnings from switch statements with no case labels.
90bca8a53 Remove unnecessary constructor from IntersectionPointMap
3c96b5a7b Suppress  stack warnings generated by BoundingIntervalHierarchyTester

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1515
2019-01-11 11:44:50 -05:00
Robert Maynard
f848bc3541 Correct warnings from switch statements with no case labels. 2019-01-10 15:16:53 -05:00
Robert Maynard
e72d0d5dde Merge topic 'annotation_warning_arrayportal_virtual'
cead0e26a ArrayPortalVirtual+ nvcc 9 fix annotation warnings on defaulted methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1512
2019-01-10 10:49:39 -05:00
Robert Maynard
90bca8a53f Remove unnecessary constructor from IntersectionPointMap 2019-01-10 09:25:27 -05:00
Robert Maynard
3c96b5a7bc Suppress stack warnings generated by BoundingIntervalHierarchyTester 2019-01-10 09:25:12 -05:00
Robert Maynard
628dce822e Merge topic 'require_cmake38'
f1e1a524e Require CMake 3.8 to build VTK-m.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1514
2019-01-09 17:02:52 -05:00
Abhishek Yenpure
afd0409189 Merge topic 'code_sprint_locator_fixes'
9b56d41fe Fixing Rectilinear Grid Cell Locator
10e9d47dc Removing std::out print statement from test
34c7b57d8 Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes
62ee1a2c8 Updates to the Cell Locators
7eb0de5b7 Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes
866b0798d Resolving type warnings
c062f2e26 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into code_sprint_locator_fixes
797c83891 Adding default constructor and removing wrong comment
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1395
2019-01-09 16:23:17 -05:00
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
Robert Maynard
cead0e26ac ArrayPortalVirtual+ nvcc 9 fix annotation warnings on defaulted methods 2019-01-08 12:40:15 -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
ayenpure
9b56d41fe0 Fixing Rectilinear Grid Cell Locator
- Using exec portal in cont environment made the tests to fail
  on the GPUs.
2019-01-07 18:11:35 -08: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
ayenpure
10e9d47dc3 Removing std::out print statement from test 2019-01-06 17:27:51 -08:00
ayenpure
34c7b57d80 Merge branch 'code_sprint_locator_fixes' of gitlab.kitware.com:ayenpure/vtk-m into code_sprint_locator_fixes 2019-01-06 17:21:20 -08:00
ayenpure
62ee1a2c8a Updates to the Cell Locators
- Adding updates to uniform grid cell locator
  - adding OpenMP test, updating copyrights
- Adding rectilinear grid cell locator
  - adding unit tests for serial, tbb, OpenMP, and cuda
- Updating CMakeLists to honor the alphabetical ordering
2019-01-06 17:18:23 -08: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