Skip to content
Snippets Groups Projects

Less vtkm_cont cxx files bring in the cuda device

Merged Less vtkm_cont cxx files bring in the cuda device
robertmaynard/vtk-m:less_vtkm_cont_files_bring_in_cuda_device into master
All threads resolved!
Merged Robert Maynard requested to merge robertmaynard/vtk-m:less_vtkm_cont_files_bring_in_cuda_device into master
All threads resolved!

When you have CUDA enabled we need to make sure that all worklet launches come from a cuda file otherwise we will generate ODR violations.

Merge request reports

Pipeline #133649 running

Stage: external

Pipeline running for 18ff6681 on robertmaynard:less_vtkm_cont_files_bring_in_cuda_device

Approval is optional

Merged by Kitware RobotKitware Robot 6 years ago (Apr 1, 2019 4:02pm UTC)

Merge details

  • Changes merged into master with f350517d.
  • Deleted the source branch.

Pipeline #133651 failed

Stage: external

Pipeline failed for f350517d on master

Deployed to doxygen‎-nightly‎ 3 years ago
View app

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 4dc85f1f

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Errors:

    • commit 4dc85f1f is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: vtkm/cont/CellLocator.cxx, vtkm/cont/CellLocator.h, vtkm/cont/ColorTable.h, vtkm/cont/RuntimeDeviceTracker.cxx, vtkm/cont/RuntimeDeviceTracker.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    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.

  • Kenneth Moreland
  • Robert Maynard
    Robert Maynard @robertmaynard ·
    Author Contributor

    Do: reformat

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    This topic has been reformatted and pushed; please fetch from the source repository and reset your local branch to continue with further development on the reformatted commits.

  • Kitware Robot added 1 commit

    added 1 commit

    • 0b727787 - Less vtkm_cont cxx files bring in the cuda device

    Compare with previous version

  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 0b727787

  • Robert Maynard added 1 commit

    added 1 commit

    • 2d40ca51 - Less vtkm_cont cxx files bring in the cuda device

    Compare with previous version

  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 2d40ca51

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Errors:

    • commit 2d40ca51 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: vtkm/cont/CellLocator.cxx, vtkm/cont/CellLocator.h, vtkm/cont/ColorTable.h, vtkm/cont/RuntimeDeviceTracker.cxx, vtkm/cont/RuntimeDeviceTracker.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    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.

  • Kenneth Moreland resolved all discussions

    resolved all discussions

  • Robert Maynard added 1 commit

    added 1 commit

    • b90a55c9 - Less vtkm_cont cxx files bring in the cuda device

    Compare with previous version

  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: b90a55c9

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Errors:

    • commit b90a55c9 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: vtkm/cont/CellLocator.cxx, vtkm/cont/CellLocator.h, vtkm/cont/ColorTable.h, vtkm/cont/RuntimeDeviceTracker.cxx, vtkm/cont/RuntimeDeviceTracker.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    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.

  • Robert Maynard added 5 commits

    added 5 commits

    Compare with previous version

  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 912ba988

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Errors:

    • commit 912ba988 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: vtkm/cont/CellLocator.cxx, vtkm/cont/CellLocator.h, vtkm/cont/ColorTable.h, vtkm/cont/RuntimeDeviceTracker.cxx, vtkm/cont/RuntimeDeviceTracker.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    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.

  • Robert Maynard added 1 commit

    added 1 commit

    • 7b67350a - Less vtkm_cont cxx files bring in the cuda device

    Compare with previous version

  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 7b67350a

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Errors:

    • commit 7b67350a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: vtkm/cont/CellLocator.cxx, vtkm/cont/CellLocator.h, vtkm/cont/ColorTable.h, vtkm/cont/RuntimeDeviceTracker.cxx, vtkm/cont/RuntimeDeviceTracker.h, vtkm/filter/GhostCellClassify.hxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    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.

  • Robert Maynard added 1 commit

    added 1 commit

    • 57b5c501 - Less vtkm_cont cxx files bring in the cuda device

    Compare with previous version

  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 57b5c501

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Errors:

    • commit 57b5c501 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: vtkm/cont/CellLocator.cxx, vtkm/cont/CellLocator.h, vtkm/cont/ColorTable.h, vtkm/cont/RuntimeDeviceTracker.cxx, vtkm/cont/RuntimeDeviceTracker.h, vtkm/filter/GhostCellClassify.hxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    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.

  • Robert Maynard
    Robert Maynard @robertmaynard ·
    Author Contributor

    Are you okay with these changes @kmorel?

  • Kenneth Moreland
    Kenneth Moreland @kmorel ·
    Maintainer

    +1

  • Robert Maynard
    Robert Maynard @robertmaynard ·
    Author Contributor

    Do: reformat

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    This topic has been reformatted and pushed; please fetch from the source repository and reset your local branch to continue with further development on the reformatted commits.

  • Kitware Robot added 1 commit

    added 1 commit

    • 18ff6681 - Less vtkm_cont cxx files bring in the cuda device

    Compare with previous version

  • buildbot
    buildbot @buildbot ·
    Maintainer

    This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 18ff6681

  • Robert Maynard
    Robert Maynard @robertmaynard ·
    Author Contributor

    Do: merge

  • Robert Maynard mentioned in commit f350517d

    mentioned in commit f350517d

  • Kitware Robot merged

    merged

    • Please register or sign in to reply