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

Deprecate C Headers #720

Open
wants to merge 10 commits into
base: rolling
Choose a base branch
from

Conversation

CursedRock17
Copy link
Contributor

This pull request is an attempt to help #259, specifically the first task

Rename all .h -> .hpp files. This will have to also have a deprecation warning, and should be done post-Foxy.

Since it's now post-Foxy I did something similar to this message_filters pull request, which was to simply deprecate a .h file with a warning, include the .hpp file, and just copy paste the logic from the .h file into the .hpp file. There were some slight formatting changes that had to be made to make cpplint and uncrustify happy. There is currently a copyrighting problem within the LinearMath files since they seem to be from the bullet library. I would like to know where we should move from this point when it comes to those files.

Signed-off-by: CursedRock17 <[email protected]>
Signed-off-by: CursedRock17 <[email protected]>
Signed-off-by: CursedRock17 <[email protected]>
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

include/tf2/LinearMath/Scalar.h
include/tf2/LinearMath/Transform.h
include/tf2/LinearMath/Vector3.h
include/tf2/LinearMath/Matrix3x3.hpp
Copy link
Contributor

Choose a reason for hiding this comment

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

you should keep here both the h and the hpp

Copy link
Contributor

Choose a reason for hiding this comment

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

you should keep here both the h and the hpp

Agreed.

@clalancette
Copy link
Contributor

Besides some of @ahcorde 's inline comments, we will also need to have PRs to the rest of the ROS 2 core to use the .hpp files instead of the .h ones. Also, this is a large enough change that once we are ready to merge it, we should probably send a message to https://discourse.ros.org letting people know that we've done this.

Signed-off-by: CursedRock17 <[email protected]>
@CursedRock17
Copy link
Contributor Author

Yeah I figured we would have to extend PRs to various libraries, I have one linked from rviz, but I haven't found anymore, I'll have to do some digging around to find out if I've missed any more of the core ones. As far as the copyrighting goes, I believe those inline comments were the missing piece, I've submitted a fix.

@Timple
Copy link

Timple commented Oct 29, 2024

Would it make sense to provide .hpp files for all active distros? With as only content the include of the .h file.

This would mean all projects that do not have a branch per release can use this syntax already. Preventing ugly statements like this everywhere: https://github.com/autowarefoundation/autoware.universe/blob/9bd0f77c255edcff129ff08d190a5fdd8c45b6dc/localization/yabloc/yabloc_common/src/pub_sub.cpp#L18

For rolling we can keep the deprecation flag, not for older distros.

@CursedRock17
Copy link
Contributor Author

Yeah I don't see much of a compile downside, just a weirder file structure for older distributions. I assume we would just never phase out the .h files unlike the rolling branch in which we can remove them in L-Turtle. I would be able to add this "backport" later today if that's something we agree on.

Also there already seems to be some consensus in the other core repositories:

we should create backwards compatibilty headers that emit compile warnings so users have time to migrate to the new headers.

Can you add conditioning in the code so that from rolling on it uses the .hpp, and in the prior versions it uses the .h version?

This was referenced Oct 30, 2024
@CursedRock17
Copy link
Contributor Author

CursedRock17 commented Oct 30, 2024

The following pull requests are the "backports" that will prevent gross include macros with the formulating of .hpp files for ROS' non-EOL distributions. Do I need to go back any further, or will these be alright for now?

@Timple
Copy link

Timple commented Oct 30, 2024

Iron I guess?

CursedRock17 added a commit to CursedRock17/geometry2 that referenced this pull request Oct 31, 2024
Signed-off-by: CursedRock17 <[email protected]>

Iron Backport of ros2#720

Signed-off-by: CursedRock17 <[email protected]>
Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

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

There is one major change I'd like to see in this PR, and that is to not make the linting updates to the tf2/include/tf2/LinearMath headers. While I think we may eventually want to do this, for now I think it will be easier to track provenance without doing that.

Once that is fixed, and we run CI on this and the downstream PRs, I think we can get this in.

@CursedRock17
Copy link
Contributor Author

Changes have been implemented, that being said was it not just easier to do this now opposed to later, especially when naming conventions are going to be mixed?
Also I'll begin making necessary changes downstream.

@clalancette
Copy link
Contributor

Changes have been implemented, that being said was it not just easier to do this now opposed to later, especially when naming conventions are going to be mixed?
Also I'll begin making necessary changes downstream.

No, sorry, that's not what I meant. I meant leave the .hpp files, but do not do things like remove the trailing whitespace.

@CursedRock17
Copy link
Contributor Author

Ohhh, I was quite confused lol, I will be reverting the changes in addition to the whitespace changes.

@Ryanf55
Copy link
Contributor

Ryanf55 commented Nov 6, 2024

Iron I guess?

Can you do humble if it's not too much work?

Signed-off-by: Lucas Wendland <[email protected]>

Linter Matrix3x3.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Linter MinMax.h

Signed-off-by: Lucas Wendland <[email protected]>

Linter MinMax.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Linter QuadWord.h

