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

bazel: Updates for garden (minus ABI break) #598

Open
wants to merge 12 commits into
base: gz-physics6
Choose a base branch
from

Conversation

mjcarroll
Copy link
Contributor

Rework #513 to not break ABI.

@github-actions github-actions bot added the 🌱 garden Ignition Garden label Feb 6, 2024
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 78.67%. Comparing base (ea90ada) to head (4d6ef43).
Report is 21 commits behind head on gz-physics6.

Files Patch % Lines
src/InstallationDirectories.cc 0.00% 1 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           gz-physics6     #598      +/-   ##
===============================================
+ Coverage        78.52%   78.67%   +0.14%     
===============================================
  Files              140      140              
  Lines             7670     7652      -18     
===============================================
- Hits              6023     6020       -3     
+ Misses            1647     1632      -15     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -62,6 +62,7 @@ class Plugin :
public virtual SimulationFeatures,
public virtual WorldFeatures { };

#ifndef GZ_PHYSICS_BAZEL_BUILD
Copy link
Contributor Author

Choose a reason for hiding this comment

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

FYI @azeey this is what breaks when dartsim is statically linked via bazel. Removing this section causes the cashes to go away.

Copy link
Member

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.

I found that loading the plugins with RTLD_NODELETE and removing this section fixes the issue on macOS and Linux. We do that for Gazebo plugins already, so I think we should do the same for physics engines.

@mjcarroll
Copy link
Contributor Author

Tested here: gazebosim/gz-bazel#70

@@ -28,27 +28,28 @@ namespace gz
{
namespace physics
{
inline namespace GZ_PHYSICS_VERSION_NAMESPACE {
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just moved it a little further down (

inline namespace GZ_PHYSICS_VERSION_NAMESPACE {
), and put the rest in an anonymous namespace since it's not part of the public API

Copy link
Member

Choose a reason for hiding this comment

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

👍

BUILD.bazel Outdated Show resolved Hide resolved
BUILD.bazel Outdated Show resolved Hide resolved
BUILD.bazel Outdated Show resolved Hide resolved
BUILD.bazel Outdated Show resolved Hide resolved
BUILD.bazel Outdated Show resolved Hide resolved
dartsim/BUILD.bazel Outdated Show resolved Hide resolved
Copy link
Contributor

@shameekganguly shameekganguly left a comment

Choose a reason for hiding this comment

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

Thanks!

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

@osrf-jenkins retest this please

};

UnregisterCollisionDetectors unregisterAtUnload;
}
Copy link
Member

Choose a reason for hiding this comment

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

I think this removal is the source of the macOS test failures

@azeey
Copy link
Contributor

azeey commented Jun 10, 2024

@azeey to take a look at macOS failures.

@azeey azeey added beta Targeting beta release of upcoming collection and removed beta Targeting beta release of upcoming collection labels Jul 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Status: In review
Development

Successfully merging this pull request may close these issues.

4 participants