-
Notifications
You must be signed in to change notification settings - Fork 95
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
make SDF to USD a separate component of sdformat #817
Conversation
Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: ahcorde <[email protected]>
Codecov Report
@@ Coverage Diff @@
## sdf12 #817 +/- ##
=======================================
Coverage 90.70% 90.70%
=======================================
Files 78 78
Lines 12438 12438
=======================================
Hits 11282 11282
Misses 1156 1156 Continue to review full report at Codecov.
|
Interesting. I see different goals with respect to the installation and/or distribution of the USD pixar libraries:
|
For further context, I tried to use NVIDIA's pre-built libraries/tools, and I had problems setting them up. I had to end up building USD from source. @j-rivero if you want to see how this was done in case it's useful for integrating this component with CI, I made a Dockerfile that sets up a USD source build: https://github.com/adlarkin/usd_docker |
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.
The overall structure looks good to me. I left some minor comments.
I am still seeing the following error when I run the component's installed sdf2usd
executable:
sdf2usd: error while loading shared libraries: libusd_usd.so: cannot open shared object file: No such file or directory
I think we need to use the Pixar libraries in our CI before we can merge any of these pull requests. I can take a look at making a homebrew formula |
nvidia's binaries may not work because it's compiled with pre cxx11 abi and a bunch of bundled dependencies (python3.6, boost1.70) which are not suitable for distribution (also, it includes gui programs like usdview which we don't need). |
FYI I did a quick test to add usd to conda-forge some time ago, even if I did not worked a lot on it: conda-forge/staged-recipes#16666 .
Just to cross-link, there is an issue on usd issue tracker on that: PixarAnimationStudios/OpenUSD#1490 . |
I was testing in this branch to compile USD from sources and at least check that the code is compiling. If you look for It's only compiling on focal because I can include this changes here but is increasing a lot the CI time |
Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: Ashton Larkin <[email protected]>
@ahcorde I finished up a "bare bones implementation" of Regarding the tests, we still need to figure out how to address #796 (review). I'll see if I can figure out how to address this, and create a new PR if I come up with any ideas. |
535a822
to
96caa08
Compare
Signed-off-by: ahcorde <[email protected]>
96caa08
to
16e0789
Compare
How much does it take to run that from-source build in a github action? |
This is a build example https://github.com/ignitionrobotics/sdformat/runs/4776721844?check_suite_focus=true ~ 1hour, 7min |
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.
LGTM, but I do have a few final questions/comments that should be addressed before merging.
|
||
######################################## | ||
# Find PXR | ||
ign_find_package(pxr QUIET REQUIRED_BY usd PKGCONFIG pxr) |
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.
Configuration warnings should be gone now thanks to gazebo-tooling/release-tools#625, but I realize that until this PR is merged, gazebo-tooling/release-tools#625 will cause CI warnings on other sdformat PRs, as mentioned in gazebo-tooling/release-tools#625 (comment). I'm not sure if we should merge this PR first to take care of CI warnings on other PRs, or revert gazebo-tooling/release-tools#625 until it's time to merge this PR. Does anyone have thoughts on how to handle this?
Signed-off-by: ahcorde <[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.
LGTM with green CI. Looks like there's a test failure in Github Actions jobs.
usd/src/sdf2usd_TEST.cc
Outdated
std::string output = | ||
custom_exec_str(sdf2usdCommand() + " " + path + " " + | ||
ignition::common::joinPaths(tmp, "shapes.usd")); |
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.
Has this been resolved @adlarkin ?
Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: Ashton Larkin <[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.
LGTM with green CI. Looks like there's a test failure in Github Actions jobs.
CI is green now - see #817 (comment)
The only other question I have before approving this is if we want to change the current file structure. This PR adds the SDF -> USD converter file structure, but this component will also have a USD -> SDF converter. So, I am wondering if we want sub-header and sub-source directories to differentiate between the SDF -> USD converter files and the USD -> SDF converter files: see #827 (review) for more information about this, @ahcorde and @azeey
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: ahcorde <[email protected]>
…nrobotics/sdformat into ahcorde/sdf_to_usd_cmake
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Ashton Larkin <[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.
This pull request has been mentioned on Gazebo Community. There might be relevant details there: https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1 |
Signed-off-by: Ashton Larkin [email protected]
🎉 New feature
Summary
Based on this PR #816 I made this other one smaller
The idea here it's to try to simplify things and be able to merge small PRs
This PR adds
sdf2usd
to convert from SDF to USDChecklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.