Robert Maynard
9580b1921e
Introduces SourceInInstall which verifies that VTK-m install its headers
...
Fixes #342
2019-01-29 16:48:35 -05:00
Robert Maynard
c501500e1d
Install missing headers found by VTKmCheckSourceInInstall
2019-01-29 14:46:27 -05:00
Robert Maynard
baaa47af43
Reduce verbosity of VTKmCheckCopyright
...
This makes it easier to find the offending files when
going through the output.
2019-01-29 12:13:52 -05:00
Robert Maynard
545a2ce91d
VTKmCheckSourceInBuild now shows all missing files in a directory
...
Previously VTKmCheckSourceInBuild would error out after the
first missing file. Now it errors out after looking at
the whole directory.
2019-01-29 12:13:40 -05:00
Kenneth Moreland
6ea55f838b
Merge topic 'vtkm_worklet-library'
...
55570a16a Add most common implementations of Keys templates to library
887f79c6f Make a vtkm_worklet library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1520
2019-01-26 21:08:21 -05:00
Matt Larsen
774957e84a
Merge topic 'fix_install'
...
758459370 adding missing headers to the install
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1529
2019-01-26 12:20:06 -05:00
mclarsen
7584593700
adding missing headers to the install
2019-01-26 08:32:05 -08:00
Robert Maynard
ce4076dd96
Merge topic 'faster_worklet_builds'
...
002bd3419 Improve the compile time of WorkletMap* unit tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1527
2019-01-25 10:19:24 -05:00
Robert Maynard
002bd34197
Improve the compile time of WorkletMap* unit tests
...
By restricting the possible variant types we can dramatically
improve compile time performance.
2019-01-25 08:23:02 -05:00
Kenneth Moreland
55570a16ad
Add most common implementations of Keys templates to library
...
Also moved the Keys<>::SortType outside to KeysSortType. The problem
with having it inside the Keys class was that there was a different
object created for every instances of Keys.
2019-01-24 13:18:10 -07:00
Robert Maynard
5508d17c31
Merge topic 'correct_broken_install'
...
24e71d251 VTK-m yet again has properly installed headers.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1525
2019-01-24 14:59:41 -05:00
Robert Maynard
223a711f2b
Merge topic 'ErrorBadType_IsDeviceIndependent'
...
80b7f8f18 ErrorBadType should be a device independent exception
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1524
2019-01-24 14:43:06 -05:00
Robert Maynard
24e71d251b
VTK-m yet again has properly installed headers.
...
Fixes the install issues mentioned in #342
2019-01-24 14:26:40 -05:00
Allison Vacanti
4ddcfbc66d
Merge topic 'openmp_task_namespace'
...
91a1c7e2d Fix typo in openmp and tbb task code.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1523
2019-01-24 13:19:33 -05:00
Allison Vacanti
07f8f919ee
Merge topic 'vtkm_cuda_device_pass'
...
03fc7b66d Add VTKM_CUDA_DEVICE_PASS preprocessing definition.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1522
2019-01-24 13:19:14 -05:00
Robert Maynard
80b7f8f187
ErrorBadType should be a device independent exception
2019-01-24 13:01:03 -05:00
Allison Vacanti
91a1c7e2d0
Fix typo in openmp and tbb task code.
2019-01-24 12:02:13 -05:00
Allison Vacanti
03fc7b66d0
Add VTKM_CUDA_DEVICE_PASS preprocessing definition.
...
This is only set while compiling device code, and is useful
for code that needs different implementations on devices (e.g.
they call CUDA device intrinsics, etc).
2019-01-24 11:23:45 -05:00
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