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

Port transforms submodule of moveit_core of ROS 2 #12

Merged
merged 5 commits into from
Mar 15, 2019

Conversation

vmayoral
Copy link
Contributor

No description provided.

moveit_core/transforms/CMakeLists.txt Outdated Show resolved Hide resolved
typedef std::map<std::string, Eigen::Isometry3d, std::less<std::string>,
Eigen::aligned_allocator<std::pair<const std::string, Eigen::Isometry3d> > >
typedef std::map<std::string, Eigen::Affine3d, std::less<std::string>,
Eigen::aligned_allocator<std::pair<const std::string, Eigen::Affine3d> > >
Copy link
Member

Choose a reason for hiding this comment

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

This was a big change we made to moveit in Dec, why is it being reverted here?

moveit/moveit#1096

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Going back to Affine (or cluttering the history with hundreds of lines of unnecessary revert/counter-revert) is not an option. If you found a problem with ros2's geometry2-package, this should be fixed there (and this repository should probably require the patched version until then.)

I would hope upstream is very open to fixes in their interfaces if we need them.

Copy link
Member

Choose a reason for hiding this comment

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

agreed, we definitely should not revert back to Affine3d, that's a performance hit

i just looked into the difference between melodic-devel and ros2 branch and i don't see any changes in functions for in tf2_eigen.h. why does this require changing for moveit2?

Copy link
Contributor Author

@vmayoral vmayoral Feb 24, 2019

Choose a reason for hiding this comment

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

@davetcoleman and @v4hn, have a look at the ROS 2 geometry2 package as indicated above. For further details:

There's been a switch to Affine3d. Maybe @clalancette could advice if you are willing to accept a change reverting to Isometry3d? We should try to reach a compromise before producing any further changes.

Copy link
Member

Choose a reason for hiding this comment

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

@vmayoral: the switch was actually to Isometry3D (as that makes much more sense). There's nothing to revert.

See:

It seems ros2/geometry2 just hasn't been kept up-to-date (example of ROS1 - ROS2 community/maintenance split?).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @gavanderhoorn for clarifying.

It seems ros2/geometry2 just hasn't been kept up-to-date (example of ROS1 - ROS2 community/maintenance split?).

I guess so.

@clalancette, how shall we proceed about this? Shall I book some time next week and provide a PR to adjust things in geometry2 for ROS2 or do you want to take care of this yourself? We can then re-adjust things here afterwards.

Copy link
Member

Choose a reason for hiding this comment

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

This is the PR that needs to be forward ported: ros/geometry2#335

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See 94ebbcc. I believe we should be fine with this, right @davetcoleman?

Revert the changes in transform and use Isometry3d after
changes in geometry2 ros2/geometry2#93
Follows from moveit#21

Changes in the code, particularly in the for loops
are required due to the use of rclcpp macros
@@ -37,11 +37,12 @@
#ifndef MOVEIT_TRANSFORMS_
#define MOVEIT_TRANSFORMS_

#include <geometry_msgs/TransformStamped.h>
#include <geometry_msgs/Pose.h>
#include <geometry_msgs/msg/transform_stamped.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

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

It may make sense to make these changes repo wide with a find-replace all. Otherwise we will be manually making 462 changes across 91 files for just geometry_msgs:: and 23 times across 19 files for #include <geometry_msgs/msg/

Copy link
Member

Choose a reason for hiding this comment

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

strong yes!

@mlautman mlautman mentioned this pull request Mar 4, 2019
mlautman pushed a commit that referenced this pull request Mar 8, 2019
@mlautman mlautman dismissed davetcoleman’s stale review March 11, 2019 22:21

Feedback addressed

@mlautman
Copy link
Contributor

@davetcoleman Would you want to give this another review?

@davetcoleman davetcoleman merged commit a915649 into moveit:master Mar 15, 2019
JafarAbdi referenced this pull request in JafarAbdi/moveit2 Oct 28, 2019
* Port transforms submodule of moveit_core of ROS 2

* transforms submodule, add tests

Added tests to moveit_core submodule

* Cleanup transforms submodule meta-files

* moveit_core, transforms submodule, back to Isometry3d

Revert the changes in transform and use Isometry3d after
changes in geometry2 ros2/geometry2#93

* transforms, fix logging

Follows from moveit#21

Changes in the code, particularly in the for loops
are required due to the use of rclcpp macros
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.

6 participants