DIY: Add include of cstddef to DIY datatypes.hpp
This is required because size_t is not defined via the STL headers included here.
Merge request reports
Activity
requested review from @sujin.philip
assigned to @ryan.krattiger1
This merge request has been queued for testing. Test results may be viewed on:
- Gitlab CI builders results can be viewed via the Pipelines for this merge request.
- CDash links are also available in the Pipelines page
- CDash (master)
- Buildbot (master) (only visible from inside Kitware)
Branch-at-master: 671217eb
Errors:
- commit 671217eb not allowed; the
vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/mpi/datatypes.hpp
file is maintained by the third party utilities; please usevtkm/thirdparty/diy/update.sh
to update this file.
Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.
- commit 671217eb not allowed; the
- Resolved by Vicente Bolea
Unfortunately, the VTK-m repo will not allow this change to be committed. It does not allow direct modifications to the third party library code because that makes it very difficult to update to new versions of the external software. Instead, modifications have to be made on the
for/vtk-m
branch of https://gitlab.kitware.com/third-party/diy2 and then update the VTK-m code with a script. (See https://gitlab.kitware.com/vtk/vtk-m/-/blob/master/vtkm/thirdparty/UPDATING.md for more details.)This process is admittedly a pain. I think your modification is the best solution, but could you instead work around the problem by adding
#include <cstddef>
before including the diy files?
changed milestone to %v1.9.0
This merge request has been queued for testing. Test results may be viewed on:
- Gitlab CI builders results can be viewed via the Pipelines for this merge request.
- CDash links are also available in the Pipelines page
- CDash (master)
- Buildbot (master) (only visible from inside Kitware)
Branch-at-master: 671217eb
@ryan.krattiger1 we need to hurry here to make it to the incoming release.
added 33 commits
-
671217eb...16887ff1 - 32 commits from branch
vtk:master
- 95231cd1 - Update diy/update.sh
-
671217eb...16887ff1 - 32 commits from branch
This merge request has been queued for testing. Test results may be viewed on:
- Gitlab CI builders results can be viewed via the Pipelines for this merge request.
- CDash links are also available in the Pipelines page
- CDash (master)
- Buildbot (master) (only visible from inside Kitware)
Branch-at-master: 95231cd1
@ryan.krattiger1 I think that you missed git-adding the change in diy.
This merge request has been queued for testing. Test results may be viewed on:
- Gitlab CI builders results can be viewed via the Pipelines for this merge request.
- CDash links are also available in the Pipelines page
- CDash (master)
- Buildbot (master) (only visible from inside Kitware)
Branch-at-master: 4c708ac6
This merge request has been queued for testing. Test results may be viewed on:
- Gitlab CI builders results can be viewed via the Pipelines for this merge request.
- CDash links are also available in the Pipelines page
- CDash (master)
- Buildbot (master) (only visible from inside Kitware)
Branch-at-master: 4c708ac6
mentioned in commit 0df578eb