Signed-off-by: Lucas Wendland <[email protected]>

Linter QuadWord.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Linter Quaternion.h

Signed-off-by: Lucas Wendland <[email protected]>

Linter Quaternion.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Linter Scalar.h

Signed-off-by: Lucas Wendland <[email protected]>

Linter Scalar.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Linter Transform.h

Signed-off-by: Lucas Wendland <[email protected]>

Linter Transform.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Linter Vector3.h

Signed-off-by: Lucas Wendland <[email protected]>

Linter Vector3.hpp

Signed-off-by: Lucas Wendland <[email protected]>
Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

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

All right, one more relatively small thing to fix, then I think this will be ready for CI.

Copy link
Contributor

Choose a reason for hiding this comment

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

This particular file is actually C code, and mostly internal, so I think we do not need to rename this. That is, keep just this file as visibility_control.h.

Signed-off-by: CursedRock17 <[email protected]>

Visibility Controls utils.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls convert.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls  Quaternion.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls Vector3.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls  QuadWord.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls Transform.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls  exceptions.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls time_cache.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Visibility Controls transform_storage.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Update time.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Update buffer_core.hpp

Signed-off-by: Lucas Wendland <[email protected]>

Update buffer_core_interface.hpp

Signed-off-by: Lucas Wendland <[email protected]>
@CursedRock17
Copy link
Contributor Author

When I get back to my workstation later today, I can roll these improvements (whitespacing & visibility_control) onto the other branches I adjusted for the backport.

@clalancette
Copy link
Contributor

Pulls: #720, ros2/rviz#1289, ros-perception/laser_geometry#98
Gist: https://gist.githubusercontent.com/clalancette/b83127091186f2489c09c4c787585861/raw/3c16fd56b4d645d09b9cadf800da79cbfd1acbaf/ros2.repos
BUILD args:
TEST args:
ROS Distro: rolling
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14792

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@clalancette
Copy link
Contributor

So there are at least two problems here:

  1. We need a PR to interactive_markers to deal with the change.
  2. Windows doesn't seem to like the #warning construct, so we may have to do something special for Windows there. Maybe something like https://github.com/ros2/common_interfaces/blob/473511f5807610bb8ed7744dfd2986dba4601fa6/sensor_msgs/include/sensor_msgs/point_cloud_conversion.hpp#L41-L49

Signed-off-by: CursedRock17 <[email protected]>

Update Matrix3x3.h

Signed-off-by: Lucas Wendland <[email protected]>

Update MinMax.h

Signed-off-by: Lucas Wendland <[email protected]>

Update QuadWord.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Quaternion.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Scalar.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Transform.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Vector3.h

Signed-off-by: Lucas Wendland <[email protected]>

Update buffer_core.h

Signed-off-by: Lucas Wendland <[email protected]>

Update buffer_core_interface.h

Signed-off-by: Lucas Wendland <[email protected]>

Update convert.h

Signed-off-by: Lucas Wendland <[email protected]>

Update exceptions.h

Signed-off-by: Lucas Wendland <[email protected]>

Update convert.h

Signed-off-by: Lucas Wendland <[email protected]>

Update utils.h

Signed-off-by: Lucas Wendland <[email protected]>

Update time.h

Signed-off-by: Lucas Wendland <[email protected]>

Update time_cache.h

Signed-off-by: Lucas Wendland <[email protected]>

Update transform_datatypes.h

Signed-off-by: Lucas Wendland <[email protected]>

Update transform_storage.h

Signed-off-by: Lucas Wendland <[email protected]>

Update utils.h

Signed-off-by: Lucas Wendland <[email protected]>

Update MinMax.h

Signed-off-by: Lucas Wendland <[email protected]>

Update QuadWord.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Quaternion.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Scalar.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Transform.h

Signed-off-by: Lucas Wendland <[email protected]>

Update Vector3.h

Signed-off-by: Lucas Wendland <[email protected]>

Update buffer_core.h

Signed-off-by: Lucas Wendland <[email protected]>

Update buffer_core_interface.h

Signed-off-by: Lucas Wendland <[email protected]>

Update convert.h

Signed-off-by: Lucas Wendland <[email protected]>

Update exceptions.h

Signed-off-by: Lucas Wendland <[email protected]>

Update convert.h

Signed-off-by: Lucas Wendland <[email protected]>

Update utils.h

Signed-off-by: Lucas Wendland <[email protected]>
Signed-off-by: CursedRock17 <[email protected]>
@CursedRock17
Copy link
Contributor Author

Hopefully windows likes the current implemention. Also backport PRs are ready to go as well.

@ahcorde
Copy link
Contributor

ahcorde commented Nov 8, 2024

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

There are still some warnings

@CursedRock17
Copy link
Contributor Author

I think it's just the repos being built, I changed up interactive_markers which seems to be the repository throwing out some warnings as it's still on the rolling branch. My updated branch stops using the .h files that are the only ones triggering the warnings, which should be ok.

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.

5 participants