-
Notifications
You must be signed in to change notification settings - Fork 38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade to Drake 1.28 #340
Conversation
Signed-off-by: Aditya Pande <[email protected]>
Signed-off-by: Aditya Pande <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @IanTheEngineer)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @IanTheEngineer)
I see a weird error locally :
|
You probably need to update your C++ standard:
|
Signed-off-by: Aditya Pande <[email protected]>
Sorry, I was just heading offline and didn't have a chance for a full reply. The file that owns the C++ standard is |
Signed-off-by: Aditya Pande <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 1 files at r2, 1 of 1 files at r3, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @adityapande-1995 and @IanTheEngineer)
default.bazelrc
line 1 at r3 (raw file):
# Use C++17.
nit Comment is stale (should say 20)
.github/ci.bazelrc
line 18 at r3 (raw file):
fetch --disk_cache /home/runner/.cache/bazel_ci/bazel_local_disk build --disk_cache /home/runner/.cache/bazel_ci/bazel_local_disk build --cxxopt="-std=c++20"
nit Remove
Signed-off-by: Aditya Pande <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 2 of 2 files at r4, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @IanTheEngineer)
Not sure what the CI failure is about, I'm not seeing it locally |
I don't understand the failure shown in attempt 1, but for the error on attempt 2 ( |
Yes per readme the Ubuntu PPA is added in the default GHA Ubuntu image. This is somewhat related to actions/runner-images#8659. This error probably does not happen on master, since it's due to the C++20 upgrade. Drake is using clang-14 to parse the header files when making bindings, but the newer GCC 13 libstdc++ is not compatible with that version of Clang. The work-around is probably to You could image doing two different PRs here -- one to bump to C++20 (and fix GCC) but keep Drake at v1.26. Then cycle back here to upgrade 1.26 => 1.27 which should be just the tiny version bump with no other changes. |
Makes sense. Moving to cpp 20 changes here : #341 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like the error is still there. Looks our github actions setup here will need to purge GCC 13 (and maybe 12) to get this passing.
Reviewed 1 of 1 files at r5, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @IanTheEngineer)
Signed-off-by: Aditya Pande <[email protected]>
Signed-off-by: Aditya Pande <[email protected]>
I think |
I think the GitHub Actions stuff is solved now. There are two more problems -- new linter errors from the upgraded buildifier, and new test failures due to using unstable model files from Drake. I'll try to push fixes for both of those soon. |
+@rpoyner-tri could you please take a look at the CI error here? (https://github.com/RobotLocomotion/drake-ros/actions/runs/8698347467/job/23855186943?pr=340#step:22:46) It looks to me like the The questions are: (1) Is there a Drake bug report we should file about this? (If so, can you please write it up.) (2) Is there any quick work-around we could band-aid here, to get this PR merged? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 2 of 2 files at r7, 16 of 16 files at r8, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @IanTheEngineer)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(1) yeah kinda (the code presented would need the parser to get updated when RenameModelInstance happens on the plant; there's a design gap here. I will write an issue), (2) we can just move the construction of the Parser object inside the loops in the application code, as a workaround.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @IanTheEngineer)
Ah, good point. I'll try to get (2) fixed here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm trying my proposed (2) in drake_ros, and it's still blowing up. I pasted a very similar swath of code into a (temporary) test in drake, and (2) fixed it. Still investigating.
Reviewable status: 18 of 20 files reviewed, all discussions resolved (waiting on @IanTheEngineer and @jwnimmer-tri)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah. multirobot.py also needs an analogous fix.
Reviewable status: 18 of 20 files reviewed, all discussions resolved (waiting on @IanTheEngineer and @jwnimmer-tri)
So possibly the patch I just pushed here will be OK? I guess we'll find out soon. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 18 of 20 files reviewed, all discussions resolved (waiting on @IanTheEngineer and @jwnimmer-tri)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 2 of 2 files at r9, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @IanTheEngineer)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for iterating here, @jwnimmer-tri , and reviewing @rpoyner-tri
Reviewed 2 of 2 files at r7, 14 of 16 files at r8, 2 of 2 files at r9, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved
FYI actions/runner-images#9679 is underway, which means that the GCC 13 stuff will vanish on its own eventually, and we can remove our GHA CI hacks. |
Upgrades drake version.
This change is