Skip to content
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

Remove bind #1204

Merged
merged 8 commits into from
May 10, 2022
Merged

Remove bind #1204

merged 8 commits into from
May 10, 2022

Conversation

peterdavidfagan
Copy link
Member

Fixes #872

This pull request removes std::bind from the MoveIt2 codebase and includes some minor rework of pointer usage.

The changes in this pull request are based on these changes that were completed within MoveIt (thanks to @v4hn for this).

This is my first pull request on the MoveIt2 project, I hope I didn't overlook anything in the process. I am happy to address any feedback items to ensure this code can be merged into the main project.

@peterdavidfagan
Copy link
Member Author

Hi @henningkayser and @v4hn,

It looks like I need a maintainer to approve the execution of GHA workflows since I am a first-time contributor. I would appreciate the approval of this workflow run.

I can look to run industrial_ci locally if usage of GHA minutes is an important constraint.

@codecov
Copy link

codecov bot commented May 1, 2022

Codecov Report

Merging #1204 (59a1307) into main (78574bc) will decrease coverage by 1.19%.
The diff coverage is 47.35%.

@@            Coverage Diff             @@
##             main    #1204      +/-   ##
==========================================
- Coverage   61.35%   60.16%   -1.18%     
==========================================
  Files         274      274              
  Lines       24782    24830      +48     
==========================================
- Hits        15202    14937     -265     
- Misses       9580     9893     +313     
Impacted Files Coverage Δ
..._core/collision_detection/src/collision_matrix.cpp 37.56% <0.00%> (ø)
...sion_distance_field/collision_env_distance_field.h 4.77% <ø> (ø)
...raint_samplers/src/default_constraint_samplers.cpp 71.75% <0.00%> (-0.39%) ⬇️
...e/moveit/ompl_interface/planning_context_manager.h 100.00% <ø> (ø)
.../ompl_interface/src/detail/constraints_library.cpp 0.00% <0.00%> (ø)
...ccupancy_map_monitor/src/occupancy_map_monitor.cpp 20.13% <0.00%> (-0.81%) ⬇️
...g/rdf_loader/src/synchronized_string_parameter.cpp 32.82% <0.00%> (-51.56%) ⬇️
...ude/moveit/robot_interaction/interaction_handler.h 0.00% <ø> (ø)
...clude/moveit/robot_interaction/robot_interaction.h 0.00% <ø> (ø)
..._ros/robot_interaction/src/interaction_handler.cpp 0.00% <0.00%> (ø)
... and 38 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 78574bc...59a1307. Read the comment docs.

@peterdavidfagan
Copy link
Member Author

Thanks for running CI, it looks like one of the tests is failing (test_ruckig_traj_smoothing), I will take a look into this to understand why it has occurred.

@AndyZe
Copy link
Member

AndyZe commented May 2, 2022

Hmm, that's a weird failure. It looks like the test should pass. The requirement is:

(actual_duration < (1.3 * ideal_duration), actual: 0.285312 vs 0.273325

So it's definitely within 30%. I'm confused why that fails

@AndyZe
Copy link
Member

AndyZe commented May 2, 2022

I'll try running the test again.

@AndyZe
Copy link
Member

AndyZe commented May 2, 2022

Also, note that the failing test is on rolling-ci-testing. That is the upcoming changes that haven't been released yet. The required tests are rolling-ci and Formatting -- both of which pass. So I think you are A-OK 👍

@henningkayser
Copy link
Member

Thank you @peterdavidfagan! The changes look all good at first sight. I would have expected cherry-picked commits from the original PR to keep the original authors of this effort, but I guess we haven't really required that. I'll leave it to @v4hn, @rhaschke to decide if they are ok with the new commits.

@peterdavidfagan
Copy link
Member Author

peterdavidfagan commented May 4, 2022

Thanks @henningkayser I appreciate this and I agree it would have been optimal to preserve the original authors through cherry-picking commits. I would be happy to resubmit this pull request in this format if it is preferred, I would in this case separate any of my changes that are distinct from the original commits.

@rhaschke
Copy link
Contributor

rhaschke commented May 4, 2022

Keeping the original authors would have been great indeed. If you don't mind, @peterdavidfagan, please adapt. You can easily change authors via manual rebase and git commit --amend --author="...".

@peterdavidfagan
Copy link
Member Author

Keeping the original authors would have been great indeed. If you don't mind, @peterdavidfagan, please adapt. You can easily change authors via manual rebase and git commit --amend --author="...".

Will do @rhaschke I have set aside time for this at the end of my current work session so I will perform the rebase and push the changes then.

@peterdavidfagan
Copy link
Member Author

peterdavidfagan commented May 4, 2022

The above force push resets the commit authors to those who authored the original commits in the MoveIt repository (original commits found in this pr).

The original commits for changes to the planning context manager have been squashed in this pull request hence the two sources in the commit description. I assigned @rhaschke as the author since he made the last edits.

@rhaschke would you prefer for this commit to not be squashed in order to preserve the original history? Happy to also make this change if needed.

@rhaschke
Copy link
Contributor

rhaschke commented May 4, 2022

Thanks. Looks good to me.

Copy link
Member

@henningkayser henningkayser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, diff looks all good to me! CI fails because of an unrelated issue (fixed here).

v4hn and others added 8 commits May 5, 2022 17:35
source: moveit/moveit@6805b7e ; I have also had to update how moveit_msgs is referenced (movit_msgs:: -> moveit_msgs::msg:: ) and I  added the changes to this commit that correspond to tests for the constraint samplers package.
source: moveit/moveit@6436597; in addition to the original commit I updated logging to support ros2 logging standards.
source moveit/moveit@ddb68b6; I also had to amend moveit_msgs to moveit_msgs::msg in this commit, otherwise everything remains the same as source commit. When I ran the kinematics plugin test locally it threw an error both before and after this change. Hopefully we can revisit this point as part of the code review, the error related to the robot description.
source: moveit/moveit@1a8e571; this commit contains minor changes when compared to the source commit which it is based on, these changes are limited to ensuring compatibility with ROS2.
source:moveit/moveit@a2911c8; required minor updates compared to original source commit in order to ensure compatibility with ROS2
@henningkayser henningkayser merged commit 8a5357a into moveit:main May 10, 2022
@peterdavidfagan peterdavidfagan deleted the remove_bind branch May 24, 2022 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Never Use std::bind
5 participants