-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Bump usd-core dependency to 26.05 to fix USD physics crash #6521
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
Changes from 13 commits
f003ec7
b9883d4
b639c8a
45d5da8
1279e7e
052b52f
1e280e3
c8e1595
3c0deaa
bb65e2e
c7757b6
e850085
b755878
328fb7f
29a0fb5
2c3a052
8d6a542
812c51b
9975b67
8d97c56
2e1efd3
6dc7638
437190a
9391637
cc3c00f
7949221
ea91a4c
579f763
cf0df85
368476c
f6a6c99
3c5d45b
294ccf1
b38daf5
ecd7233
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Changed | ||
| ^^^^^^^ | ||
|
|
||
| * Bumped ``usd-core`` dependency from ``>=25.11,<26.0`` to ``>=26.05,<27.0`` on x86_64 to resolve | ||
| a crash in ``libusd_ms`` triggered by USD physics loading (``LoadUsdPhysicsFromRange``) for kitless runs. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,16 +23,16 @@ def _repo_root() -> Path: | |
| raise RuntimeError("Could not find Isaac Lab repository root.") | ||
|
|
||
|
|
||
| def test_isaaclab_usd_core_pin_stays_on_isaacsim_compatible_usd25_abi(): | ||
| """The kit-less USD package must stay on the Isaac Sim compatible USD 25 ABI.""" | ||
| def test_isaaclab_usd_core_pin_stays_on_isaacsim_compatible_usd26_abi(): | ||
| """The kit-less USD package must stay on the Isaac Sim compatible USD 26 ABI.""" | ||
| with (_repo_root() / "pyproject.toml").open("rb") as f: | ||
| pyproject = tomllib.load(f) | ||
|
|
||
| usd_core_dependencies = [ | ||
| dependency for dependency in pyproject["project"]["dependencies"] if dependency.startswith("usd-core") | ||
| ] | ||
|
|
||
| assert usd_core_dependencies == ["usd-core>=25.11,<26.0 ; platform_machine in 'x86_64 AMD64'"] | ||
| assert usd_core_dependencies == ["usd-core>=26.05,<27.0 ; platform_machine in 'x86_64 AMD64'"] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe we can just get rid of these tests, since they're just checking that a hardcoded value is the correct hardcoded value? I don't see anything in this test file that's actually a useful test.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sure sounds good to me |
||
|
|
||
|
|
||
| def test_isaaclab_standalone_usd_providers_are_platform_disjoint(): | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # Copyright (c) 2022-2026, The Isaac Lab Project Developers (https://github.com/isaac-sim/IsaacLab/blob/main/CONTRIBUTORS.md). | ||
| # All rights reserved. | ||
| # | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| """Locate the omni.usd.libs extension and promote its pxr package to a regular package. | ||
|
|
||
| Prints the resolved directory path to stdout (empty string if not found). | ||
| Called by isaaclab.sh / isaaclab.bat before launching the CLI so that the | ||
| shell can prepend the path to PYTHONPATH / LD_LIBRARY_PATH / PATH. | ||
| """ | ||
|
|
||
| import contextlib | ||
| import glob | ||
| import os | ||
|
|
||
| extscache = os.path.join(os.environ.get("ISAACLAB_PATH", ""), "_isaac_sim", "extscache") | ||
| candidates = sorted(glob.glob(os.path.join(extscache, "omni.usd.libs-*"))) | ||
| if not candidates: | ||
| print("", end="") | ||
| else: | ||
| usd_libs_dir = candidates[-1] | ||
| pxr_dir = os.path.join(usd_libs_dir, "pxr") | ||
| init_py = os.path.join(pxr_dir, "__init__.py") | ||
| if os.path.isdir(pxr_dir) and not os.path.isfile(init_py): | ||
| with contextlib.suppress(OSError): | ||
| open(init_py, "w").close() | ||
| print(usd_libs_dir, end="") | ||
|
mataylor-nvidia marked this conversation as resolved.
Outdated
|
||
Uh oh!
There was an error while loading. Please reload this page.